diff --git a/.eslintrc.js b/.eslintrc.js index 8acba223d986eb..59d585b9d355bd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -244,6 +244,10 @@ module.exports = { selector: "CallExpression[callee.property.name='strictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression']):not([arguments.1.type='UnaryExpression'])", message: 'The first argument should be the `actual`, not the `expected` value.', }, + { + selector: "CallExpression[callee.name='isNaN']", + message: 'Use Number.isNaN() instead of the global isNaN() function.', + }, ], /* eslint-enable max-len */ 'no-return-await': 'error', diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 375a6aa8a24eff..00000000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,23 +0,0 @@ - - -* **Version**: -* **Platform**: -* **Subsystem**: - - diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md index 69b9bf63250f7b..2a2e94d411fe2a 100644 --- a/.github/ISSUE_TEMPLATE/1-bug-report.md +++ b/.github/ISSUE_TEMPLATE/1-bug-report.md @@ -5,20 +5,47 @@ about: Create a report to help us improve --- * **Version**: * **Platform**: * **Subsystem**: - +### What steps will reproduce the bug? + + + +### How often does it reproduce? Is there a required condition? + +### What is the expected behavior? + + + +### What do you see instead? + + + +### Additional information + + diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml new file mode 100644 index 00000000000000..7d7a8167308960 --- /dev/null +++ b/.github/workflows/build-windows.yml @@ -0,0 +1,23 @@ +name: build-windows + +on: [push, pull_request] + +env: + PYTHON_VERSION: 2.7 + FLAKY_TESTS: dontcare + +jobs: + build-windows: + runs-on: windows-2016 + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@v1 + with: + python-version: ${{ env.PYTHON_VERSION }} + - name: Install deps + run: choco install nasm + - name: Environment Information + run: npx envinfo + - name: Build + run: ./vcbuild.bat diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml new file mode 100644 index 00000000000000..f0ee528a0f4e0f --- /dev/null +++ b/.github/workflows/linters.yml @@ -0,0 +1,73 @@ +name: linters + +on: [push, pull_request] + +env: + PYTHON_VERSION: 3.8 + NODE_VERSION: 10.x + +jobs: + lint-addon-docs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ env.NODE_VERSION }} + uses: actions/setup-node@v1 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Lint addon docs + run: NODE=$(which node) make lint-addon-docs + lint-cpp: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@v1 + with: + PYTHON_VERSION: ${{ env.PYTHON_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Lint C/C++ files + run: make lint-cpp + lint-md: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ env.NODE_VERSION }} + uses: actions/setup-node@v1 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Lint docs + run: | + echo "::add-matcher::.github/workflows/remark-lint-problem-matcher.json" + NODE=$(which node) make lint-md + lint-js: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ env.NODE_VERSION }} + uses: actions/setup-node@v1 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Lint JavaScript files + run: NODE=$(which node) make lint-js + lint-py: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@v1 + with: + PYTHON_VERSION: ${{ env.PYTHON_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Lint Python + run: | + make lint-py-build || true + NODE=$(which node) make lint lint-py diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml new file mode 100644 index 00000000000000..b23120ae0f1d74 --- /dev/null +++ b/.github/workflows/misc.yml @@ -0,0 +1,24 @@ +name: misc + +on: [push, pull_request] + +env: + NODE_VERSION: 12.x + +jobs: + build-docs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ env.NODE_VERSION }} + uses: actions/setup-node@v1 + with: + node-version: ${{ env.NODE_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Build + run: NODE=$(which node) make doc-only + - uses: actions/upload-artifact@v1 + with: + name: docs + path: out/doc diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml new file mode 100644 index 00000000000000..9ff5e9a39d81fa --- /dev/null +++ b/.github/workflows/pythonpackage.yml @@ -0,0 +1,33 @@ +name: Python 3 testing + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + max-parallel: 1 + matrix: + python-version: [3.8] # [2.7, 3.5, 3.6, 3.7] + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Compile Node.js + run: | + python ./configure.py + make -j2 V=1 + - name: Test JS Suites + run: | + python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare default + - name: Test C++ Suites + run: | + make -j1 V=1 test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp + python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare addons js-native-api node-api + - name: Make lint + run: | + make lint-py-build || true + NODE=$(which node) make lint lint-py diff --git a/.github/workflows/remark-lint-problem-matcher.json b/.github/workflows/remark-lint-problem-matcher.json new file mode 100644 index 00000000000000..cfb281310a9a0f --- /dev/null +++ b/.github/workflows/remark-lint-problem-matcher.json @@ -0,0 +1,22 @@ +{ + "problemMatcher": [ + { + "owner": "remark-lint", + "pattern": [ + { + "regexp": "^(?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)*$", + "file": 1 + }, + { + "regexp": "^\\s+(?:\\d+:\\d+-)?(\\d+):(\\d+)\\s+\\S*(error|warning|info)\\S*\\s+(.+)\\s+(\\S+)\\s+(?:\\S+)$", + "line": 1, + "column": 2, + "severity": 3, + "message": 4, + "code": 5, + "loop": true + } + ] + } + ] +} diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml new file mode 100644 index 00000000000000..d63627f1f0cc78 --- /dev/null +++ b/.github/workflows/test-linux.yml @@ -0,0 +1,23 @@ +name: test-linux + +on: [push, pull_request] + +env: + PYTHON_VERSION: 2.7 + FLAKY_TESTS: dontcare + +jobs: + test-linux: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@v1 + with: + python-version: ${{ env.PYTHON_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Build + run: make build-ci -j2 V=1 + - name: Test + run: make run-ci -j2 V=1 diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml new file mode 100644 index 00000000000000..51dfc3d245e01c --- /dev/null +++ b/.github/workflows/test-macos.yml @@ -0,0 +1,23 @@ +name: test-macOS + +on: [push, pull_request] + +env: + PYTHON_VERSION: 2.7 + FLAKY_TESTS: dontcare + +jobs: + test-macOS: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@v1 + with: + python-version: ${{ env.PYTHON_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Build + run: make build-ci -j8 V=1 + - name: Test + run: make run-ci -j8 V=1 diff --git a/.gitignore b/.gitignore index e50393f003c5d1..f0e9b6b15d4c69 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ !.gitkeep !.mailmap !.nycrc -!.travis.yml !.eslintrc.yaml !.cpplint @@ -33,6 +32,7 @@ /doc/api.xml /node /node_g +/gon-config.json /*.exe /*.swp /out @@ -45,8 +45,8 @@ /config_fips.gypi # === Rules for MSVS artifacts === -/Debug -/Release +Debug/ +Release/ *.sln *.suo *.vcxproj* diff --git a/.mailmap b/.mailmap index e140392b723514..15962df50bdb94 100644 --- a/.mailmap +++ b/.mailmap @@ -423,6 +423,7 @@ Wilson Lin Wyatt Preul geek Xavier J Ortiz xiaoyu <306766053@qq.com> Poker <306766053@qq.com> +Yael Hermon Yazhong Liu Yazhong Liu Yazhong Liu Yorkie Yazhong Liu Yorkie diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e1069317ecc2c5..00000000000000 --- a/.travis.yml +++ /dev/null @@ -1,91 +0,0 @@ -os: linux -language: cpp -# Currently this file can only support one PYTHON_VERSION. -# To experiment with Python 3, comment out Python 2.7 and uncomment one of the Python 3 versions. -env: - global: - - PYTHON_VERSION="2.7.15" - # - PYTHON_VERSION="3.6.7" - # - PYTHON_VERSION="3.7.1" -jobs: - include: - - stage: "Compile" - name: "Compile Node.js" - cache: ccache - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - install: - - export CCACHE_NOSTATS=1 - - export CCACHE_SLOPPINESS="file_macro,include_file_mtime,include_file_ctime,time_macros,file_stat_matches" - - export CC='ccache gcc-6' - - export CXX='ccache g++-6' - script: - - pyenv global ${PYTHON_VERSION} - - ./configure - - timeout --preserve-status 45m make -j2 V=1 - before_cache: - - cp out/Release/node /home/travis/.ccache - - cp out/Release/cctest /home/travis/.ccache - - - stage: "Tests" - name: "Test JS Suites" - cache: ccache - install: - - mkdir -p out/Release - - cp /home/travis/.ccache/node out/Release/node - script: - - pyenv global ${PYTHON_VERSION} - - python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare default - - - name: "Test C++ Suites" - cache: ccache - install: - - export CCACHE_NOSTATS=1 - - export CCACHE_SLOPPINESS="file_macro,include_file_mtime,include_file_ctime,time_macros,file_stat_matches" - - export CC='ccache gcc' - - export CXX='ccache g++' - - mkdir -p out/Release - - cp /home/travis/.ccache/node out/Release/node - - ln -fs out/Release/node node - - cp /home/travis/.ccache/cctest out/Release/cctest - - touch config.gypi - script: - - pyenv global ${PYTHON_VERSION} - - out/Release/cctest - - make -j1 V=1 test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp - - python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare addons js-native-api node-api - - - name: "Run Linter and Build Docs" - language: node_js - node_js: "node" - install: - - pyenv global ${PYTHON_VERSION} - - make lint-py-build || true - script: - - NODE=$(which node) make lint-py doc-only lint - - - name: "First commit message adheres to guidelines at https://goo.gl/p2fr5Q" - if: type = pull_request - language: node_js - node_js: "node" - script: - - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then - bash -x tools/lint-pr-commit-message.sh ${TRAVIS_PULL_REQUEST}; - fi - - - name: "Find syntax errors in our Python dependencies" - language: python - python: 3.8 - install: - - mv .flake8 disabled.flake8 # take the blinders off of flake8 - - python3.8 -m pip install --upgrade pip - - python3.8 -m pip install flake8 - script: - - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - allow_failures: # TODO (cclauss): remove this when dependencies are clean - - name: "Find syntax errors in our Python dependencies" - - name: "First commit message adheres to guidelines at https://goo.gl/p2fr5Q" diff --git a/AUTHORS b/AUTHORS index adb8aef88a44d5..539f311a0dcb9f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2636,7 +2636,7 @@ Charles Samborski zhmushan yoshimoto koki Ilarion Halushka -Yael Hermon +Yael Hermon Mitch Hankins Mikko Rantanen wenjun ye <1728914873@qq.com> diff --git a/BUILDING.md b/BUILDING.md index d188aaff5a3a27..cb1960db7445cf 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -28,11 +28,12 @@ file a new issue. * [Running Coverage](#running-coverage) * [Building the documentation](#building-the-documentation) * [Building a debug build](#building-a-debug-build) + * [Troubleshooting Unix and macOS builds](#troubleshooting-unix-and-macos-builds) * [Windows](#windows) * [Prerequisites](#prerequisites) * [Option 1: Manual install](#option-1-manual-install) * [Option 2: Automated install with Boxstarter](#option-2-automated-install-with-boxstarter) - * [Building Node.js](#building-nodejs-1) + * [Building Node.js](#building-nodejs-2) * [Android/Android-based devices (e.g. Firefox OS)](#androidandroid-based-devices-eg-firefox-os) * [`Intl` (ECMA-402) support](#intl-ecma-402-support) * [Default: `small-icu` (English only) support](#default-small-icu-english-only-support) @@ -42,7 +43,7 @@ file a new issue. * [Building without Intl support](#building-without-intl-support) * [Unix/macOS](#unixmacos-1) * [Windows](#windows-2) - * [Use existing installed ICU (Unix/macOS only)](#use-existing-installed-icu-unixmacOS-only) + * [Use existing installed ICU (Unix/macOS only)](#use-existing-installed-icu-unixmacos-only) * [Build with a specific ICU](#build-with-a-specific-icu) * [Unix/macOS](#unixmacos-2) * [Windows](#windows-3) @@ -164,7 +165,7 @@ Binaries at are produced on: | Binary package | Platform and Toolchain | | --------------------- | ------------------------------------------------------------------------ | | aix-ppc64 | AIX 7.1 TL05 on PPC64BE with GCC 6 | -| darwin-x64 (and .pkg) | macOS 10.11, Xcode Command Line Tools 8 with -mmacosx-version-min=10.10 | +| darwin-x64 (and .pkg) | macOS 10.15, Xcode Command Line Tools 11 with -mmacosx-version-min=10.10 | | linux-arm64 | CentOS 7 with devtoolset-6 / GCC 6 | | linux-armv7l | Cross-compiled on Ubuntu 16.04 x64 with [custom GCC toolchain](https://github.com/rvagg/rpi-newer-crosstools) | | linux-ppc64le | CentOS 7 with devtoolset-6 / GCC 6 [7](#fn7) | @@ -249,6 +250,7 @@ Installation via Linux package manager can be achieved with: * Fedora: `sudo dnf install python gcc-c++ make` * CentOS and RHEL: `sudo yum install python gcc-c++ make` * OpenSUSE: `sudo zypper install python gcc-c++ make` +* Arch Linux, Manjaro: `sudo pacman -S python gcc make` FreeBSD and OpenBSD users may also need to install `libexecinfo`. @@ -494,6 +496,17 @@ $ gdb /opt/node-debug/node core.node.8.1535359906 $ backtrace ``` +#### Troubleshooting Unix and macOS builds + +Stale builds can sometimes result in `file not found` errors while building. +This and some other problems can be resolved with `make distclean`. The +`distclean` recipe aggressively removes build artifacts. You will need to +build again (`make -j4`). Since all build artifacts have been removed, this +rebuild may take a lot more time than previous builds. Additionally, +`distclean` removes the file that stores the results of `./configure`. If you +ran `./configure` with non-default options (such as `--debug`), you will need +to run it again before invoking `make -j4`. + ### Windows #### Prerequisites diff --git a/CHANGELOG.md b/CHANGELOG.md index 72ddc64c563cde..828df1e1ffcdef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,18 +2,18 @@ Select a Node.js version below to view the changelog history: -* [Node.js 12](doc/changelogs/CHANGELOG_V12.md) - **Long Term Support** -* [Node.js 11](doc/changelogs/CHANGELOG_V11.md) - End-of-Life -* [Node.js 10](doc/changelogs/CHANGELOG_V10.md) — Long Term Support -* [Node.js 9](doc/changelogs/CHANGELOG_V9.md) — End-of-Life -* [Node.js 8](doc/changelogs/CHANGELOG_V8.md) — Long Term Support -* [Node.js 7](doc/changelogs/CHANGELOG_V7.md) — End-of-Life -* [Node.js 6](doc/changelogs/CHANGELOG_V6.md) — End-of-Life -* [Node.js 5](doc/changelogs/CHANGELOG_V5.md) — End-of-Life -* [Node.js 4](doc/changelogs/CHANGELOG_V4.md) — End-of-Life -* [io.js](doc/changelogs/CHANGELOG_IOJS.md) — End-of-Life -* [Node.js 0.12](doc/changelogs/CHANGELOG_V012.md) — End-of-Life -* [Node.js 0.10](doc/changelogs/CHANGELOG_V010.md) — End-of-Life +* [Node.js 12](doc/changelogs/CHANGELOG_V12.md) **Long Term Support** +* [Node.js 11](doc/changelogs/CHANGELOG_V11.md) End-of-Life +* [Node.js 10](doc/changelogs/CHANGELOG_V10.md) Long Term Support +* [Node.js 9](doc/changelogs/CHANGELOG_V9.md) End-of-Life +* [Node.js 8](doc/changelogs/CHANGELOG_V8.md) End-of-Life +* [Node.js 7](doc/changelogs/CHANGELOG_V7.md) End-of-Life +* [Node.js 6](doc/changelogs/CHANGELOG_V6.md) End-of-Life +* [Node.js 5](doc/changelogs/CHANGELOG_V5.md) End-of-Life +* [Node.js 4](doc/changelogs/CHANGELOG_V4.md) End-of-Life +* [io.js](doc/changelogs/CHANGELOG_IOJS.md) End-of-Life +* [Node.js 0.12](doc/changelogs/CHANGELOG_V012.md) End-of-Life +* [Node.js 0.10](doc/changelogs/CHANGELOG_V010.md) End-of-Life * [Archive](doc/changelogs/CHANGELOG_ARCHIVE.md) Please use the following table to find the changelog for a specific Node.js @@ -28,7 +28,8 @@ release. -12.16.1
+12.16.2
+12.16.1
12.16.0
12.15.0
12.14.1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b9d1f2cef604b9..29700978fb78bf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,13 +5,13 @@ * [Pull Requests](#pull-requests) * [Developer's Certificate of Origin 1.1](#developers-certificate-of-origin) -## [Code of Conduct](./doc/guides/contributing/coc.md) +## [Code of Conduct](./doc/guides/contributing/code-of-conduct.md) The Node.js project has a [Code of Conduct](https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md) to which all contributors must adhere. -See [details on our policy on Code of Conduct](./doc/guides/contributing/coc.md). +See [details on our policy on Code of Conduct](./doc/guides/contributing/code-of-conduct.md). ## [Issues](./doc/guides/contributing/issues.md) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index d7cb6e321e16cb..5048a700340617 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -7,7 +7,7 @@ * [Technical Steering Committee](#technical-steering-committee) * [TSC Meetings](#tsc-meetings) * [Collaborator Nominations](#collaborator-nominations) - * [Onboarding](#onboarding) + * [Onboarding](#./onboarding) * [Consensus Seeking Process](#consensus-seeking-process) @@ -39,7 +39,7 @@ result in Collaborators removing their opposition. See: * [List of Collaborators](./README.md#current-project-team-members) -* [A guide for Collaborators](./COLLABORATOR_GUIDE.md) +* [A guide for Collaborators](./doc/guides/collaborator-guide.md) ### Collaborator Activities @@ -148,7 +148,7 @@ nomination. ### Onboarding After the nomination passes, a TSC member onboards the new Collaborator. See -[the onboarding guide](./doc/onboarding.md) for details of the onboarding +[the onboarding guide](./onboarding.md) for details of the onboarding process. ## Consensus Seeking Process diff --git a/Makefile b/Makefile index 05eaa73abbe0c6..88166da2a84cd8 100644 --- a/Makefile +++ b/Makefile @@ -738,15 +738,22 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets run-npm-ci = $(PWD)/$(NPM) ci LINK_DATA = out/doc/apilinks.json +VERSIONS_DATA = out/doc/previous-versions.json gen-api = tools/doc/generate.js --node-version=$(FULLVERSION) \ - --apilinks=$(LINK_DATA) $< --output-directory=out/doc/api + --apilinks=$(LINK_DATA) $< --output-directory=out/doc/api \ + --versions-file=$(VERSIONS_DATA) gen-apilink = tools/doc/apilinks.js $(LINK_DATA) $(wildcard lib/*.js) $(LINK_DATA): $(wildcard lib/*.js) tools/doc/apilinks.js $(call available-node, $(gen-apilink)) +# Regenerate previous versions data if the current version changes +$(VERSIONS_DATA): CHANGELOG.md src/node_version.h tools/doc/versions.js + $(call available-node, tools/doc/versions.js $@) + out/doc/api/%.json out/doc/api/%.html: doc/api/%.md tools/doc/generate.js \ - tools/doc/markdown.js tools/doc/html.js tools/doc/json.js tools/doc/apilinks.js | $(LINK_DATA) + tools/doc/markdown.js tools/doc/html.js tools/doc/json.js \ + tools/doc/apilinks.js $(VERSIONS_DATA) | $(LINK_DATA) $(call available-node, $(gen-api)) out/doc/api/all.html: $(apidocs_html) tools/doc/allhtml.js \ @@ -924,12 +931,12 @@ endif .PHONY: release-only release-only: check-xz @if [ "$(DISTTYPE)" = "release" ] && `grep -q REPLACEME doc/api/*.md`; then \ - echo 'Please update REPLACEME in Added: tags in doc/api/*.md (See doc/releases.md)' ; \ + echo 'Please update REPLACEME in Added: tags in doc/api/*.md (See doc/guides/releases.md)' ; \ exit 1 ; \ fi @if [ "$(DISTTYPE)" = "release" ] && \ `grep -q DEP...X doc/api/deprecations.md`; then \ - echo 'Please update DEP...X in doc/api/deprecations.md (See doc/releases.md)' ; \ + echo 'Please update DEP...X in doc/api/deprecations.md (See doc/guides/releases.md)' ; \ exit 1 ; \ fi @if [ "$(shell git status --porcelain | egrep -v '^\?\? ')" = "" ]; then \ @@ -1003,6 +1010,7 @@ $(PKG): release-only --resources $(MACOSOUTDIR)/installer/productbuild/Resources \ --package-path $(MACOSOUTDIR)/pkgs ./$(PKG) SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh + bash tools/osx-notarize.sh $(FULLVERSION) .PHONY: pkg # Builds the macOS installer for releases. @@ -1032,7 +1040,6 @@ $(TARBALL): release-only $(NODE_EXE) doc $(RM) -r $(TARNAME)/deps/v8/samples $(RM) -r $(TARNAME)/deps/v8/tools/profviz $(RM) -r $(TARNAME)/deps/v8/tools/run-tests.py - $(RM) -r $(TARNAME)/deps/zlib/contrib # too big, unused $(RM) -r $(TARNAME)/doc/images # too big $(RM) -r $(TARNAME)/test*.tap $(RM) -r $(TARNAME)/tools/cpplint.py @@ -1043,6 +1050,7 @@ $(TARBALL): release-only $(NODE_EXE) doc $(RM) -r $(TARNAME)/tools/osx-pkg.pmdoc find $(TARNAME)/deps/v8/test/* -type d ! -regex '.*/test/torque$$' | xargs $(RM) -r find $(TARNAME)/deps/v8/test -type f ! -regex '.*/test/torque/.*' | xargs $(RM) + find $(TARNAME)/deps/zlib/contrib/* -type d ! -regex '.*/contrib/optimizations$$' | xargs $(RM) -r find $(TARNAME)/ -name ".eslint*" -maxdepth 2 | xargs $(RM) find $(TARNAME)/ -type l | xargs $(RM) # annoying on windows tar -cf $(TARNAME).tar $(TARNAME) @@ -1165,6 +1173,7 @@ bench-addons-clean: .PHONY: lint-md-rollup lint-md-rollup: + $(RM) tools/.*mdlintstamp cd tools/node-lint-md-cli-rollup && npm install cd tools/node-lint-md-cli-rollup && npm run build-node @@ -1177,28 +1186,23 @@ lint-md-clean: lint-md-build: $(warning "Deprecated no-op target 'lint-md-build'") -LINT_MD_DOC_FILES = $(shell find doc -type f -name '*.md') -run-lint-doc-md = tools/lint-md.js -q -f $(LINT_MD_DOC_FILES) -# Lint all changed markdown files under doc/ -tools/.docmdlintstamp: $(LINT_MD_DOC_FILES) - @echo "Running Markdown linter on docs..." - @$(call available-node,$(run-lint-doc-md)) - @touch $@ +ifeq ("$(wildcard tools/.mdlintstamp)","") + LINT_MD_NEWER = +else + LINT_MD_NEWER = -newer tools/.mdlintstamp +endif -LINT_MD_TARGETS = src lib benchmark test tools/doc tools/icu -LINT_MD_ROOT_DOCS := $(wildcard *.md) -LINT_MD_MISC_FILES := $(shell find $(LINT_MD_TARGETS) -type f \ - ! -path '*node_modules*' ! -path 'test/fixtures/*' -name '*.md') \ - $(LINT_MD_ROOT_DOCS) -run-lint-misc-md = tools/lint-md.js -q -f $(LINT_MD_MISC_FILES) -# Lint other changed markdown files maintained by us -tools/.miscmdlintstamp: $(LINT_MD_MISC_FILES) - @echo "Running Markdown linter on misc docs..." - @$(call available-node,$(run-lint-misc-md)) +LINT_MD_TARGETS = doc src lib benchmark test tools/doc tools/icu $(wildcard *.md) +LINT_MD_FILES = $(shell find $(LINT_MD_TARGETS) -type f \ + ! -path '*node_modules*' ! -path 'test/fixtures/*' -name '*.md' \ + $(LINT_MD_NEWER)) +run-lint-md = tools/lint-md.js -q -f --no-stdout $(LINT_MD_FILES) +# Lint all changed markdown files maintained by us +tools/.mdlintstamp: $(LINT_MD_FILES) + @echo "Running Markdown linter..." + @$(call available-node,$(run-lint-md)) @touch $@ -tools/.mdlintstamp: tools/.miscmdlintstamp tools/.docmdlintstamp - .PHONY: lint-md # Lints the markdown documents maintained by us in the codebase. lint-md: | tools/.mdlintstamp diff --git a/README.md b/README.md index 7b3f7b69742dfc..fa1b2962dd95a2 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,9 @@

-Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. For -more information on using Node.js, see the [Node.js Website][]. +Node.js is an open-source, cross-platform, JavaScript runtime environment. It +executes JavaScript code outside of a browser. For more information on using +Node.js, see the [Node.js Website][]. The Node.js project uses an [open governance model](./GOVERNANCE.md). The [OpenJS Foundation][] provides support for the project. @@ -164,12 +165,8 @@ For information about the governance of the Node.js project, see **Daniel Bevenius** <daniel.bevenius@gmail.com> (he/him) * [fhinkel](https://github.com/fhinkel) - **Franziska Hinkelmann** <franziska.hinkelmann@gmail.com> (she/her) -* [Fishrock123](https://github.com/Fishrock123) - -**Jeremiah Senkpiel** <fishrock123@rocketmail.com> * [gabrielschulhof](https://github.com/gabrielschulhof) - **Gabriel Schulhof** <gabriel.schulhof@intel.com> -* [gireeshpunathil](https://github.com/gireeshpunathil) - -**Gireesh Punathil** <gpunathi@in.ibm.com> (he/him) * [jasnell](https://github.com/jasnell) - **James M Snell** <jasnell@gmail.com> (he/him) * [joyeecheung](https://github.com/joyeecheung) - @@ -184,8 +181,6 @@ For information about the governance of the Node.js project, see **Sam Roberts** <vieuxtech@gmail.com> * [targos](https://github.com/targos) - **Michaël Zasso** <targos@protonmail.com> (he/him) -* [thefourtheye](https://github.com/thefourtheye) - -**Sakthipriyan Vairamani** <thechargingvolcano@gmail.com> (he/him) * [tniessen](https://github.com/tniessen) - **Tobias Nießen** <tniessen@tnie.de> * [Trott](https://github.com/Trott) - @@ -199,8 +194,12 @@ For information about the governance of the Node.js project, see **Chris Dickinson** <christopher.s.dickinson@gmail.com> * [evanlucas](https://github.com/evanlucas) - **Evan Lucas** <evanlucas@me.com> (he/him) +* [Fishrock123](https://github.com/Fishrock123) - +**Jeremiah Senkpiel** <fishrock123@rocketmail.com> (he/they) * [gibfahn](https://github.com/gibfahn) - **Gibson Fahnestock** <gibfahn@gmail.com> (he/him) +* [gireeshpunathil](https://github.com/gireeshpunathil) - +**Gireesh Punathil** <gpunathi@in.ibm.com> (he/him) * [indutny](https://github.com/indutny) - **Fedor Indutny** <fedor.indutny@gmail.com> * [isaacs](https://github.com/isaacs) - @@ -221,6 +220,8 @@ For information about the governance of the Node.js project, see **Rod Vagg** <r@va.gg> * [shigeki](https://github.com/shigeki) - **Shigeki Ohtsu** <ohtsu@ohtsu.org> (he/him) +* [thefourtheye](https://github.com/thefourtheye) - +**Sakthipriyan Vairamani** <thechargingvolcano@gmail.com> (he/him) * [TimothyGu](https://github.com/TimothyGu) - **Tiancheng "Timothy" Gu** <timothygu99@gmail.com> (he/him) * [trevnorris](https://github.com/trevnorris) - @@ -238,8 +239,6 @@ For information about the governance of the Node.js project, see **Anto Aravinth** <anto.aravinth.cse@gmail.com> (he/him) * [apapirovski](https://github.com/apapirovski) - **Anatoli Papirovski** <apapirovski@mac.com> (he/him) -* [aqrln](https://github.com/aqrln) - -**Alexey Orlenko** <eaglexrlnk@gmail.com> (he/him) * [bcoe](https://github.com/bcoe) - **Ben Coe** <bencoe@gmail.com> (he/him) * [bengl](https://github.com/bengl) - @@ -260,8 +259,6 @@ For information about the governance of the Node.js project, see **Ruben Bridgewater** <ruben@bridgewater.de> (he/him) * [bzoz](https://github.com/bzoz) - **Bartosz Sosnowski** <bartosz@janeasystems.com> -* [calvinmetcalf](https://github.com/calvinmetcalf) - -**Calvin Metcalf** <calvin.metcalf@gmail.com> * [cclauss](https://github.com/cclauss) - **Christian Clauss** <cclauss@me.com> (he/him) * [ChALkeR](https://github.com/ChALkeR) - @@ -284,8 +281,6 @@ For information about the governance of the Node.js project, see **Hitesh Kanwathirtha** <digitalinfinity@gmail.com> (he/him) * [edsadr](https://github.com/edsadr) - **Adrian Estrada** <edsadr@gmail.com> (he/him) -* [eljefedelrodeodeljefe](https://github.com/eljefedelrodeodeljefe) - -**Robert Jefe Lindstaedt** <robert.lindstaedt@gmail.com> * [eugeneo](https://github.com/eugeneo) - **Eugene Ostroukhov** <eostroukhov@google.com> * [evanlucas](https://github.com/evanlucas) - @@ -293,7 +288,7 @@ For information about the governance of the Node.js project, see * [fhinkel](https://github.com/fhinkel) - **Franziska Hinkelmann** <franziska.hinkelmann@gmail.com> (she/her) * [Fishrock123](https://github.com/Fishrock123) - -**Jeremiah Senkpiel** <fishrock123@rocketmail.com> +**Jeremiah Senkpiel** <fishrock123@rocketmail.com> (he/they) * [gabrielschulhof](https://github.com/gabrielschulhof) - **Gabriel Schulhof** <gabriel.schulhof@intel.com> * [gdams](https://github.com/gdams) - @@ -302,6 +297,8 @@ For information about the governance of the Node.js project, see **Wyatt Preul** <wpreul@gmail.com> * [gengjiawen](https://github.com/gengjiawen) - **Jiawen Geng** <technicalcute@gmail.com> +* [GeoffreyBooth](https://github.com/geoffreybooth) - +**Geoffrey Booth** <webmaster@geoffreybooth.com> (he/him) * [gibfahn](https://github.com/gibfahn) - **Gibson Fahnestock** <gibfahn@gmail.com> (he/him) * [gireeshpunathil](https://github.com/gireeshpunathil) - @@ -322,8 +319,6 @@ For information about the governance of the Node.js project, see **Jackson Tian** <shyvo1987@gmail.com> * [jasnell](https://github.com/jasnell) - **James M Snell** <jasnell@gmail.com> (he/him) -* [jbergstroem](https://github.com/jbergstroem) - -**Johan Bergström** <bugs@bergstroem.nu> * [jdalton](https://github.com/jdalton) - **John-David Dalton** <john.david.dalton@gmail.com> * [jkrems](https://github.com/jkrems) - @@ -332,8 +327,6 @@ For information about the governance of the Node.js project, see **João Reis** <reis@janeasystems.com> * [joyeecheung](https://github.com/joyeecheung) - **Joyee Cheung** <joyeec9h3@gmail.com> (she/her) -* [julianduque](https://github.com/julianduque) - -**Julian Duque** <julianduquej@gmail.com> (he/him) * [JungMinu](https://github.com/JungMinu) - **Minwoo Jung** <nodecorelab@gmail.com> (he/him) * [kfarnung](https://github.com/kfarnung) - @@ -348,9 +341,7 @@ For information about the governance of the Node.js project, see **Luigi Pinca** <luigipinca@gmail.com> (he/him) * [lundibundi](https://github.com/lundibundi) - **Denys Otrishko** <shishugi@gmail.com> (he/him) -* [maclover7](https://github.com/maclover7) - -**Jon Moss** <me@jonathanmoss.me> (he/him) -* [mafintosh](https://github.com/mafintosh) +* [mafintosh](https://github.com/mafintosh) - **Mathias Buus** <mathiasbuus@gmail.com> (he/him) * [mcollina](https://github.com/mcollina) - **Matteo Collina** <matteo.collina@gmail.com> (he/him) @@ -366,14 +357,10 @@ For information about the governance of the Node.js project, see **Brian White** <mscdex@mscdex.net> * [MylesBorins](https://github.com/MylesBorins) - **Myles Borins** <myles.borins@gmail.com> (he/him) -* [not-an-aardvark](https://github.com/not-an-aardvark) - -**Teddy Katz** <teddy.katz@gmail.com> (he/him) * [ofrobots](https://github.com/ofrobots) - **Ali Ijaz Sheikh** <ofrobots@google.com> (he/him) * [oyyd](https://github.com/oyyd) - **Ouyang Yadong** <oyydoibh@gmail.com> (he/him) -* [princejwesley](https://github.com/princejwesley) - -**Prince John Wesley** <princejohnwesley@gmail.com> * [psmarshall](https://github.com/psmarshall) - **Peter Marshall** <petermarshall@chromium.org> (he/him) * [Qard](https://github.com/Qard) - @@ -382,6 +369,8 @@ For information about the governance of the Node.js project, see **Refael Ackermann (רפאל פלחי)** <refack@gmail.com> (he/him/הוא/אתה) * [richardlau](https://github.com/richardlau) - **Richard Lau** <riclau@uk.ibm.com> +* [ronag](https://github.com/ronag) - +**Robert Nagy** <ronagy@icloud.com> * [ronkorving](https://github.com/ronkorving) - **Ron Korving** <ron@ronkorving.nl> * [rubys](https://github.com/rubys) - @@ -389,7 +378,7 @@ For information about the governance of the Node.js project, see * [rvagg](https://github.com/rvagg) - **Rod Vagg** <rod@vagg.org> * [ryzokuken](https://github.com/ryzokuken) - -**Ujjwal Sharma** <usharma1998@gmail.com> (he/him) +**Ujjwal Sharma** <ryzokuken@disroot.org> (he/him) * [saghul](https://github.com/saghul) - **Saúl Ibarra Corretgé** <saghul@gmail.com> * [sam-github](https://github.com/sam-github) - @@ -414,8 +403,6 @@ For information about the governance of the Node.js project, see **Michaël Zasso** <targos@protonmail.com> (he/him) * [thefourtheye](https://github.com/thefourtheye) - **Sakthipriyan Vairamani** <thechargingvolcano@gmail.com> (he/him) -* [thekemkid](https://github.com/thekemkid) - -**Glen Keane** <glenkeane.94@gmail.com> (he/him) * [TimothyGu](https://github.com/TimothyGu) - **Tiancheng "Timothy" Gu** <timothygu99@gmail.com> (he/him) * [tniessen](https://github.com/tniessen) - @@ -428,8 +415,6 @@ For information about the governance of the Node.js project, see **Rich Trott** <rtrott@gmail.com> (he/him) * [vdeturckheim](https://github.com/vdeturckheim) - **Vladimir de Turckheim** <vlad2t@hotmail.com> (he/him) -* [vkurchatkin](https://github.com/vkurchatkin) - -**Vladimir Kurchatkin** <vladimir.kurchatkin@gmail.com> * [watilde](https://github.com/watilde) - **Daijiro Wachi** <daijiro.wachi@gmail.com> (he/him) * [watson](https://github.com/watson) - @@ -451,16 +436,24 @@ For information about the governance of the Node.js project, see **Andras** <andras@kinvey.com> * [AnnaMag](https://github.com/AnnaMag) - **Anna M. Kedzierska** <anna.m.kedzierska@gmail.com> +* [aqrln](https://github.com/aqrln) - +**Alexey Orlenko** <eaglexrlnk@gmail.com> (he/him) * [brendanashworth](https://github.com/brendanashworth) - **Brendan Ashworth** <brendan.ashworth@me.com> -* [estliberitas](https://github.com/estliberitas) - -**Alexander Makarenko** <estliberitas@gmail.com> +* [calvinmetcalf](https://github.com/calvinmetcalf) - +**Calvin Metcalf** <calvin.metcalf@gmail.com> * [chrisdickinson](https://github.com/chrisdickinson) - **Chris Dickinson** <christopher.s.dickinson@gmail.com> * [DavidCai1993](https://github.com/DavidCai1993) - **David Cai** <davidcai1993@yahoo.com> (he/him) +* [eljefedelrodeodeljefe](https://github.com/eljefedelrodeodeljefe) - +**Robert Jefe Lindstaedt** <robert.lindstaedt@gmail.com> +* [estliberitas](https://github.com/estliberitas) - +**Alexander Makarenko** <estliberitas@gmail.com> * [firedfox](https://github.com/firedfox) - **Daniel Wang** <wangyang0123@gmail.com> +* [glentiki](https://github.com/glentiki) - +**Glen Keane** <glenkeane.94@gmail.com> (he/him) * [imran-iq](https://github.com/imran-iq) - **Imran Iqbal** <imran@imraniqbal.org> * [imyller](https://github.com/imyller) - @@ -469,16 +462,22 @@ For information about the governance of the Node.js project, see **Isaac Z. Schlueter** <i@izs.me> * [jasongin](https://github.com/jasongin) - **Jason Ginchereau** <jasongin@microsoft.com> +* [jbergstroem](https://github.com/jbergstroem) - +**Johan Bergström** <bugs@bergstroem.nu> * [jhamhader](https://github.com/jhamhader) - **Yuval Brik** <yuval@brik.org.il> * [joshgav](https://github.com/joshgav) - **Josh Gavant** <josh.gavant@outlook.com> +* [julianduque](https://github.com/julianduque) - +**Julian Duque** <julianduquej@gmail.com> (he/him) * [kunalspathak](https://github.com/kunalspathak) - **Kunal Pathak** <kunal.pathak@microsoft.com> * [lucamaraschi](https://github.com/lucamaraschi) - **Luca Maraschi** <luca.maraschi@gmail.com> (he/him) * [lxe](https://github.com/lxe) - **Aleksey Smolenchuk** <lxe@lxe.co> +* [maclover7](https://github.com/maclover7) - +**Jon Moss** <me@jonathanmoss.me> (he/him) * [matthewloring](https://github.com/matthewloring) - **Matthew Loring** <mattloring@google.com> * [micnic](https://github.com/micnic) - @@ -487,6 +486,8 @@ For information about the governance of the Node.js project, see **Mikeal Rogers** <mikeal.rogers@gmail.com> * [monsanto](https://github.com/monsanto) - **Christopher Monsanto** <chris@monsan.to> +* [not-an-aardvark](https://github.com/not-an-aardvark) - +**Teddy Katz** <teddy.katz@gmail.com> (he/him) * [Olegas](https://github.com/Olegas) - **Oleg Elifantiev** <oleg@elifantiev.ru> * [orangemocha](https://github.com/orangemocha) - @@ -501,6 +502,8 @@ For information about the governance of the Node.js project, see **Bert Belder** <bertbelder@gmail.com> * [pmq20](https://github.com/pmq20) - **Minqi Pan** <pmq2001@gmail.com> +* [princejwesley](https://github.com/princejwesley) - +**Prince John Wesley** <princejohnwesley@gmail.com> * [rlidwka](https://github.com/rlidwka) - **Alex Kocharin** <alex@kocharin.ru> * [rmg](https://github.com/rmg) - @@ -519,12 +522,14 @@ For information about the governance of the Node.js project, see **Thorsten Lorenz** <thlorenz@gmx.de> * [tunniclm](https://github.com/tunniclm) - **Mike Tunnicliffe** <m.j.tunnicliffe@gmail.com> +* [vkurchatkin](https://github.com/vkurchatkin) - +**Vladimir Kurchatkin** <vladimir.kurchatkin@gmail.com> * [vsemozhetbyt](https://github.com/vsemozhetbyt) - **Vse Mozhet Byt** <vsemozhetbyt@gmail.com> (he/him) * [whitlockjc](https://github.com/whitlockjc) - **Jeremy Whitlock** <jwhitlock@apache.org> -Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in +Collaborators follow the [Collaborator Guide](./doc/guides/collaborator-guide.md) in maintaining the Node.js project. ### Release Keys @@ -535,14 +540,8 @@ GPG keys used to sign Node.js releases: `4ED778F539E3634C779C87C6D7062848A1AB005C` * **Colin Ihrig** <cjihrig@gmail.com> `94AE36675C464D64BAFA68DD7434390BDBE9B9C5` -* **Evan Lucas** <evanlucas@me.com> -`B9AE9905FFD7803F25714661B63B535A4C206CA9` -* **Gibson Fahnestock** <gibfahn@gmail.com> -`77984A986EBC2AA786BC0F66B01FBB92821C587A` * **James M Snell** <jasnell@keybase.io> `71DCFD284A79C3B38668286BC97EC7A07EDE3FC1` -* **Jeremiah Senkpiel** <fishrock@keybase.io> -`FD3A5288F042B6850C66B31F09FE44734EB7990E` * **Michaël Zasso** <targos@protonmail.com> `8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600` * **Myles Borins** <myles.borins@gmail.com> @@ -558,16 +557,13 @@ To import the full set of trusted release keys: ```shell gpg --keyserver pool.sks-keyservers.net --recv-keys 4ED778F539E3634C779C87C6D7062848A1AB005C -gpg --keyserver pool.sks-keyservers.net --recv-keys B9E2F5981AA6E0CD28160D9FF13993A75599653C gpg --keyserver pool.sks-keyservers.net --recv-keys 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 -gpg --keyserver pool.sks-keyservers.net --recv-keys B9AE9905FFD7803F25714661B63B535A4C206CA9 -gpg --keyserver pool.sks-keyservers.net --recv-keys 77984A986EBC2AA786BC0F66B01FBB92821C587A gpg --keyserver pool.sks-keyservers.net --recv-keys 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 -gpg --keyserver pool.sks-keyservers.net --recv-keys FD3A5288F042B6850C66B31F09FE44734EB7990E gpg --keyserver pool.sks-keyservers.net --recv-keys 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 gpg --keyserver pool.sks-keyservers.net --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 gpg --keyserver pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D gpg --keyserver pool.sks-keyservers.net --recv-keys A48C2BEE680E841632CD4E44F07496B3EB3C1762 +gpg --keyserver pool.sks-keyservers.net --recv-keys B9E2F5981AA6E0CD28160D9FF13993A75599653C ``` See the section above on [Verifying Binaries](#verifying-binaries) for how to @@ -577,10 +573,16 @@ Other keys used to sign some previous releases: * **Chris Dickinson** <christopher.s.dickinson@gmail.com> `9554F04D7259F04124DE6B476D5A82AC7E37093B` +* **Evan Lucas** <evanlucas@me.com> +`B9AE9905FFD7803F25714661B63B535A4C206CA9` +* **Gibson Fahnestock** <gibfahn@gmail.com> +`77984A986EBC2AA786BC0F66B01FBB92821C587A` * **Isaac Z. Schlueter** <i@izs.me> `93C7E9E91B49E432C2F75674B0A78B0A6C481CF6` * **Italo A. Casas** <me@italoacasas.com> `56730D5401028683275BD23C23EFEFE93C4CFFFE` +* **Jeremiah Senkpiel** <fishrock@keybase.io> +`FD3A5288F042B6850C66B31F09FE44734EB7990E` * **Julien Gilli** <jgilli@fastmail.fm> `114F43EE0176B71C7BC219DD50A3051F888C628D` * **Timothy J Fontaine** <tjfontaine@gmail.com> diff --git a/benchmark/README.md b/benchmark/README.md index c5fdad093471b5..6a40d7af3e1fcf 100644 --- a/benchmark/README.md +++ b/benchmark/README.md @@ -5,7 +5,7 @@ of different Node.js implementations and different ways of writing JavaScript run by the built-in JavaScript engine. For a detailed guide on how to write and run benchmarks in this -directory, see [the guide on benchmarks](writing-and-running-benchmarks.md). +directory, see [the guide on benchmarks](../doc/guides/writing-and-running-benchmarks.md). ## Table of Contents @@ -76,17 +76,17 @@ writing benchmarks. ### `createBenchmark(fn, configs[, options])` -See [the guide on writing benchmarks](writing-and-running-benchmarks.md#basics-of-a-benchmark). +See [the guide on writing benchmarks](../doc/guides/writing-and-running-benchmarks.md#basics-of-a-benchmark). ### `default_http_benchmarker` The default benchmarker used to run HTTP benchmarks. -See [the guide on writing HTTP benchmarks](writing-and-running-benchmarks.md#creating-an-http-benchmark). +See [the guide on writing HTTP benchmarks](../doc/guides/writing-and-running-benchmarks.md#creating-an-http-benchmark). ### `PORT` The default port used to run HTTP benchmarks. -See [the guide on writing HTTP benchmarks](writing-and-running-benchmarks.md#creating-an-http-benchmark). +See [the guide on writing HTTP benchmarks](../doc/guides/writing-and-running-benchmarks.md#creating-an-http-benchmark). ### `sendResult(data)` diff --git a/benchmark/assert/deepequal-buffer.js b/benchmark/assert/deepequal-buffer.js index 6d9162f15173f9..69cca91cc6d752 100644 --- a/benchmark/assert/deepequal-buffer.js +++ b/benchmark/assert/deepequal-buffer.js @@ -6,12 +6,10 @@ const bench = common.createBenchmark(main, { n: [2e4], len: [1e2, 1e3], strict: [0, 1], - method: [ 'deepEqual', 'notDeepEqual' ], + method: ['deepEqual', 'notDeepEqual'], }); function main({ len, n, method, strict }) { - if (!method) - method = 'deepEqual'; const data = Buffer.allocUnsafe(len + 1); const actual = Buffer.alloc(len); const expected = Buffer.alloc(len); diff --git a/benchmark/assert/deepequal-map.js b/benchmark/assert/deepequal-map.js index b88ecf7ce127f9..77408e3d103475 100644 --- a/benchmark/assert/deepequal-map.js +++ b/benchmark/assert/deepequal-map.js @@ -34,8 +34,6 @@ function main({ n, len, method, strict }) { const array = Array(len).fill(1); switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'deepEqual_primitiveOnly': { const values = array.map((_, i) => [`str_${i}`, 123]); benchmark(strict ? deepStrictEqual : deepEqual, n, values); diff --git a/benchmark/assert/deepequal-object.js b/benchmark/assert/deepequal-object.js index e23f6692b3decd..a8c539426a8156 100644 --- a/benchmark/assert/deepequal-object.js +++ b/benchmark/assert/deepequal-object.js @@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, { n: [5e3], size: [1e2, 1e3, 5e4], strict: [0, 1], - method: [ 'deepEqual', 'notDeepEqual' ], + method: ['deepEqual', 'notDeepEqual'], }); function createObj(source, add = '') { @@ -27,9 +27,6 @@ function main({ size, n, method, strict }) { // TODO: Fix this "hack". `n` should not be manipulated. n = Math.min(Math.ceil(n / size), 20); - if (!method) - method = 'deepEqual'; - const source = Array.apply(null, Array(size)); const actual = createObj(source); const expected = createObj(source); diff --git a/benchmark/assert/deepequal-prims-and-objs-big-array-set.js b/benchmark/assert/deepequal-prims-and-objs-big-array-set.js index 0e0ce450bb1a98..ad049ded02ce9d 100644 --- a/benchmark/assert/deepequal-prims-and-objs-big-array-set.js +++ b/benchmark/assert/deepequal-prims-and-objs-big-array-set.js @@ -52,8 +52,6 @@ function main({ n, len, primitive, method, strict }) { const expectedWrongSet = new Set(expectedWrong); switch (method) { - // Empty string falls through to next line as default, mostly for tests. - case '': case 'deepEqual_Array': run(strict ? deepStrictEqual : deepEqual, n, actual, expected); break; diff --git a/benchmark/assert/deepequal-prims-and-objs-big-loop.js b/benchmark/assert/deepequal-prims-and-objs-big-loop.js index 32140f08ded6fb..2d01431b1fc563 100644 --- a/benchmark/assert/deepequal-prims-and-objs-big-loop.js +++ b/benchmark/assert/deepequal-prims-and-objs-big-loop.js @@ -13,12 +13,10 @@ const bench = common.createBenchmark(main, { primitive: Object.keys(primValues), n: [2e4], strict: [0, 1], - method: [ 'deepEqual', 'notDeepEqual' ], + method: ['deepEqual', 'notDeepEqual'], }); function main({ n, primitive, method, strict }) { - if (!method) - method = 'deepEqual'; const prim = primValues[primitive]; const actual = prim; const expected = prim; diff --git a/benchmark/assert/deepequal-set.js b/benchmark/assert/deepequal-set.js index 561a951e6834cc..27ca7c92bce1b0 100644 --- a/benchmark/assert/deepequal-set.js +++ b/benchmark/assert/deepequal-set.js @@ -34,8 +34,6 @@ function main({ n, len, method, strict }) { const array = Array(len).fill(1); switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'deepEqual_primitiveOnly': { const values = array.map((_, i) => `str_${i}`); benchmark(strict ? deepStrictEqual : deepEqual, n, values); diff --git a/benchmark/assert/deepequal-typedarrays.js b/benchmark/assert/deepequal-typedarrays.js index 10ba21a25759e2..188cfce695ed61 100644 --- a/benchmark/assert/deepequal-typedarrays.js +++ b/benchmark/assert/deepequal-typedarrays.js @@ -20,8 +20,6 @@ const bench = common.createBenchmark(main, { }); function main({ type, n, len, method, strict }) { - if (!method) - method = 'deepEqual'; const clazz = global[type]; const actual = new clazz(len); const expected = new clazz(len); diff --git a/benchmark/assert/throws.js b/benchmark/assert/throws.js index c80518377a8742..978ad2f1b8bef0 100644 --- a/benchmark/assert/throws.js +++ b/benchmark/assert/throws.js @@ -15,8 +15,6 @@ function main({ n, method }) { const message = 'failure'; switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'doesNotThrow': bench.start(); for (let i = 0; i < n; ++i) { diff --git a/benchmark/async_hooks/http-server.js b/benchmark/async_hooks/http-server.js index 493500fd1f2d66..9e1c1214240eaa 100644 --- a/benchmark/async_hooks/http-server.js +++ b/benchmark/async_hooks/http-server.js @@ -26,15 +26,15 @@ function main({ asyncHooks, connections }) { } } const server = require('../fixtures/simple-http-server.js') - .listen(common.PORT) - .on('listening', () => { - const path = '/buffer/4/4/normal/1'; + .listen(common.PORT) + .on('listening', () => { + const path = '/buffer/4/4/normal/1'; - bench.http({ - connections, - path, - }, () => { - server.close(); + bench.http({ + connections, + path, + }, () => { + server.close(); + }); }); - }); } diff --git a/benchmark/async_hooks/promises.js b/benchmark/async_hooks/promises.js new file mode 100644 index 00000000000000..eb90ca0368e079 --- /dev/null +++ b/benchmark/async_hooks/promises.js @@ -0,0 +1,30 @@ +'use strict'; +const common = require('../common.js'); +const { createHook } = require('async_hooks'); + +const bench = common.createBenchmark(main, { + n: [1e6], + asyncHooks: [ + 'enabled', + 'disabled', + ] +}); + +async function run(n) { + for (let i = 0; i < n; i++) { + await new Promise((resolve) => resolve()) + .then(() => { throw new Error('foobar'); }) + .catch((e) => e); + } +} + +function main({ n, asyncHooks }) { + const hook = createHook({ promiseResolve() {} }); + if (asyncHooks !== 'disabled') { + hook.enable(); + } + bench.start(); + run(n).then(() => { + bench.end(n); + }); +} diff --git a/benchmark/buffers/buffer-bytelength.js b/benchmark/buffers/buffer-bytelength.js index 1b324a49f89de8..fbbe0f040da56a 100644 --- a/benchmark/buffers/buffer-bytelength.js +++ b/benchmark/buffers/buffer-bytelength.js @@ -17,9 +17,9 @@ const chars = [ function main({ n, len, encoding }) { let strings = []; - let results = [ len * 16 ]; + let results = [len * 16]; if (encoding === 'buffer') { - strings = [ Buffer.alloc(len * 16, 'a') ]; + strings = [Buffer.alloc(len * 16, 'a')]; } else { for (const string of chars) { // Strings must be built differently, depending on encoding diff --git a/benchmark/buffers/buffer-concat-fill.js b/benchmark/buffers/buffer-concat-fill.js new file mode 100644 index 00000000000000..8fb389fe6c8639 --- /dev/null +++ b/benchmark/buffers/buffer-concat-fill.js @@ -0,0 +1,23 @@ +'use strict'; +const common = require('../common.js'); + +const bench = common.createBenchmark(main, { + extraSize: [1, 256, 4 * 256], + n: [8e5] +}); + +function main({ n, extraSize }) { + const pieces = 4; + const pieceSize = 256; + + const list = Array.from({ length: pieces }) + .fill(Buffer.allocUnsafe(pieceSize)); + + const totalLength = (pieces * pieceSize) + extraSize; + + bench.start(); + for (let i = 0; i < n; i++) { + Buffer.concat(list, totalLength); + } + bench.end(n); +} diff --git a/benchmark/buffers/buffer-creation.js b/benchmark/buffers/buffer-creation.js index 38d80da915c070..862bff4fbabe58 100644 --- a/benchmark/buffers/buffer-creation.js +++ b/benchmark/buffers/buffer-creation.js @@ -16,7 +16,6 @@ const bench = common.createBenchmark(main, { function main({ len, n, type }) { let fn, i; switch (type) { - case '': case 'fast-alloc': fn = Buffer.alloc; break; diff --git a/benchmark/buffers/buffer-fill.js b/benchmark/buffers/buffer-fill.js index 02bc2a206c6fe3..8d4d4996068224 100644 --- a/benchmark/buffers/buffer-fill.js +++ b/benchmark/buffers/buffer-fill.js @@ -22,7 +22,7 @@ function main({ n, type, size }) { const buffer = Buffer.allocUnsafe(size); const testFunction = new Function('b', ` for (var i = 0; i < ${n}; i++) { - b.${type || 'fill(0)'}; + b.${type}; } `); bench.start(); diff --git a/benchmark/buffers/buffer-from.js b/benchmark/buffers/buffer-from.js index 1df1b5b362fefa..d0f7d42f5e4369 100644 --- a/benchmark/buffers/buffer-from.js +++ b/benchmark/buffers/buffer-from.js @@ -12,37 +12,37 @@ const bench = common.createBenchmark(main, { 'string-utf8', 'string-base64', 'object', + 'uint8array', + 'uint16array', ], len: [100, 2048], n: [8e5] }); function main({ len, n, source }) { - const array = new Array(len).fill(42); - const arrayBuf = new ArrayBuffer(len); - const str = 'a'.repeat(len); - const buffer = Buffer.allocUnsafe(len); - const uint8array = new Uint8Array(len); - const obj = { length: null }; // Results in a new, empty Buffer - let i = 0; switch (source) { - case 'array': + case 'array': { + const array = new Array(len).fill(42); bench.start(); for (i = 0; i < n; i++) { Buffer.from(array); } bench.end(n); break; - case 'arraybuffer': + } + case 'arraybuffer': { + const arrayBuf = new ArrayBuffer(len); bench.start(); for (i = 0; i < n; i++) { Buffer.from(arrayBuf); } bench.end(n); break; - case 'arraybuffer-middle': + } + case 'arraybuffer-middle': { + const arrayBuf = new ArrayBuffer(len); const offset = ~~(len / 4); const length = ~~(len / 2); bench.start(); @@ -51,48 +51,70 @@ function main({ len, n, source }) { } bench.end(n); break; - case 'buffer': + } + case 'buffer': { + const buffer = Buffer.allocUnsafe(len); bench.start(); for (i = 0; i < n; i++) { Buffer.from(buffer); } bench.end(n); break; - case 'uint8array': + } + case 'uint8array': { + const uint8array = new Uint8Array(len); bench.start(); for (i = 0; i < n; i++) { Buffer.from(uint8array); } bench.end(n); break; - case 'string': + } + case 'uint16array': { + const uint16array = new Uint16Array(len); + bench.start(); + for (i = 0; i < n; i++) { + Buffer.from(uint16array); + } + bench.end(n); + break; + } + case 'string': { + const str = 'a'.repeat(len); bench.start(); for (i = 0; i < n; i++) { Buffer.from(str); } bench.end(n); break; - case 'string-utf8': + } + case 'string-utf8': { + const str = 'a'.repeat(len); bench.start(); for (i = 0; i < n; i++) { Buffer.from(str, 'utf8'); } bench.end(n); break; - case 'string-base64': + } + case 'string-base64': { + const str = 'a'.repeat(len); bench.start(); for (i = 0; i < n; i++) { Buffer.from(str, 'base64'); } bench.end(n); break; - case 'object': + } + case 'object': { + const obj = { length: null }; // Results in a new, empty Buffer bench.start(); for (i = 0; i < n; i++) { Buffer.from(obj); } bench.end(n); break; + } default: assert.fail('Should not get here'); } diff --git a/benchmark/buffers/buffer-iterate.js b/benchmark/buffers/buffer-iterate.js index de002108a95d65..3e2a897903d435 100644 --- a/benchmark/buffers/buffer-iterate.js +++ b/benchmark/buffers/buffer-iterate.js @@ -21,7 +21,7 @@ function main({ size, type, method, n }) { Buffer.alloc(size) : SlowBuffer(size).fill(0); - const fn = methods[method || 'for']; + const fn = methods[method]; bench.start(); fn(buffer, n); diff --git a/benchmark/buffers/buffer-read-float.js b/benchmark/buffers/buffer-read-float.js index e8c4f8bf549628..656762d1d4f1d0 100644 --- a/benchmark/buffers/buffer-read-float.js +++ b/benchmark/buffers/buffer-read-float.js @@ -9,7 +9,6 @@ const bench = common.createBenchmark(main, { }); function main({ n, type, endian, value }) { - type = type || 'Double'; const buff = Buffer.alloc(8); const fn = `read${type}${endian}`; const values = { diff --git a/benchmark/buffers/buffer-read-with-byteLength.js b/benchmark/buffers/buffer-read-with-byteLength.js index 6ba1594b8ac6eb..c51ab11ae986d7 100644 --- a/benchmark/buffers/buffer-read-with-byteLength.js +++ b/benchmark/buffers/buffer-read-with-byteLength.js @@ -19,7 +19,7 @@ function main({ n, buf, type, byteLength }) { const buff = buf === 'fast' ? Buffer.alloc(8) : require('buffer').SlowBuffer(8); - const fn = `read${type || 'IntBE'}`; + const fn = `read${type}`; buff.writeDoubleLE(0, 0); bench.start(); diff --git a/benchmark/buffers/buffer-read.js b/benchmark/buffers/buffer-read.js index 2ddca60df44c29..e0ec13992c2fae 100644 --- a/benchmark/buffers/buffer-read.js +++ b/benchmark/buffers/buffer-read.js @@ -28,7 +28,7 @@ function main({ n, buf, type }) { const buff = buf === 'fast' ? Buffer.alloc(8) : require('buffer').SlowBuffer(8); - const fn = `read${type || 'UInt8'}`; + const fn = `read${type}`; buff.writeDoubleLE(0, 0); bench.start(); diff --git a/benchmark/buffers/buffer-swap.js b/benchmark/buffers/buffer-swap.js index a33bac4ae3ed78..87eb13f48ffae6 100644 --- a/benchmark/buffers/buffer-swap.js +++ b/benchmark/buffers/buffer-swap.js @@ -74,7 +74,7 @@ function genMethod(method) { function main({ method, len, n, aligned = 'true' }) { const buf = createBuffer(len, aligned === 'true'); - const bufferSwap = genMethod(method || 'swap16'); + const bufferSwap = genMethod(method); bufferSwap(n, buf); bench.start(); diff --git a/benchmark/buffers/buffer-write.js b/benchmark/buffers/buffer-write.js index db5a57d0023e72..5025dd2bca0407 100644 --- a/benchmark/buffers/buffer-write.js +++ b/benchmark/buffers/buffer-write.js @@ -74,7 +74,7 @@ function main({ n, buf, type }) { const buff = buf === 'fast' ? Buffer.alloc(8) : require('buffer').SlowBuffer(8); - const fn = `write${type || 'UInt8'}`; + const fn = `write${type}`; if (!/\d/.test(fn)) benchSpecialInt(buff, fn, n); diff --git a/benchmark/buffers/dataview-set.js b/benchmark/buffers/dataview-set.js index a741d11356ea32..b7914fe45f175b 100644 --- a/benchmark/buffers/dataview-set.js +++ b/benchmark/buffers/dataview-set.js @@ -40,7 +40,6 @@ const mod = { }; function main({ n, type }) { - type = type || 'Uint8'; const ab = new ArrayBuffer(8); const dv = new DataView(ab, 0, 8); const le = /LE$/.test(type); diff --git a/benchmark/common.js b/benchmark/common.js index 6a3be4fc376920..62cd4023c1d860 100644 --- a/benchmark/common.js +++ b/benchmark/common.js @@ -3,217 +3,225 @@ const child_process = require('child_process'); const http_benchmarkers = require('./_http-benchmarkers.js'); -exports.buildType = process.features.debug ? 'Debug' : 'Release'; - -exports.createBenchmark = function(fn, configs, options) { - return new Benchmark(fn, configs, options); -}; - -function Benchmark(fn, configs, options) { - // Use the file name as the name of the benchmark - this.name = require.main.filename.slice(__dirname.length + 1); - // Parse job-specific configuration from the command line arguments - const parsed_args = this._parseArgs(process.argv.slice(2), configs); - this.options = parsed_args.cli; - this.extra_options = parsed_args.extra; - // The configuration list as a queue of jobs - this.queue = this._queue(this.options); - // The configuration of the current job, head of the queue - this.config = this.queue[0]; - // Execution arguments i.e. flags used to run the jobs - this.flags = []; - if (options && options.flags) { - this.flags = this.flags.concat(options.flags); - } - if (process.env.NODE_BENCHMARK_FLAGS) { - const flags = process.env.NODE_BENCHMARK_FLAGS.split(/\s+/); - this.flags = this.flags.concat(flags); - } - // Holds process.hrtime value - this._time = [0, 0]; - // Used to make sure a benchmark only start a timer once - this._started = false; - - // this._run will use fork() to create a new process for each configuration - // combination. - if (process.env.hasOwnProperty('NODE_RUN_BENCHMARK_FN')) { - process.nextTick(() => fn(this.config)); - } else { - process.nextTick(() => this._run()); - } -} - -Benchmark.prototype._parseArgs = function(argv, configs) { - const cliOptions = {}; - const extraOptions = {}; - const validArgRE = /^(.+?)=([\s\S]*)$/; - // Parse configuration arguments - for (const arg of argv) { - const match = arg.match(validArgRE); - if (!match) { - console.error(`bad argument: ${arg}`); - process.exit(1); +class Benchmark { + constructor(fn, configs, options) { + // Use the file name as the name of the benchmark + this.name = require.main.filename.slice(__dirname.length + 1); + // Parse job-specific configuration from the command line arguments + const parsed_args = this._parseArgs(process.argv.slice(2), configs); + this.options = parsed_args.cli; + this.extra_options = parsed_args.extra; + // The configuration list as a queue of jobs + this.queue = this._queue(this.options); + // The configuration of the current job, head of the queue + this.config = this.queue[0]; + // Execution arguments i.e. flags used to run the jobs + this.flags = []; + if (options && options.flags) { + this.flags = this.flags.concat(options.flags); } - const config = match[1]; - - if (configs[config]) { - // Infer the type from the config object and parse accordingly - const isNumber = typeof configs[config][0] === 'number'; - const value = isNumber ? +match[2] : match[2]; - if (!cliOptions[config]) - cliOptions[config] = []; - cliOptions[config].push(value); + if (process.env.NODE_BENCHMARK_FLAGS) { + const flags = process.env.NODE_BENCHMARK_FLAGS.split(/\s+/); + this.flags = this.flags.concat(flags); + } + // Holds process.hrtime value + this._time = [0, 0]; + // Used to make sure a benchmark only start a timer once + this._started = false; + this._ended = false; + + // this._run will use fork() to create a new process for each configuration + // combination. + if (process.env.hasOwnProperty('NODE_RUN_BENCHMARK_FN')) { + process.nextTick(() => fn(this.config)); } else { - extraOptions[config] = match[2]; + process.nextTick(() => this._run()); } } - return { cli: Object.assign({}, configs, cliOptions), extra: extraOptions }; -}; - -Benchmark.prototype._queue = function(options) { - const queue = []; - const keys = Object.keys(options); - - // Perform a depth-first walk though all options to generate a - // configuration list that contains all combinations. - function recursive(keyIndex, prevConfig) { - const key = keys[keyIndex]; - const values = options[key]; - const type = typeof values[0]; - for (const value of values) { - if (typeof value !== 'number' && typeof value !== 'string') { - throw new TypeError(`configuration "${key}" had type ${typeof value}`); + _parseArgs(argv, configs) { + const cliOptions = {}; + const extraOptions = {}; + const validArgRE = /^(.+?)=([\s\S]*)$/; + // Parse configuration arguments + for (const arg of argv) { + const match = arg.match(validArgRE); + if (!match) { + console.error(`bad argument: ${arg}`); + process.exit(1); } - if (typeof value !== type) { - // This is a requirement for being able to consistently and predictably - // parse CLI provided configuration values. - throw new TypeError(`configuration "${key}" has mixed types`); + const config = match[1]; + + if (configs[config]) { + // Infer the type from the config object and parse accordingly + const isNumber = typeof configs[config][0] === 'number'; + const value = isNumber ? +match[2] : match[2]; + if (!cliOptions[config]) + cliOptions[config] = []; + cliOptions[config].push(value); + } else { + extraOptions[config] = match[2]; } + } + return { cli: Object.assign({}, configs, cliOptions), extra: extraOptions }; + } - const currConfig = Object.assign({ [key]: value }, prevConfig); - - if (keyIndex + 1 < keys.length) { - recursive(keyIndex + 1, currConfig); - } else { - queue.push(currConfig); + _queue(options) { + const queue = []; + const keys = Object.keys(options); + + // Perform a depth-first walk though all options to generate a + // configuration list that contains all combinations. + function recursive(keyIndex, prevConfig) { + const key = keys[keyIndex]; + const values = options[key]; + const type = typeof values[0]; + + for (const value of values) { + if (typeof value !== 'number' && typeof value !== 'string') { + throw new TypeError( + `configuration "${key}" had type ${typeof value}`); + } + if (typeof value !== type) { + // This is a requirement for being able to consistently and + // predictably parse CLI provided configuration values. + throw new TypeError(`configuration "${key}" has mixed types`); + } + + const currConfig = Object.assign({ [key]: value }, prevConfig); + + if (keyIndex + 1 < keys.length) { + recursive(keyIndex + 1, currConfig); + } else { + queue.push(currConfig); + } } } + + if (keys.length > 0) { + recursive(0, {}); + } else { + queue.push({}); + } + + return queue; } - if (keys.length > 0) { - recursive(0, {}); - } else { - queue.push({}); + http(options, cb) { + const self = this; + const http_options = Object.assign({ }, options); + http_options.benchmarker = http_options.benchmarker || + self.config.benchmarker || + self.extra_options.benchmarker || + exports.default_http_benchmarker; + http_benchmarkers.run( + http_options, (error, code, used_benchmarker, result, elapsed) => { + if (cb) { + cb(code); + } + if (error) { + console.error(error); + process.exit(code || 1); + } + self.config.benchmarker = used_benchmarker; + self.report(result, elapsed); + } + ); } - return queue; -}; + _run() { + const self = this; + // If forked, report to the parent. + if (process.send) { + process.send({ + type: 'config', + name: this.name, + queueLength: this.queue.length, + }); + } + + (function recursive(queueIndex) { + const config = self.queue[queueIndex]; -// Benchmark an http server. -exports.default_http_benchmarker = - http_benchmarkers.default_http_benchmarker; -exports.PORT = http_benchmarkers.PORT; - -Benchmark.prototype.http = function(options, cb) { - const self = this; - const http_options = Object.assign({ }, options); - http_options.benchmarker = http_options.benchmarker || - self.config.benchmarker || - self.extra_options.benchmarker || - exports.default_http_benchmarker; - http_benchmarkers.run( - http_options, (error, code, used_benchmarker, result, elapsed) => { - if (cb) { - cb(code); + // Set NODE_RUN_BENCHMARK_FN to indicate that the child shouldn't + // construct a configuration queue, but just execute the benchmark + // function. + const childEnv = Object.assign({}, process.env); + childEnv.NODE_RUN_BENCHMARK_FN = ''; + + // Create configuration arguments + const childArgs = []; + for (const key of Object.keys(config)) { + childArgs.push(`${key}=${config[key]}`); } - if (error) { - console.error(error); - process.exit(code || 1); + for (const key of Object.keys(self.extra_options)) { + childArgs.push(`${key}=${self.extra_options[key]}`); } - self.config.benchmarker = used_benchmarker; - self.report(result, elapsed); - } - ); -}; -Benchmark.prototype._run = function() { - const self = this; - // If forked, report to the parent. - if (process.send) { - process.send({ - type: 'config', - name: this.name, - queueLength: this.queue.length, - }); + const child = child_process.fork(require.main.filename, childArgs, { + env: childEnv, + execArgv: self.flags.concat(process.execArgv), + }); + child.on('message', sendResult); + child.on('close', (code) => { + if (code) { + process.exit(code); + } + + if (queueIndex + 1 < self.queue.length) { + recursive(queueIndex + 1); + } + }); + })(0); } - (function recursive(queueIndex) { - const config = self.queue[queueIndex]; + start() { + if (this._started) { + throw new Error('Called start more than once in a single benchmark'); + } + this._started = true; + this._time = process.hrtime(); + } - // Set NODE_RUN_BENCHMARK_FN to indicate that the child shouldn't construct - // a configuration queue, but just execute the benchmark function. - const childEnv = Object.assign({}, process.env); - childEnv.NODE_RUN_BENCHMARK_FN = ''; + end(operations) { + // Get elapsed time now and do error checking later for accuracy. + const elapsed = process.hrtime(this._time); - // Create configuration arguments - const childArgs = []; - for (const key of Object.keys(config)) { - childArgs.push(`${key}=${config[key]}`); + if (!this._started) { + throw new Error('called end without start'); } - for (const key of Object.keys(self.extra_options)) { - childArgs.push(`${key}=${self.extra_options[key]}`); + if (this._ended) { + throw new Error('called end multiple times'); + } + if (typeof operations !== 'number') { + throw new Error('called end() without specifying operation count'); + } + if (!process.env.NODEJS_BENCHMARK_ZERO_ALLOWED && operations <= 0) { + throw new Error('called end() with operation count <= 0'); + } + if (elapsed[0] === 0 && elapsed[1] === 0) { + if (!process.env.NODEJS_BENCHMARK_ZERO_ALLOWED) + throw new Error('insufficient clock precision for short benchmark'); + // Avoid dividing by zero + elapsed[1] = 1; } - const child = child_process.fork(require.main.filename, childArgs, { - env: childEnv, - execArgv: self.flags.concat(process.execArgv), - }); - child.on('message', sendResult); - child.on('close', (code) => { - if (code) { - process.exit(code); - } - - if (queueIndex + 1 < self.queue.length) { - recursive(queueIndex + 1); - } - }); - })(0); -}; - -Benchmark.prototype.start = function() { - if (this._started) { - throw new Error('Called start more than once in a single benchmark'); + this._ended = true; + const time = elapsed[0] + elapsed[1] / 1e9; + const rate = operations / time; + this.report(rate, elapsed); } - this._started = true; - this._time = process.hrtime(); -}; - -Benchmark.prototype.end = function(operations) { - // Get elapsed time now and do error checking later for accuracy. - const elapsed = process.hrtime(this._time); - if (!this._started) { - throw new Error('called end without start'); - } - if (typeof operations !== 'number') { - throw new Error('called end() without specifying operation count'); - } - if (!process.env.NODEJS_BENCHMARK_ZERO_ALLOWED && operations <= 0) { - throw new Error('called end() with operation count <= 0'); - } - if (elapsed[0] === 0 && elapsed[1] === 0) { - if (!process.env.NODEJS_BENCHMARK_ZERO_ALLOWED) - throw new Error('insufficient clock precision for short benchmark'); - // Avoid dividing by zero - elapsed[1] = 1; + report(rate, elapsed) { + sendResult({ + name: this.name, + conf: this.config, + rate: rate, + time: elapsed[0] + elapsed[1] / 1e9, + type: 'report', + }); } - - const time = elapsed[0] + elapsed[1] / 1e9; - const rate = operations / time; - this.report(rate, elapsed); -}; +} function formatResult(data) { // Construct configuration string, " A=a, B=b, ..." @@ -237,27 +245,6 @@ function sendResult(data) { console.log(formatResult(data)); } } -exports.sendResult = sendResult; - -Benchmark.prototype.report = function(rate, elapsed) { - sendResult({ - name: this.name, - conf: this.config, - rate: rate, - time: elapsed[0] + elapsed[1] / 1e9, - type: 'report', - }); -}; - -exports.binding = function(bindingName) { - try { - const { internalBinding } = require('internal/test/binding'); - - return internalBinding(bindingName); - } catch { - return process.binding(bindingName); - } -}; const urls = { long: 'http://nodejs.org:89/docs/latest/api/foo/bar/qua/13949281/0f28b/' + @@ -273,7 +260,6 @@ const urls = { percent: 'https://%E4%BD%A0/foo', dot: 'https://example.org/./a/../b/./c', }; -exports.urls = urls; const searchParams = { noencode: 'foo=bar&baz=quux&xyzzy=thud', @@ -288,7 +274,6 @@ const searchParams = { manyblankpairs: '&&&&&&&&&&&&&&&&&&&&&&&&', altspaces: 'foo+bar=baz+quux&xyzzy+thud=quuy+quuz&abc=def+ghi', }; -exports.searchParams = searchParams; function getUrlData(withBase) { const data = require('../test/fixtures/wpt/url/resources/urltestdata.json'); @@ -304,8 +289,6 @@ function getUrlData(withBase) { return result; } -exports.urlDataTypes = Object.keys(urls).concat(['wpt']); - /** * Generate an array of data for URL benchmarks to use. * The size of the resulting data set is the original data size * 2 ** `e`. @@ -349,4 +332,27 @@ function bakeUrlData(type, e = 0, withBase = false, asUrl = false) { } return result; } -exports.bakeUrlData = bakeUrlData; + +module.exports = { + PORT: http_benchmarkers.PORT, + bakeUrlData, + binding(bindingName) { + try { + const { internalBinding } = require('internal/test/binding'); + + return internalBinding(bindingName); + } catch { + return process.binding(bindingName); + } + }, + buildType: process.features.debug ? 'Debug' : 'Release', + createBenchmark(fn, configs, options) { + return new Benchmark(fn, configs, options); + }, + // Benchmark an http server. + default_http_benchmarker: http_benchmarkers.default_http_benchmarker, + sendResult, + searchParams, + urlDataTypes: Object.keys(urls).concat(['wpt']), + urls, +}; diff --git a/benchmark/crypto/aes-gcm-throughput.js b/benchmark/crypto/aes-gcm-throughput.js index b1b08c481700ea..3f2b9ba45eb3f2 100644 --- a/benchmark/crypto/aes-gcm-throughput.js +++ b/benchmark/crypto/aes-gcm-throughput.js @@ -9,9 +9,6 @@ const bench = common.createBenchmark(main, { }); function main({ n, len, cipher }) { - // Default cipher for tests. - if (cipher === '') - cipher = 'aes-128-gcm'; const message = Buffer.alloc(len, 'b'); const key = crypto.randomBytes(keylen[cipher]); const iv = crypto.randomBytes(12); diff --git a/benchmark/crypto/cipher-stream.js b/benchmark/crypto/cipher-stream.js index 4bb1695e2d20cc..a51f72be8b8d17 100644 --- a/benchmark/crypto/cipher-stream.js +++ b/benchmark/crypto/cipher-stream.js @@ -3,16 +3,13 @@ const common = require('../common.js'); const bench = common.createBenchmark(main, { writes: [500], - cipher: [ 'AES192', 'AES256' ], + cipher: ['AES192', 'AES256'], type: ['asc', 'utf', 'buf'], len: [2, 1024, 102400, 1024 * 1024], api: ['legacy', 'stream'] }); function main({ api, cipher, type, len, writes }) { - // Default cipher for tests. - if (cipher === '') - cipher = 'AES192'; if (api === 'stream' && /^v0\.[0-8]\./.test(process.version)) { console.error('Crypto streams not available until v0.10'); // Use the legacy, just so that we can compare them. @@ -27,7 +24,6 @@ function main({ api, cipher, type, len, writes }) { alice.generateKeys(); bob.generateKeys(); - const pubEnc = /^v0\.[0-8]/.test(process.version) ? 'binary' : null; const alice_secret = alice.computeSecret(bob.getPublicKey(), pubEnc, 'hex'); const bob_secret = bob.computeSecret(alice.getPublicKey(), pubEnc, 'hex'); diff --git a/benchmark/crypto/randomBytes.js b/benchmark/crypto/randomBytes.js new file mode 100644 index 00000000000000..50ad3f08387566 --- /dev/null +++ b/benchmark/crypto/randomBytes.js @@ -0,0 +1,16 @@ +'use strict'; + +const common = require('../common.js'); +const { randomBytes } = require('crypto'); + +const bench = common.createBenchmark(main, { + size: [64, 1024, 8192, 512 * 1024], + n: [1e3], +}); + +function main({ n, size }) { + bench.start(); + for (let i = 0; i < n; ++i) + randomBytes(size); + bench.end(n); +} diff --git a/benchmark/domain/domain-fn-args.js b/benchmark/domain/domain-fn-args.js index c889b35442d046..18906a9ce64099 100644 --- a/benchmark/domain/domain-fn-args.js +++ b/benchmark/domain/domain-fn-args.js @@ -15,7 +15,7 @@ function main({ n, args }) { bench.start(); bdomain.enter(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (myArguments.length >= 2) { const args = Array.prototype.slice.call(myArguments, 1); fn.apply(this, args); diff --git a/benchmark/es/defaultparams-bench.js b/benchmark/es/defaultparams-bench.js index c568c12ae03fda..fde4cb11ad448a 100644 --- a/benchmark/es/defaultparams-bench.js +++ b/benchmark/es/defaultparams-bench.js @@ -22,22 +22,20 @@ function defaultParams(x = 1, y = 2) { function runOldStyleDefaults(n) { bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) oldStyleDefaults(); bench.end(n); } function runDefaultParams(n) { bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) defaultParams(); bench.end(n); } function main({ n, method }) { switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'withoutdefaults': runOldStyleDefaults(n); break; diff --git a/benchmark/es/destructuring-bench.js b/benchmark/es/destructuring-bench.js index 37f3fd9ad3d601..c07c0383da91ac 100644 --- a/benchmark/es/destructuring-bench.js +++ b/benchmark/es/destructuring-bench.js @@ -9,9 +9,9 @@ const bench = common.createBenchmark(main, { }); function runSwapManual(n) { - var x, y, r; + let x, y, r; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { x = 1, y = 2; r = x; x = y; @@ -23,9 +23,9 @@ function runSwapManual(n) { } function runSwapDestructured(n) { - var x, y; + let x, y; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { x = 1, y = 2; [x, y] = [y, x]; assert.strictEqual(x, 2); @@ -36,8 +36,6 @@ function runSwapDestructured(n) { function main({ n, method }) { switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'swap': runSwapManual(n); break; diff --git a/benchmark/es/destructuring-object-bench.js b/benchmark/es/destructuring-object-bench.js index 0c5615fd1e667b..29c83bd188e89d 100644 --- a/benchmark/es/destructuring-object-bench.js +++ b/benchmark/es/destructuring-object-bench.js @@ -8,10 +8,9 @@ const bench = common.createBenchmark(main, { }); function runNormal(n) { - var i = 0; const o = { x: 0, y: 1 }; bench.start(); - for (; i < n; i++) { + for (let i = 0; i < n; i++) { /* eslint-disable no-unused-vars */ const x = o.x; const y = o.y; @@ -22,10 +21,9 @@ function runNormal(n) { } function runDestructured(n) { - var i = 0; const o = { x: 0, y: 1 }; bench.start(); - for (; i < n; i++) { + for (let i = 0; i < n; i++) { /* eslint-disable no-unused-vars */ const { x, y, r = 2 } = o; /* eslint-enable no-unused-vars */ @@ -35,8 +33,6 @@ function runDestructured(n) { function main({ n, method }) { switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'normal': runNormal(n); break; diff --git a/benchmark/es/foreach-bench.js b/benchmark/es/foreach-bench.js index f424ca7a2552b2..6992a1a5749438 100644 --- a/benchmark/es/foreach-bench.js +++ b/benchmark/es/foreach-bench.js @@ -10,8 +10,8 @@ const bench = common.createBenchmark(main, { function useFor(n, items, count) { bench.start(); - for (var i = 0; i < n; i++) { - for (var j = 0; j < count; j++) { + for (let i = 0; i < n; i++) { + for (let j = 0; j < count; j++) { // eslint-disable-next-line no-unused-vars const item = items[j]; } @@ -21,7 +21,7 @@ function useFor(n, items, count) { function useForOf(n, items) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { // eslint-disable-next-line no-unused-vars for (const item of items) {} } @@ -30,8 +30,8 @@ function useForOf(n, items) { function useForIn(n, items) { bench.start(); - for (var i = 0; i < n; i++) { - for (var j in items) { + for (let i = 0; i < n; i++) { + for (const j in items) { // eslint-disable-next-line no-unused-vars const item = items[j]; } @@ -41,7 +41,7 @@ function useForIn(n, items) { function useForEach(n, items) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { items.forEach((item) => {}); } bench.end(n); @@ -49,13 +49,11 @@ function useForEach(n, items) { function main({ n, count, method }) { const items = new Array(count); - var fn; - for (var i = 0; i < count; i++) + let fn; + for (let i = 0; i < count; i++) items[i] = i; switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'for': fn = useFor; break; diff --git a/benchmark/es/map-bench.js b/benchmark/es/map-bench.js index a2f9e2450a1f23..d0b8534cf7c906 100644 --- a/benchmark/es/map-bench.js +++ b/benchmark/es/map-bench.js @@ -14,7 +14,7 @@ const bench = common.createBenchmark(main, { function runObject(n) { const m = {}; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { m[`i${i}`] = i; m[`s${i}`] = String(i); assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]); @@ -27,7 +27,7 @@ function runObject(n) { function runNullProtoObject(n) { const m = Object.create(null); bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { m[`i${i}`] = i; m[`s${i}`] = String(i); assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]); @@ -40,7 +40,7 @@ function runNullProtoObject(n) { function runNullProtoLiteralObject(n) { const m = { __proto__: null }; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { m[`i${i}`] = i; m[`s${i}`] = String(i); assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]); @@ -56,7 +56,7 @@ StorageObject.prototype = Object.create(null); function runStorageObject(n) { const m = new StorageObject(); bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { m[`i${i}`] = i; m[`s${i}`] = String(i); assert.strictEqual(String(m[`i${i}`]), m[`s${i}`]); @@ -79,7 +79,7 @@ function fakeMap() { function runFakeMap(n) { const m = fakeMap(); bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { m.set(`i${i}`, i); m.set(`s${i}`, String(i)); assert.strictEqual(String(m.get(`i${i}`)), m.get(`s${i}`)); @@ -92,7 +92,7 @@ function runFakeMap(n) { function runMap(n) { const m = new Map(); bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { m.set(`i${i}`, i); m.set(`s${i}`, String(i)); assert.strictEqual(String(m.get(`i${i}`)), m.get(`s${i}`)); @@ -104,8 +104,6 @@ function runMap(n) { function main({ n, method }) { switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'object': runObject(n); break; diff --git a/benchmark/es/restparams-bench.js b/benchmark/es/restparams-bench.js index d9b4878cb316a0..8129bc92533332 100644 --- a/benchmark/es/restparams-bench.js +++ b/benchmark/es/restparams-bench.js @@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, { function copyArguments() { const len = arguments.length; const args = new Array(len); - for (var i = 0; i < len; i++) + for (let i = 0; i < len; i++) args[i] = arguments[i]; assert.strictEqual(args[0], 1); assert.strictEqual(args[1], 2); @@ -34,25 +34,23 @@ function useArguments() { } function runCopyArguments(n) { - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) copyArguments(1, 2, 'a', 'b'); } function runRestArguments(n) { - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) restArguments(1, 2, 'a', 'b'); } function runUseArguments(n) { - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) useArguments(1, 2, 'a', 'b'); } function main({ n, method }) { - var fn; + let fn; switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'copy': fn = runCopyArguments; break; diff --git a/benchmark/es/spread-assign.js b/benchmark/es/spread-assign.js index bbe07e02e15110..970512aa6b93d4 100644 --- a/benchmark/es/spread-assign.js +++ b/benchmark/es/spread-assign.js @@ -16,26 +16,23 @@ function main({ n, context, count, rest, method }) { src[`p${n}`] = n; let obj; // eslint-disable-line no-unused-vars - let i; switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case '_extend': bench.start(); - for (i = 0; i < n; i++) + for (let i = 0; i < n; i++) obj = util._extend({}, src); bench.end(n); break; case 'assign': bench.start(); - for (i = 0; i < n; i++) + for (let i = 0; i < n; i++) obj = Object.assign({}, src); bench.end(n); break; case 'spread': bench.start(); - for (i = 0; i < n; i++) + for (let i = 0; i < n; i++) obj = { ...src }; bench.end(n); break; diff --git a/benchmark/es/spread-bench.js b/benchmark/es/spread-bench.js index 97c7596b6b732b..ae5b4abbb99c02 100644 --- a/benchmark/es/spread-bench.js +++ b/benchmark/es/spread-bench.js @@ -25,18 +25,16 @@ function makeTest(count, rest) { function main({ n, context, count, rest, method }) { const ctx = context === 'context' ? {} : null; - var fn = makeTest(count, rest); + let fn = makeTest(count, rest); const args = new Array(count); - var i; - for (i = 0; i < count; i++) + + for (let i = 0; i < count; i++) args[i] = i; switch (method) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'apply': bench.start(); - for (i = 0; i < n; i++) + for (let i = 0; i < n; i++) fn.apply(ctx, args); bench.end(n); break; @@ -44,13 +42,13 @@ function main({ n, context, count, rest, method }) { if (ctx !== null) fn = fn.bind(ctx); bench.start(); - for (i = 0; i < n; i++) + for (let i = 0; i < n; i++) fn(...args); bench.end(n); break; case 'call-spread': bench.start(); - for (i = 0; i < n; i++) + for (let i = 0; i < n; i++) fn.call(ctx, ...args); bench.end(n); break; diff --git a/benchmark/es/string-concatenations.js b/benchmark/es/string-concatenations.js index 72fb7f9969b604..3c0b27e05019d1 100644 --- a/benchmark/es/string-concatenations.js +++ b/benchmark/es/string-concatenations.js @@ -23,8 +23,6 @@ function main({ n, mode }) { let string; switch (mode) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'multi-concat': bench.start(); for (let i = 0; i < n; i++) diff --git a/benchmark/es/string-repeat.js b/benchmark/es/string-repeat.js index 9e33e4acf47118..f4bd616e4ada4b 100644 --- a/benchmark/es/string-repeat.js +++ b/benchmark/es/string-repeat.js @@ -18,8 +18,6 @@ function main({ n, size, encoding, mode }) { let str; switch (mode) { - case '': - // Empty string falls through to next line as default, mostly for tests. case 'Array': bench.start(); for (let i = 0; i < n; i++) diff --git a/benchmark/events/ee-add-remove.js b/benchmark/events/ee-add-remove.js index 2d20736b057568..715eab29a59c4c 100644 --- a/benchmark/events/ee-add-remove.js +++ b/benchmark/events/ee-add-remove.js @@ -8,17 +8,16 @@ function main({ n }) { const ee = new events.EventEmitter(); const listeners = []; - var k; - for (k = 0; k < 10; k += 1) + for (let k = 0; k < 10; k += 1) listeners.push(() => {}); bench.start(); - for (var i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1'; - for (k = listeners.length; --k >= 0; /* empty */) { + for (let k = listeners.length; --k >= 0; /* empty */) { ee.on(dummy, listeners[k]); } - for (k = listeners.length; --k >= 0; /* empty */) { + for (let k = listeners.length; --k >= 0; /* empty */) { ee.removeListener(dummy, listeners[k]); } } diff --git a/benchmark/events/ee-emit.js b/benchmark/events/ee-emit.js index 8f1c2761ffd4ba..39bcbb937d6c56 100644 --- a/benchmark/events/ee-emit.js +++ b/benchmark/events/ee-emit.js @@ -11,35 +11,34 @@ const bench = common.createBenchmark(main, { function main({ n, argc, listeners }) { const ee = new EventEmitter(); - for (var k = 0; k < listeners; k += 1) + for (let k = 0; k < listeners; k += 1) ee.on('dummy', () => {}); - var i; switch (argc) { case 2: bench.start(); - for (i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { ee.emit('dummy', true, 5); } bench.end(n); break; case 4: bench.start(); - for (i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { ee.emit('dummy', true, 5, 10, false); } bench.end(n); break; case 10: bench.start(); - for (i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { ee.emit('dummy', true, 5, 10, false, 5, 'string', true, false, 11, 20); } bench.end(n); break; default: bench.start(); - for (i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { ee.emit('dummy'); } bench.end(n); diff --git a/benchmark/events/ee-listener-count-on-prototype.js b/benchmark/events/ee-listener-count-on-prototype.js index d48e96a46aafe2..04cadc8dcb64da 100644 --- a/benchmark/events/ee-listener-count-on-prototype.js +++ b/benchmark/events/ee-listener-count-on-prototype.js @@ -7,13 +7,13 @@ const bench = common.createBenchmark(main, { n: [5e7] }); function main({ n }) { const ee = new EventEmitter(); - for (var k = 0; k < 5; k += 1) { + for (let k = 0; k < 5; k += 1) { ee.on('dummy0', () => {}); ee.on('dummy1', () => {}); } bench.start(); - for (var i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1'; ee.listenerCount(dummy); } diff --git a/benchmark/events/ee-listeners-many.js b/benchmark/events/ee-listeners-many.js index 7f9099c41790ea..bd3f3538d63c92 100644 --- a/benchmark/events/ee-listeners-many.js +++ b/benchmark/events/ee-listeners-many.js @@ -8,13 +8,13 @@ function main({ n }) { const ee = new EventEmitter(); ee.setMaxListeners(101); - for (var k = 0; k < 50; k += 1) { + for (let k = 0; k < 50; k += 1) { ee.on('dummy0', () => {}); ee.on('dummy1', () => {}); } bench.start(); - for (var i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1'; ee.listeners(dummy); } diff --git a/benchmark/events/ee-listeners.js b/benchmark/events/ee-listeners.js index 74b88b043401b5..867393efffcb04 100644 --- a/benchmark/events/ee-listeners.js +++ b/benchmark/events/ee-listeners.js @@ -7,13 +7,13 @@ const bench = common.createBenchmark(main, { n: [5e6] }); function main({ n }) { const ee = new EventEmitter(); - for (var k = 0; k < 5; k += 1) { + for (let k = 0; k < 5; k += 1) { ee.on('dummy0', () => {}); ee.on('dummy1', () => {}); } bench.start(); - for (var i = 0; i < n; i += 1) { + for (let i = 0; i < n; i += 1) { const dummy = (i % 2 === 0) ? 'dummy0' : 'dummy1'; ee.listeners(dummy); } diff --git a/benchmark/fixtures/simple-http-server.js b/benchmark/fixtures/simple-http-server.js index 2b4f1ea956d7cc..fb5b0d87c16e0d 100644 --- a/benchmark/fixtures/simple-http-server.js +++ b/benchmark/fixtures/simple-http-server.js @@ -31,14 +31,14 @@ module.exports = http.createServer((req, res) => { // URL format: /////chunkedEnc const params = req.url.split('/'); const command = params[1]; - var body = ''; + let body = ''; const arg = params[2]; const n_chunks = parseInt(params[3], 10); const resHow = params.length >= 5 ? params[4] : 'normal'; const chunkedEnc = params.length >= 6 && params[5] === '0' ? false : true; - var status = 200; + let status = 200; - var n, i; + let n, i; if (command === 'bytes') { n = ~~arg; if (n <= 0) diff --git a/benchmark/fs/bench-readdirSync.js b/benchmark/fs/bench-readdirSync.js index 5d0e97399a33ff..c0144d3460f8ff 100644 --- a/benchmark/fs/bench-readdirSync.js +++ b/benchmark/fs/bench-readdirSync.js @@ -15,7 +15,7 @@ function main({ n, dir, withFileTypes }) { withFileTypes = withFileTypes === 'true'; const fullPath = path.resolve(__dirname, '../../', dir); bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { fs.readdirSync(fullPath, { withFileTypes }); } bench.end(n); diff --git a/benchmark/fs/bench-realpathSync.js b/benchmark/fs/bench-realpathSync.js index 7a01bd18cb72bf..d0dbd7f891f126 100644 --- a/benchmark/fs/bench-realpathSync.js +++ b/benchmark/fs/bench-realpathSync.js @@ -17,7 +17,7 @@ const bench = common.createBenchmark(main, { function main({ n, pathType }) { const path = pathType === 'relative' ? relative_path : resolved_path; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { fs.realpathSync(path); } bench.end(n); diff --git a/benchmark/fs/bench-stat.js b/benchmark/fs/bench-stat.js index 0b2e1972e2cb80..e1f51c762c8e5f 100644 --- a/benchmark/fs/bench-stat.js +++ b/benchmark/fs/bench-stat.js @@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, { function main({ n, statType }) { - var arg; + let arg; if (statType === 'fstat') arg = fs.openSync(__filename, 'r'); else diff --git a/benchmark/fs/bench-statSync.js b/benchmark/fs/bench-statSync.js index bd8754a6c3d0e3..0c9366a402cb71 100644 --- a/benchmark/fs/bench-statSync.js +++ b/benchmark/fs/bench-statSync.js @@ -16,7 +16,7 @@ function main({ n, statSyncType }) { const fn = fs[statSyncType]; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { fn(arg); } bench.end(n); diff --git a/benchmark/fs/read-stream-throughput.js b/benchmark/fs/read-stream-throughput.js index cb5d98dc3279f6..de840d2d2fa3e1 100644 --- a/benchmark/fs/read-stream-throughput.js +++ b/benchmark/fs/read-stream-throughput.js @@ -49,7 +49,7 @@ function runTest() { bench.start(); }); - var bytes = 0; + let bytes = 0; rs.on('data', (chunk) => { bytes += chunk.length; }); @@ -65,7 +65,7 @@ function makeFile() { const buf = Buffer.allocUnsafe(filesize / 1024); if (encoding === 'utf8') { // ü - for (var i = 0; i < buf.length; i++) { + for (let i = 0; i < buf.length; i++) { buf[i] = i % 2 === 0 ? 0xC3 : 0xBC; } } else if (encoding === 'ascii') { @@ -75,7 +75,7 @@ function makeFile() { } try { fs.unlinkSync(filename); } catch {} - var w = 1024; + let w = 1024; const ws = fs.createWriteStream(filename); ws.on('close', runTest); ws.on('drain', write); diff --git a/benchmark/fs/readFileSync.js b/benchmark/fs/readFileSync.js index c28adeb229b358..47d210b7aa0463 100644 --- a/benchmark/fs/readFileSync.js +++ b/benchmark/fs/readFileSync.js @@ -9,7 +9,7 @@ const bench = common.createBenchmark(main, { function main({ n }) { bench.start(); - for (var i = 0; i < n; ++i) + for (let i = 0; i < n; ++i) fs.readFileSync(__filename); bench.end(n); } diff --git a/benchmark/fs/readfile-partitioned.js b/benchmark/fs/readfile-partitioned.js index 90af3754ce3de2..51700cfd649dfd 100644 --- a/benchmark/fs/readfile-partitioned.js +++ b/benchmark/fs/readfile-partitioned.js @@ -22,25 +22,24 @@ const bench = common.createBenchmark(main, { concurrent: [1, 10] }); -function main(conf) { - const len = +conf.len; +function main({ len, dur, concurrent }) { try { fs.unlinkSync(filename); } catch {} - var data = Buffer.alloc(len, 'x'); + let data = Buffer.alloc(len, 'x'); fs.writeFileSync(filename, data); data = null; const zipData = Buffer.alloc(1024, 'a'); - var reads = 0; - var zips = 0; - var benchEnded = false; + let reads = 0; + let zips = 0; + let benchEnded = false; bench.start(); setTimeout(() => { const totalOps = reads + zips; benchEnded = true; bench.end(totalOps); try { fs.unlinkSync(filename); } catch {} - }, +conf.dur * 1000); + }, dur * 1000); function read() { fs.readFile(filename, afterRead); @@ -78,8 +77,7 @@ function main(conf) { } // Start reads - var cur = +conf.concurrent; - while (cur--) read(); + while (concurrent-- > 0) read(); // Start a competing zip zip(); diff --git a/benchmark/fs/readfile.js b/benchmark/fs/readfile.js index 551804b1dbab1f..43393bf1b33ef3 100644 --- a/benchmark/fs/readfile.js +++ b/benchmark/fs/readfile.js @@ -18,12 +18,12 @@ const bench = common.createBenchmark(main, { function main({ len, dur, concurrent }) { try { fs.unlinkSync(filename); } catch {} - var data = Buffer.alloc(len, 'x'); + let data = Buffer.alloc(len, 'x'); fs.writeFileSync(filename, data); data = null; - var reads = 0; - var benchEnded = false; + let reads = 0; + let benchEnded = false; bench.start(); setTimeout(() => { benchEnded = true; diff --git a/benchmark/fs/write-stream-throughput.js b/benchmark/fs/write-stream-throughput.js index 3936adc7ff1b42..f715dfb96d8679 100644 --- a/benchmark/fs/write-stream-throughput.js +++ b/benchmark/fs/write-stream-throughput.js @@ -14,9 +14,9 @@ const bench = common.createBenchmark(main, { }); function main({ dur, encodingType, size }) { - var encoding; + let encoding; - var chunk; + let chunk; switch (encodingType) { case 'buf': chunk = Buffer.alloc(size, 'b'); @@ -35,8 +35,8 @@ function main({ dur, encodingType, size }) { try { fs.unlinkSync(filename); } catch {} - var started = false; - var ended = false; + let started = false; + let ended = false; const f = fs.createWriteStream(filename); f.on('drain', write); diff --git a/benchmark/http/_chunky_http_client.js b/benchmark/http/_chunky_http_client.js index 1bf7fa284a835b..1ab95a2b9706c1 100644 --- a/benchmark/http/_chunky_http_client.js +++ b/benchmark/http/_chunky_http_client.js @@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, { function main({ len, n }) { - var todo = []; + let todo = []; const headers = []; // Chose 7 because 9 showed "Connection error" / "Connection closed" // An odd number could result in a better length dispersion. @@ -48,19 +48,19 @@ function main({ len, n }) { } const min = 10; - var size = 0; + let size = 0; const mod = 317; const mult = 17; const add = 11; - var count = 0; + let count = 0; const PIPE = process.env.PIPE_NAME; const socket = net.connect(PIPE, () => { bench.start(); WriteHTTPHeaders(socket, 1, len); socket.setEncoding('utf8'); socket.on('data', (d) => { - var did = false; - var pattern = 'HTTP/1.1 200 OK\r\n'; + let did = false; + let pattern = 'HTTP/1.1 200 OK\r\n'; if ((d.length === pattern.length && d === pattern) || (d.length > pattern.length && d.slice(0, pattern.length) === pattern)) { diff --git a/benchmark/http/client-request-body.js b/benchmark/http/client-request-body.js index b5ac2828c6ff1f..6e2323b3f07e8a 100644 --- a/benchmark/http/client-request-body.js +++ b/benchmark/http/client-request-body.js @@ -12,8 +12,8 @@ const bench = common.createBenchmark(main, { }); function main({ dur, len, type, method }) { - var encoding; - var chunk; + let encoding; + let chunk; switch (type) { case 'buf': chunk = Buffer.alloc(len, 'x'); @@ -27,7 +27,7 @@ function main({ dur, len, type, method }) { break; } - var nreqs = 0; + let nreqs = 0; const options = { headers: { 'Connection': 'keep-alive', 'Transfer-Encoding': 'chunked' }, agent: new http.Agent({ maxSockets: 1 }), diff --git a/benchmark/http/cluster.js b/benchmark/http/cluster.js index c2d6d8e1a70c90..3bcd061a0894c5 100644 --- a/benchmark/http/cluster.js +++ b/benchmark/http/cluster.js @@ -18,7 +18,7 @@ if (cluster.isMaster) { function main({ type, len, c }) { process.env.PORT = PORT; - var workers = 0; + let workers = 0; const w1 = cluster.fork(); const w2 = cluster.fork(); diff --git a/benchmark/http/end-vs-write-end.js b/benchmark/http/end-vs-write-end.js index b4ca560b9a897c..38e9b89a97a6b4 100644 --- a/benchmark/http/end-vs-write-end.js +++ b/benchmark/http/end-vs-write-end.js @@ -19,7 +19,7 @@ const bench = common.createBenchmark(main, { function main({ len, type, method, c }) { const http = require('http'); - var chunk; + let chunk; switch (type) { case 'buf': chunk = Buffer.alloc(len, 'x'); diff --git a/benchmark/http/set_header.js b/benchmark/http/set_header.js index 470d4b008187bc..f2236696f1c7df 100644 --- a/benchmark/http/set_header.js +++ b/benchmark/http/set_header.js @@ -16,10 +16,7 @@ const bench = common.createBenchmark(main, { n: [1e6], }); -function main(conf) { - const n = +conf.n; - const value = conf.value; - +function main({ n, value }) { const og = new OutgoingMessage(); bench.start(); diff --git a/benchmark/http2/headers.js b/benchmark/http2/headers.js index f18a73b95e2421..56799da1987e53 100644 --- a/benchmark/http2/headers.js +++ b/benchmark/http2/headers.js @@ -24,7 +24,7 @@ function main({ n, nheaders }) { 'user-agent': 'SuperBenchmarker 3000' }; - for (var i = 0; i < nheaders; i++) { + for (let i = 0; i < nheaders; i++) { headersObject[`foo${i}`] = `some header value ${i}`; } diff --git a/benchmark/misc/arguments.js b/benchmark/misc/arguments.js index 5b0cb0e2ca1488..39f4020b1ad20e 100644 --- a/benchmark/misc/arguments.js +++ b/benchmark/misc/arguments.js @@ -32,10 +32,8 @@ function usingPredefined() { } function main({ n, method, args }) { - var fn; + let fn; switch (method) { - // '' is a default case for tests - case '': case 'restAndSpread': fn = usingRestAndSpread; break; @@ -53,7 +51,7 @@ function main({ n, method, args }) { } bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) fn('part 1', 'part', 2, 'part 3', 'part', 4); bench.end(n); } diff --git a/benchmark/misc/freelist.js b/benchmark/misc/freelist.js index e6868fae1ce8c5..d03c3674fdbfac 100644 --- a/benchmark/misc/freelist.js +++ b/benchmark/misc/freelist.js @@ -14,7 +14,7 @@ function main({ n }) { FreeList = FreeList.FreeList; const poolSize = 1000; const list = new FreeList('test', poolSize, Object); - var j; + let j; const used = []; // First, alloc `poolSize` items @@ -24,7 +24,7 @@ function main({ n }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { // Return all the items to the pool for (j = 0; j < poolSize; j++) { list.free(used[j]); diff --git a/benchmark/misc/getstringwidth.js b/benchmark/misc/getstringwidth.js index 12f071c60dd7eb..9dd4b47df7182e 100644 --- a/benchmark/misc/getstringwidth.js +++ b/benchmark/misc/getstringwidth.js @@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, { }); function main({ n, type }) { - const { getStringWidth } = require('internal/readline/utils'); + const { getStringWidth } = require('internal/util/inspect'); const str = ({ ascii: 'foobar'.repeat(100), diff --git a/benchmark/misc/object-property-bench.js b/benchmark/misc/object-property-bench.js index fae11119b6fe23..9b33ac9a636889 100644 --- a/benchmark/misc/object-property-bench.js +++ b/benchmark/misc/object-property-bench.js @@ -11,9 +11,9 @@ const bench = common.createBenchmark(main, { function runProperty(n) { const object = {}; - var i = 0; + bench.start(); - for (; i < n; i++) { + for (let i = 0; i < n; i++) { object.p1 = 21; object.p2 = 21; object.p1 += object.p2; @@ -23,9 +23,9 @@ function runProperty(n) { function runString(n) { const object = {}; - var i = 0; + bench.start(); - for (; i < n; i++) { + for (let i = 0; i < n; i++) { object['p1'] = 21; object['p2'] = 21; object['p1'] += object['p2']; @@ -37,9 +37,9 @@ function runVariable(n) { const object = {}; const var1 = 'p1'; const var2 = 'p2'; - var i = 0; + bench.start(); - for (; i < n; i++) { + for (let i = 0; i < n; i++) { object[var1] = 21; object[var2] = 21; object[var1] += object[var2]; @@ -51,9 +51,9 @@ function runSymbol(n) { const object = {}; const symbol1 = Symbol('p1'); const symbol2 = Symbol('p2'); - var i = 0; + bench.start(); - for (; i < n; i++) { + for (let i = 0; i < n; i++) { object[symbol1] = 21; object[symbol2] = 21; object[symbol1] += object[symbol2]; @@ -64,8 +64,6 @@ function runSymbol(n) { function main({ n, method }) { switch (method) { - // '' is a default case for tests - case '': case 'property': runProperty(n); break; diff --git a/benchmark/misc/punycode.js b/benchmark/misc/punycode.js index 18023419709ee5..9c674b5deefb8c 100644 --- a/benchmark/misc/punycode.js +++ b/benchmark/misc/punycode.js @@ -45,26 +45,23 @@ function usingICU(val) { } function runPunycode(n, val) { - var i = 0; - for (; i < n; i++) + for (let i = 0; i < n; i++) usingPunycode(val); bench.start(); - for (i = 0; i < n; i++) + for (let i = 0; i < n; i++) usingPunycode(val); bench.end(n); } function runICU(n, val) { bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) usingICU(val); bench.end(n); } function main({ n, val, method }) { switch (method) { - // '' is a default case for tests - case '': case 'punycode': runPunycode(n, val); break; diff --git a/benchmark/misc/trace.js b/benchmark/misc/trace.js index d76f53cf04e82d..3808375579bfa6 100644 --- a/benchmark/misc/trace.js +++ b/benchmark/misc/trace.js @@ -15,7 +15,7 @@ const { function doTrace(n, trace) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { trace(kBeforeEvent, 'foo', 'test', 0, 'test'); } bench.end(n); @@ -23,7 +23,7 @@ function doTrace(n, trace) { function doIsTraceCategoryEnabled(n, isTraceCategoryEnabled) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { isTraceCategoryEnabled('foo'); isTraceCategoryEnabled('bar'); } @@ -37,7 +37,6 @@ function main({ n, method }) { } = common.binding('trace_events'); switch (method) { - case '': case 'trace': doTrace(n, trace); break; diff --git a/benchmark/misc/util-extend-vs-object-assign.js b/benchmark/misc/util-extend-vs-object-assign.js index 3880711b660fe1..83aec7b9c82231 100644 --- a/benchmark/misc/util-extend-vs-object-assign.js +++ b/benchmark/misc/util-extend-vs-object-assign.js @@ -9,10 +9,6 @@ const bench = common.createBenchmark(main, { }); function main({ n, type }) { - // Default value for tests. - if (type === '') - type = 'extend'; - let fn; if (type === 'extend') { fn = util._extend; @@ -22,13 +18,13 @@ function main({ n, type }) { // Force-optimize the method to test so that the benchmark doesn't // get disrupted by the optimizer kicking in halfway through. - for (var i = 0; i < type.length * 10; i += 1) + for (let i = 0; i < type.length * 10; i += 1) fn({}, process.env); const obj = new Proxy({}, { set: function(a, b, c) { return true; } }); bench.start(); - for (var j = 0; j < n; j += 1) + for (let j = 0; j < n; j += 1) fn(obj, process.env); bench.end(n); } diff --git a/benchmark/module/module-loader-deep.js b/benchmark/module/module-loader-deep.js index f686b8df47dfba..5b4f4b907a7ce6 100644 --- a/benchmark/module/module-loader-deep.js +++ b/benchmark/module/module-loader-deep.js @@ -19,7 +19,7 @@ function main({ ext, cache, files }) { `${benchmarkDirectory}/a.js`, 'module.exports = {};' ); - for (var i = 0; i <= files; i++) { + for (let i = 0; i <= files; i++) { fs.mkdirSync(`${benchmarkDirectory}/${i}`); fs.writeFileSync( `${benchmarkDirectory}/${i}/package.json`, @@ -37,14 +37,13 @@ function main({ ext, cache, files }) { } function measureDir(cache, files) { - var i; if (cache) { - for (i = 0; i <= files; i++) { + for (let i = 0; i <= files; i++) { require(`${benchmarkDirectory}/${i}`); } } bench.start(); - for (i = 0; i <= files; i++) { + for (let i = 0; i <= files; i++) { require(`${benchmarkDirectory}/${i}`); } bench.end(files); diff --git a/benchmark/module/module-loader.js b/benchmark/module/module-loader.js index 3b8e9be2d60636..f31ac8722cb208 100644 --- a/benchmark/module/module-loader.js +++ b/benchmark/module/module-loader.js @@ -21,7 +21,7 @@ const bench = common.createBenchmark(main, { function main({ n, name, cache, files, dir }) { tmpdir.refresh(); fs.mkdirSync(benchmarkDirectory); - for (var i = 0; i <= files; i++) { + for (let i = 0; i <= files; i++) { fs.mkdirSync(`${benchmarkDirectory}${i}`); fs.writeFileSync( `${benchmarkDirectory}${i}/package.json`, @@ -42,15 +42,14 @@ function main({ n, name, cache, files, dir }) { } function measureDir(n, cache, files, name) { - var i; if (cache) { - for (i = 0; i <= files; i++) { + for (let i = 0; i <= files; i++) { require(`${benchmarkDirectory}${i}${name}`); } } bench.start(); - for (i = 0; i <= files; i++) { - for (var j = 0; j < n; j++) + for (let i = 0; i <= files; i++) { + for (let j = 0; j < n; j++) require(`${benchmarkDirectory}${i}${name}`); // Pretend mixed input (otherwise the results are less representative due to // highly specialized code). diff --git a/benchmark/napi/function_args/index.js b/benchmark/napi/function_args/index.js index 8f13454944772e..8ce9fa9d528f5c 100644 --- a/benchmark/napi/function_args/index.js +++ b/benchmark/napi/function_args/index.js @@ -89,7 +89,7 @@ function main({ n, engine, type }) { const args = generateArgs(type); bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { fn.apply(null, args); } bench.end(n); diff --git a/benchmark/napi/function_call/index.js b/benchmark/napi/function_call/index.js index 3eebf9c05acdb1..1e1d159c8ad83a 100644 --- a/benchmark/napi/function_call/index.js +++ b/benchmark/napi/function_call/index.js @@ -29,7 +29,7 @@ try { } const napi = napi_binding.hello; -var c = 0; +let c = 0; function js() { return c++; } @@ -44,7 +44,7 @@ const bench = common.createBenchmark(main, { function main({ n, type }) { const fn = type === 'cxx' ? cxx : type === 'napi' ? napi : js; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { fn(); } bench.end(n); diff --git a/benchmark/net/net-c2s-cork.js b/benchmark/net/net-c2s-cork.js index 12d15fe0795e57..1493cae68d0069 100644 --- a/benchmark/net/net-c2s-cork.js +++ b/benchmark/net/net-c2s-cork.js @@ -11,8 +11,8 @@ const bench = common.createBenchmark(main, { dur: [5], }); -var chunk; -var encoding; +let chunk; +let encoding; function main({ dur, len, type }) { switch (type) { diff --git a/benchmark/net/net-c2s.js b/benchmark/net/net-c2s.js index 4b64cbeca18124..cacd6815630b2e 100644 --- a/benchmark/net/net-c2s.js +++ b/benchmark/net/net-c2s.js @@ -11,8 +11,8 @@ const bench = common.createBenchmark(main, { dur: [5], }); -var chunk; -var encoding; +let chunk; +let encoding; function main({ dur, len, type }) { switch (type) { diff --git a/benchmark/net/net-pipe.js b/benchmark/net/net-pipe.js index 06426129f7f271..d86ff73041d845 100644 --- a/benchmark/net/net-pipe.js +++ b/benchmark/net/net-pipe.js @@ -11,8 +11,8 @@ const bench = common.createBenchmark(main, { dur: [5], }); -var chunk; -var encoding; +let chunk; +let encoding; function main({ dur, len, type }) { switch (type) { diff --git a/benchmark/net/net-s2c.js b/benchmark/net/net-s2c.js index d8c26db9bdb035..789eadf0a18dba 100644 --- a/benchmark/net/net-s2c.js +++ b/benchmark/net/net-s2c.js @@ -12,10 +12,10 @@ const bench = common.createBenchmark(main, { dur: [5] }); -var chunk; -var encoding; -var recvbuf; -var received = 0; +let chunk; +let encoding; +let recvbuf; +let received = 0; function main({ dur, sendchunklen, type, recvbuflen, recvbufgenfn }) { if (isFinite(recvbuflen) && recvbuflen > 0) @@ -38,8 +38,8 @@ function main({ dur, sendchunklen, type, recvbuflen, recvbufgenfn }) { } const reader = new Reader(); - var writer; - var socketOpts; + let writer; + let socketOpts; if (recvbuf === undefined) { writer = new Writer(); socketOpts = { port: PORT }; diff --git a/benchmark/net/net-wrap-js-stream-passthrough.js b/benchmark/net/net-wrap-js-stream-passthrough.js index 1e8a1ee1c5a092..0d7be36c6aa545 100644 --- a/benchmark/net/net-wrap-js-stream-passthrough.js +++ b/benchmark/net/net-wrap-js-stream-passthrough.js @@ -12,8 +12,8 @@ const bench = common.createBenchmark(main, { flags: ['--expose-internals'] }); -var chunk; -var encoding; +let chunk; +let encoding; function main({ dur, len, type }) { // Can only require internals inside main(). diff --git a/benchmark/net/tcp-raw-c2s.js b/benchmark/net/tcp-raw-c2s.js index fe320ddaa2716b..b8af124a7f40fc 100644 --- a/benchmark/net/tcp-raw-c2s.js +++ b/benchmark/net/tcp-raw-c2s.js @@ -24,7 +24,7 @@ function main({ dur, len, type }) { const PORT = common.PORT; const serverHandle = new TCP(TCPConstants.SERVER); - var err = serverHandle.bind('127.0.0.1', PORT); + let err = serverHandle.bind('127.0.0.1', PORT); if (err) fail(err, 'bind'); @@ -38,7 +38,7 @@ function main({ dur, len, type }) { // The meat of the benchmark is right here: bench.start(); - var bytes = 0; + let bytes = 0; setTimeout(() => { // report in Gb/sec @@ -67,7 +67,7 @@ function main({ dur, len, type }) { } function client(type, len) { - var chunk; + let chunk; switch (type) { case 'buf': chunk = Buffer.alloc(len, 'x'); @@ -102,7 +102,7 @@ function main({ dur, len, type }) { function write() { const writeReq = new WriteWrap(); writeReq.oncomplete = afterWrite; - var err; + let err; switch (type) { case 'buf': err = clientHandle.writeBuffer(writeReq, chunk); diff --git a/benchmark/net/tcp-raw-pipe.js b/benchmark/net/tcp-raw-pipe.js index 4420cc2e6dcc17..249b61046a84cf 100644 --- a/benchmark/net/tcp-raw-pipe.js +++ b/benchmark/net/tcp-raw-pipe.js @@ -31,7 +31,7 @@ function main({ dur, len, type }) { // Server const serverHandle = new TCP(TCPConstants.SERVER); - var err = serverHandle.bind('127.0.0.1', PORT); + let err = serverHandle.bind('127.0.0.1', PORT); if (err) fail(err, 'bind'); @@ -66,7 +66,7 @@ function main({ dur, len, type }) { }; // Client - var chunk; + let chunk; switch (type) { case 'buf': chunk = Buffer.alloc(len, 'x'); @@ -83,7 +83,7 @@ function main({ dur, len, type }) { const clientHandle = new TCP(TCPConstants.SOCKET); const connectReq = new TCPConnectWrap(); - var bytes = 0; + let bytes = 0; err = clientHandle.connect(connectReq, '127.0.0.1', PORT); if (err) @@ -118,7 +118,7 @@ function main({ dur, len, type }) { function write() { const writeReq = new WriteWrap(); writeReq.oncomplete = afterWrite; - var err; + let err; switch (type) { case 'buf': err = clientHandle.writeBuffer(writeReq, chunk); diff --git a/benchmark/net/tcp-raw-s2c.js b/benchmark/net/tcp-raw-s2c.js index cc2f69019fff61..393cf060489cb8 100644 --- a/benchmark/net/tcp-raw-s2c.js +++ b/benchmark/net/tcp-raw-s2c.js @@ -26,7 +26,7 @@ function main({ dur, len, type }) { const PORT = common.PORT; const serverHandle = new TCP(TCPConstants.SERVER); - var err = serverHandle.bind('127.0.0.1', PORT); + let err = serverHandle.bind('127.0.0.1', PORT); if (err) fail(err, 'bind'); @@ -38,7 +38,7 @@ function main({ dur, len, type }) { if (err) fail(err, 'connect'); - var chunk; + let chunk; switch (type) { case 'buf': chunk = Buffer.alloc(len, 'x'); @@ -62,7 +62,7 @@ function main({ dur, len, type }) { const writeReq = new WriteWrap(); writeReq.async = false; writeReq.oncomplete = afterWrite; - var err; + let err; switch (type) { case 'buf': err = clientHandle.writeBuffer(writeReq, chunk); @@ -108,7 +108,7 @@ function main({ dur, len, type }) { fail(err, 'connect'); connectReq.oncomplete = function() { - var bytes = 0; + let bytes = 0; clientHandle.onread = function(buffer) { // We're not expecting to ever get an EOF from the client. // Just lots of data forever. diff --git a/benchmark/os/cpus.js b/benchmark/os/cpus.js index da158a1b061c7f..a8aa3ab6cbf46f 100644 --- a/benchmark/os/cpus.js +++ b/benchmark/os/cpus.js @@ -9,7 +9,7 @@ const bench = common.createBenchmark(main, { function main({ n }) { bench.start(); - for (var i = 0; i < n; ++i) + for (let i = 0; i < n; ++i) cpus(); bench.end(n); } diff --git a/benchmark/os/loadavg.js b/benchmark/os/loadavg.js index 2cd38316b24bdd..802e3c99ec0a59 100644 --- a/benchmark/os/loadavg.js +++ b/benchmark/os/loadavg.js @@ -9,7 +9,7 @@ const bench = common.createBenchmark(main, { function main({ n }) { bench.start(); - for (var i = 0; i < n; ++i) + for (let i = 0; i < n; ++i) loadavg(); bench.end(n); } diff --git a/benchmark/os/networkInterfaces.js b/benchmark/os/networkInterfaces.js index 3fa6073ae5c69e..12e956b7f05ddc 100644 --- a/benchmark/os/networkInterfaces.js +++ b/benchmark/os/networkInterfaces.js @@ -9,7 +9,7 @@ const bench = common.createBenchmark(main, { function main({ n }) { bench.start(); - for (var i = 0; i < n; ++i) + for (let i = 0; i < n; ++i) networkInterfaces(); bench.end(n); } diff --git a/benchmark/path/basename-posix.js b/benchmark/path/basename-posix.js index 45cad1e25660dc..6600068d4c53f6 100644 --- a/benchmark/path/basename-posix.js +++ b/benchmark/path/basename-posix.js @@ -19,7 +19,7 @@ const bench = common.createBenchmark(main, { }); function main({ n, pathext }) { - var ext; + let ext; const extIdx = pathext.indexOf('|'); if (extIdx !== -1) { ext = pathext.slice(extIdx + 1); @@ -27,7 +27,7 @@ function main({ n, pathext }) { } bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { posix.basename(i % 3 === 0 ? `${pathext}${i}` : pathext, ext); } bench.end(n); diff --git a/benchmark/path/basename-win32.js b/benchmark/path/basename-win32.js index 30d65f3ac6a4c9..dc26a134e29252 100644 --- a/benchmark/path/basename-win32.js +++ b/benchmark/path/basename-win32.js @@ -19,7 +19,7 @@ const bench = common.createBenchmark(main, { }); function main({ n, pathext }) { - var ext; + let ext; const extIdx = pathext.indexOf('|'); if (extIdx !== -1) { ext = pathext.slice(extIdx + 1); @@ -27,7 +27,7 @@ function main({ n, pathext }) { } bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { win32.basename(i % 3 === 0 ? `${pathext}${i}` : pathext, ext); } bench.end(n); diff --git a/benchmark/path/dirname-posix.js b/benchmark/path/dirname-posix.js index 93f2f32c012695..c98753562fbc93 100644 --- a/benchmark/path/dirname-posix.js +++ b/benchmark/path/dirname-posix.js @@ -17,7 +17,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { posix.dirname(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/dirname-win32.js b/benchmark/path/dirname-win32.js index 510595d721ace1..9eb5478b3b4d3b 100644 --- a/benchmark/path/dirname-win32.js +++ b/benchmark/path/dirname-win32.js @@ -17,7 +17,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { win32.dirname(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/extname-posix.js b/benchmark/path/extname-posix.js index ee1ea07eebc010..0e01d59a745883 100644 --- a/benchmark/path/extname-posix.js +++ b/benchmark/path/extname-posix.js @@ -20,7 +20,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { posix.extname(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/extname-win32.js b/benchmark/path/extname-win32.js index 1de4bca28a2988..6d8437e5c5d819 100644 --- a/benchmark/path/extname-win32.js +++ b/benchmark/path/extname-win32.js @@ -20,7 +20,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { win32.extname(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/format-posix.js b/benchmark/path/format-posix.js index 9c555f232c0099..7720bbc3b705ed 100644 --- a/benchmark/path/format-posix.js +++ b/benchmark/path/format-posix.js @@ -20,7 +20,7 @@ function main({ n, props }) { }; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { obj.base = `a${i}${props[2] || ''}`; obj.name = `a${i}${props[4] || ''}`; posix.format(obj); diff --git a/benchmark/path/format-win32.js b/benchmark/path/format-win32.js index 65315c4dd638f1..fab7599ab58386 100644 --- a/benchmark/path/format-win32.js +++ b/benchmark/path/format-win32.js @@ -20,7 +20,7 @@ function main({ n, props }) { }; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { obj.base = `a${i}${props[2] || ''}`; obj.name = `a${i}${props[4] || ''}`; win32.format(obj); diff --git a/benchmark/path/isAbsolute-posix.js b/benchmark/path/isAbsolute-posix.js index dd0dfd1964e0fb..90d06502d1fb02 100644 --- a/benchmark/path/isAbsolute-posix.js +++ b/benchmark/path/isAbsolute-posix.js @@ -15,7 +15,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { posix.isAbsolute(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/isAbsolute-win32.js b/benchmark/path/isAbsolute-win32.js index ff03f2628a328c..15da64f5e973a3 100644 --- a/benchmark/path/isAbsolute-win32.js +++ b/benchmark/path/isAbsolute-win32.js @@ -16,7 +16,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { win32.isAbsolute(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/join-posix.js b/benchmark/path/join-posix.js index e573166d7ae078..6619e4dea852db 100644 --- a/benchmark/path/join-posix.js +++ b/benchmark/path/join-posix.js @@ -15,7 +15,7 @@ function main({ n, paths }) { const orig = copy[1]; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (i % 3 === 0) { copy[1] = `${orig}${i}`; posix.join(...copy); diff --git a/benchmark/path/join-win32.js b/benchmark/path/join-win32.js index cd69836c006e23..958dee706d499a 100644 --- a/benchmark/path/join-win32.js +++ b/benchmark/path/join-win32.js @@ -15,7 +15,7 @@ function main({ n, paths }) { const orig = copy[1]; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (i % 3 === 0) { copy[1] = `${orig}${i}`; win32.join(...copy); diff --git a/benchmark/path/makeLong-win32.js b/benchmark/path/makeLong-win32.js index 45d0d8de60d7e0..864a9cfffe63b9 100644 --- a/benchmark/path/makeLong-win32.js +++ b/benchmark/path/makeLong-win32.js @@ -14,7 +14,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { win32._makeLong(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/normalize-posix.js b/benchmark/path/normalize-posix.js index 4383cff4a588f7..e0722097025020 100644 --- a/benchmark/path/normalize-posix.js +++ b/benchmark/path/normalize-posix.js @@ -16,7 +16,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { posix.normalize(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/normalize-win32.js b/benchmark/path/normalize-win32.js index 319c391d17a712..84e16ca3c2d0e9 100644 --- a/benchmark/path/normalize-win32.js +++ b/benchmark/path/normalize-win32.js @@ -16,7 +16,7 @@ const bench = common.createBenchmark(main, { function main({ n, path }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { win32.normalize(i % 3 === 0 ? `${path}${i}` : path); } bench.end(n); diff --git a/benchmark/path/relative-posix.js b/benchmark/path/relative-posix.js index 2c4dd31d2778c7..0285c2c968dcb2 100644 --- a/benchmark/path/relative-posix.js +++ b/benchmark/path/relative-posix.js @@ -16,7 +16,7 @@ const bench = common.createBenchmark(main, { }); function main({ n, paths }) { - var to = ''; + let to = ''; const delimIdx = paths.indexOf('|'); if (delimIdx > -1) { to = paths.slice(delimIdx + 1); diff --git a/benchmark/path/relative-win32.js b/benchmark/path/relative-win32.js index 5f34fdf8fd5842..401919aa20d802 100644 --- a/benchmark/path/relative-win32.js +++ b/benchmark/path/relative-win32.js @@ -14,7 +14,7 @@ const bench = common.createBenchmark(main, { }); function main({ n, paths }) { - var to = ''; + let to = ''; const delimIdx = paths.indexOf('|'); if (delimIdx > -1) { to = paths.slice(delimIdx + 1); diff --git a/benchmark/path/resolve-posix.js b/benchmark/path/resolve-posix.js index 3cdf1cd49a0754..dbae350c62a35f 100644 --- a/benchmark/path/resolve-posix.js +++ b/benchmark/path/resolve-posix.js @@ -18,7 +18,7 @@ function main({ n, paths }) { const orig = copy[0]; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (i % 3 === 0) { copy[0] = `${orig}${i}`; posix.resolve(...copy); diff --git a/benchmark/path/resolve-win32.js b/benchmark/path/resolve-win32.js index cf8144ef2c57cd..7def7aa1025d50 100644 --- a/benchmark/path/resolve-win32.js +++ b/benchmark/path/resolve-win32.js @@ -18,7 +18,7 @@ function main({ n, paths }) { const orig = copy[0]; bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (i % 3 === 0) { copy[0] = `${orig}${i}`; win32.resolve(...copy); diff --git a/benchmark/process/bench-hrtime.js b/benchmark/process/bench-hrtime.js index d73ed7aae4336e..2da9035f806cf9 100644 --- a/benchmark/process/bench-hrtime.js +++ b/benchmark/process/bench-hrtime.js @@ -10,27 +10,26 @@ const bench = common.createBenchmark(main, { function main({ n, type }) { const hrtime = process.hrtime; - var noDead = type === 'bigint' ? hrtime.bigint() : hrtime(); - var i; + let noDead = type === 'bigint' ? hrtime.bigint() : hrtime(); switch (type) { case 'raw': bench.start(); - for (i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { noDead = hrtime(); } bench.end(n); break; case 'diff': bench.start(); - for (i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { noDead = hrtime(noDead); } bench.end(n); break; case 'bigint': bench.start(); - for (i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { noDead = hrtime.bigint(); } bench.end(n); diff --git a/benchmark/process/memoryUsage.js b/benchmark/process/memoryUsage.js index f9b969ab885d8b..1c743d81f1f465 100644 --- a/benchmark/process/memoryUsage.js +++ b/benchmark/process/memoryUsage.js @@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, { function main({ n }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { process.memoryUsage(); } bench.end(n); diff --git a/benchmark/process/next-tick-breadth-args.js b/benchmark/process/next-tick-breadth-args.js index 03651dbdbb4eea..bd3b24ddc29fc5 100644 --- a/benchmark/process/next-tick-breadth-args.js +++ b/benchmark/process/next-tick-breadth-args.js @@ -6,7 +6,7 @@ const bench = common.createBenchmark(main, { }); function main({ n }) { - var j = 0; + let j = 0; function cb1(arg1) { j++; @@ -33,7 +33,7 @@ function main({ n }) { } bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (i % 4 === 0) process.nextTick(cb4, 3.14, 1024, true, false); else if (i % 3 === 0) diff --git a/benchmark/process/next-tick-breadth.js b/benchmark/process/next-tick-breadth.js index 297bf43495d2e6..eb34ea830acfe7 100644 --- a/benchmark/process/next-tick-breadth.js +++ b/benchmark/process/next-tick-breadth.js @@ -6,7 +6,7 @@ const bench = common.createBenchmark(main, { }); function main({ n }) { - var j = 0; + let j = 0; function cb() { j++; @@ -15,7 +15,7 @@ function main({ n }) { } bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { process.nextTick(cb); } } diff --git a/benchmark/process/next-tick-exec-args.js b/benchmark/process/next-tick-exec-args.js index ec172ea8931e3f..7893e2c70903e5 100644 --- a/benchmark/process/next-tick-exec-args.js +++ b/benchmark/process/next-tick-exec-args.js @@ -10,7 +10,7 @@ function main({ n }) { bench.end(n); } - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (i % 4 === 0) process.nextTick(onNextTick, i, true, 10, 'test'); else if (i % 3 === 0) diff --git a/benchmark/process/next-tick-exec.js b/benchmark/process/next-tick-exec.js index 14fce9cccf8d6a..eefe2b7ceb765f 100644 --- a/benchmark/process/next-tick-exec.js +++ b/benchmark/process/next-tick-exec.js @@ -10,7 +10,7 @@ function main({ n }) { bench.end(n); } - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { process.nextTick(onNextTick, i); } diff --git a/benchmark/process/queue-microtask-breadth.js b/benchmark/process/queue-microtask-breadth.js index 8bb33f6fdee6cc..610dfc584ef738 100644 --- a/benchmark/process/queue-microtask-breadth.js +++ b/benchmark/process/queue-microtask-breadth.js @@ -6,7 +6,7 @@ const bench = common.createBenchmark(main, { }); function main({ n }) { - var j = 0; + let j = 0; function cb() { j++; @@ -15,7 +15,7 @@ function main({ n }) { } bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { queueMicrotask(cb); } } diff --git a/benchmark/querystring/querystring-parse.js b/benchmark/querystring/querystring-parse.js index ca4dca13bc14eb..2a5f3048de46b9 100644 --- a/benchmark/querystring/querystring-parse.js +++ b/benchmark/querystring/querystring-parse.js @@ -10,23 +10,23 @@ const bench = common.createBenchmark(main, { function main({ type, n }) { const input = inputs[type]; - var i; + // Execute the function a "sufficient" number of times before the timed // loop to ensure the function is optimized just once. if (type === 'multicharsep') { - for (i = 0; i < n; i += 1) + for (let i = 0; i < n; i += 1) querystring.parse(input, '&&&&&&&&&&'); bench.start(); - for (i = 0; i < n; i += 1) + for (let i = 0; i < n; i += 1) querystring.parse(input, '&&&&&&&&&&'); bench.end(n); } else { - for (i = 0; i < n; i += 1) + for (let i = 0; i < n; i += 1) querystring.parse(input); bench.start(); - for (i = 0; i < n; i += 1) + for (let i = 0; i < n; i += 1) querystring.parse(input); bench.end(n); } diff --git a/benchmark/querystring/querystring-stringify.js b/benchmark/querystring/querystring-stringify.js index 6c5da0f464034f..be81f67fa826d7 100644 --- a/benchmark/querystring/querystring-stringify.js +++ b/benchmark/querystring/querystring-stringify.js @@ -38,7 +38,7 @@ function main({ type, n }) { querystring.stringify(inputs[name]); bench.start(); - for (var i = 0; i < n; i += 1) + for (let i = 0; i < n; i += 1) querystring.stringify(input); bench.end(n); } diff --git a/benchmark/querystring/querystring-unescapebuffer.js b/benchmark/querystring/querystring-unescapebuffer.js index 39dd085eda938c..e6b842b3f94127 100644 --- a/benchmark/querystring/querystring-unescapebuffer.js +++ b/benchmark/querystring/querystring-unescapebuffer.js @@ -14,7 +14,7 @@ const bench = common.createBenchmark(main, { function main({ input, n }) { bench.start(); - for (var i = 0; i < n; i += 1) + for (let i = 0; i < n; i += 1) querystring.unescapeBuffer(input); bench.end(n); } diff --git a/benchmark/streams/creation.js b/benchmark/streams/creation.js index 46a0a547907c45..760ab5c89dca96 100644 --- a/benchmark/streams/creation.js +++ b/benchmark/streams/creation.js @@ -13,14 +13,13 @@ const bench = common.createBenchmark(main, { }); function main({ n, kind }) { - var i = 0; switch (kind) { case 'duplex': new Duplex({}); new Duplex(); bench.start(); - for (; i < n; ++i) + for (let i = 0; i < n; ++i) new Duplex(); bench.end(n); break; @@ -29,7 +28,7 @@ function main({ n, kind }) { new Readable(); bench.start(); - for (; i < n; ++i) + for (let i = 0; i < n; ++i) new Readable(); bench.end(n); break; @@ -38,7 +37,7 @@ function main({ n, kind }) { new Writable(); bench.start(); - for (; i < n; ++i) + for (let i = 0; i < n; ++i) new Writable(); bench.end(n); break; @@ -47,7 +46,7 @@ function main({ n, kind }) { new Transform(); bench.start(); - for (; i < n; ++i) + for (let i = 0; i < n; ++i) new Transform(); bench.end(n); break; diff --git a/benchmark/streams/pipe-object-mode.js b/benchmark/streams/pipe-object-mode.js index d52b2238780ccb..33588819f00a6c 100644 --- a/benchmark/streams/pipe-object-mode.js +++ b/benchmark/streams/pipe-object-mode.js @@ -12,7 +12,7 @@ function main({ n }) { const r = new Readable({ objectMode: true }); const w = new Writable({ objectMode: true }); - var i = 0; + let i = 0; r._read = () => r.push(i++ === n ? null : b); w._write = (data, enc, cb) => cb(); diff --git a/benchmark/streams/pipe.js b/benchmark/streams/pipe.js index 4baeeb2d2e7706..0df1afdbe10134 100644 --- a/benchmark/streams/pipe.js +++ b/benchmark/streams/pipe.js @@ -12,7 +12,7 @@ function main({ n }) { const r = new Readable(); const w = new Writable(); - var i = 0; + let i = 0; r._read = () => r.push(i++ === n ? null : b); w._write = (data, enc, cb) => cb(); diff --git a/benchmark/streams/readable-bigread.js b/benchmark/streams/readable-bigread.js index c3cff3d933d915..1bd1dab4edb07f 100644 --- a/benchmark/streams/readable-bigread.js +++ b/benchmark/streams/readable-bigread.js @@ -14,8 +14,8 @@ function main({ n }) { s._read = noop; bench.start(); - for (var k = 0; k < n; ++k) { - for (var i = 0; i < 1e4; ++i) + for (let k = 0; k < n; ++k) { + for (let i = 0; i < 1e4; ++i) s.push(b); while (s.read(128)); } diff --git a/benchmark/streams/readable-bigunevenread.js b/benchmark/streams/readable-bigunevenread.js index 95a4139c069e87..684986a778aba2 100644 --- a/benchmark/streams/readable-bigunevenread.js +++ b/benchmark/streams/readable-bigunevenread.js @@ -14,8 +14,8 @@ function main({ n }) { s._read = noop; bench.start(); - for (var k = 0; k < n; ++k) { - for (var i = 0; i < 1e4; ++i) + for (let k = 0; k < n; ++k) { + for (let i = 0; i < 1e4; ++i) s.push(b); while (s.read(106)); } diff --git a/benchmark/streams/readable-boundaryread.js b/benchmark/streams/readable-boundaryread.js index 835c7d18b51285..edc90d04de161d 100644 --- a/benchmark/streams/readable-boundaryread.js +++ b/benchmark/streams/readable-boundaryread.js @@ -10,14 +10,14 @@ const bench = common.createBenchmark(main, { function main({ n, type }) { const s = new Readable(); - var data = 'a'.repeat(32); + let data = 'a'.repeat(32); if (type === 'buffer') data = Buffer.from(data); s._read = function() {}; bench.start(); - for (var k = 0; k < n; ++k) { - for (var i = 0; i < 1e4; ++i) + for (let k = 0; k < n; ++k) { + for (let i = 0; i < 1e4; ++i) s.push(data); while (s.read(32)); } diff --git a/benchmark/streams/readable-readall.js b/benchmark/streams/readable-readall.js index 3c177ec4c39988..d14fd7756586e9 100644 --- a/benchmark/streams/readable-readall.js +++ b/benchmark/streams/readable-readall.js @@ -14,8 +14,8 @@ function main({ n }) { s._read = noop; bench.start(); - for (var k = 0; k < n; ++k) { - for (var i = 0; i < 1e4; ++i) + for (let k = 0; k < n; ++k) { + for (let i = 0; i < 1e4; ++i) s.push(b); while (s.read()); } diff --git a/benchmark/streams/readable-unevenread.js b/benchmark/streams/readable-unevenread.js index 690f1f420838c6..9da8410131bfff 100644 --- a/benchmark/streams/readable-unevenread.js +++ b/benchmark/streams/readable-unevenread.js @@ -14,8 +14,8 @@ function main({ n }) { s._read = noop; bench.start(); - for (var k = 0; k < n; ++k) { - for (var i = 0; i < 1e4; ++i) + for (let k = 0; k < n; ++k) { + for (let i = 0; i < 1e4; ++i) s.push(b); while (s.read(12)); } diff --git a/benchmark/streams/writable-manywrites.js b/benchmark/streams/writable-manywrites.js index 049bf8eb281db2..e4ae9ab91e5f4a 100644 --- a/benchmark/streams/writable-manywrites.js +++ b/benchmark/streams/writable-manywrites.js @@ -35,8 +35,10 @@ function main({ n, sync, writev, callback }) { let k = 0; function run() { while (k++ < n && s.write(b, cb)); - if (k >= n) + if (k >= n) { bench.end(n); + s.removeListener('drain', run); + } } s.on('drain', run); run(); diff --git a/benchmark/string_decoder/string-decoder-create.js b/benchmark/string_decoder/string-decoder-create.js index fad727222e1870..f7fa5e0246b860 100644 --- a/benchmark/string_decoder/string-decoder-create.js +++ b/benchmark/string_decoder/string-decoder-create.js @@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, { function main({ encoding, n }) { bench.start(); - for (var i = 0; i < n; ++i) { + for (let i = 0; i < n; ++i) { const sd = new StringDecoder(encoding); !!sd.encoding; } diff --git a/benchmark/string_decoder/string-decoder.js b/benchmark/string_decoder/string-decoder.js index 0e34effbc7d964..afc0dde62e7937 100644 --- a/benchmark/string_decoder/string-decoder.js +++ b/benchmark/string_decoder/string-decoder.js @@ -14,12 +14,11 @@ const ASC_ALPHA = 'Blueberry jam'; const UTF16_BUF = Buffer.from('Blåbærsyltetøy', 'utf16le'); function main({ encoding, inLen, chunkLen, n }) { - var alpha; - var buf; + let alpha; + let buf; const chunks = []; - var str = ''; + let str = ''; const isBase64 = (encoding === 'base64-ascii' || encoding === 'base64-utf8'); - var i; if (encoding === 'ascii' || encoding === 'base64-ascii') alpha = ASC_ALPHA; @@ -33,7 +32,7 @@ function main({ encoding, inLen, chunkLen, n }) { const sd = new StringDecoder(isBase64 ? 'base64' : encoding); - for (i = 0; i < inLen; ++i) { + for (let i = 0; i < inLen; ++i) { if (i > 0 && (i % chunkLen) === 0 && !isBase64) { if (alpha) { chunks.push(Buffer.from(str, encoding)); @@ -46,8 +45,8 @@ function main({ encoding, inLen, chunkLen, n }) { if (alpha) str += alpha[i % alpha.length]; else { - var start = i; - var end = i + 2; + let start = i; + let end = i + 2; if (i % 2 !== 0) { ++start; ++end; @@ -77,8 +76,8 @@ function main({ encoding, inLen, chunkLen, n }) { const nChunks = chunks.length; bench.start(); - for (i = 0; i < n; ++i) { - for (var j = 0; j < nChunks; ++j) + for (let i = 0; i < n; ++i) { + for (let j = 0; j < nChunks; ++j) sd.write(chunks[j]); } bench.end(n); diff --git a/benchmark/timers/immediate.js b/benchmark/timers/immediate.js index ba50f961daa6aa..d12106a0e030fc 100644 --- a/benchmark/timers/immediate.js +++ b/benchmark/timers/immediate.js @@ -66,7 +66,7 @@ function breadth(N) { if (n === N) bench.end(N); } - for (var i = 0; i < N; i++) { + for (let i = 0; i < N; i++) { setImmediate(cb); } } @@ -80,7 +80,7 @@ function breadth1(N) { if (n === N) bench.end(n); } - for (var i = 0; i < N; i++) { + for (let i = 0; i < N; i++) { setImmediate(cb, 1); } } @@ -95,7 +95,7 @@ function breadth4(N) { if (n === N) bench.end(n); } - for (var i = 0; i < N; i++) { + for (let i = 0; i < N; i++) { setImmediate(cb, 1, 2, 3, 4); } } @@ -107,7 +107,7 @@ function clear(N) { if (a1 === 2) bench.end(N); } - for (var i = 0; i < N; i++) { + for (let i = 0; i < N; i++) { clearImmediate(setImmediate(cb, 1)); } setImmediate(cb, 2); diff --git a/benchmark/timers/timers-breadth-args.js b/benchmark/timers/timers-breadth-args.js index bdb3adbbec6b7a..63a301dc9bc7dc 100644 --- a/benchmark/timers/timers-breadth-args.js +++ b/benchmark/timers/timers-breadth-args.js @@ -32,7 +32,7 @@ function main({ n }) { } bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { if (i % 4 === 0) setTimeout(cb4, 1, 3.14, 1024, true, false); else if (i % 3 === 0) diff --git a/benchmark/timers/timers-breadth.js b/benchmark/timers/timers-breadth.js index 8cd77f4fab2852..78bd5a97ae84b8 100644 --- a/benchmark/timers/timers-breadth.js +++ b/benchmark/timers/timers-breadth.js @@ -13,7 +13,7 @@ function main({ n }) { if (j === n) bench.end(n); } - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { setTimeout(cb, 1); } } diff --git a/benchmark/timers/timers-cancel-pooled.js b/benchmark/timers/timers-cancel-pooled.js index 6f16f3c91da8a8..5045983210263e 100644 --- a/benchmark/timers/timers-cancel-pooled.js +++ b/benchmark/timers/timers-cancel-pooled.js @@ -9,7 +9,7 @@ const bench = common.createBenchmark(main, { function main({ n }) { var timer = setTimeout(() => {}, 1); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { setTimeout(cb, 1); } var next = timer._idlePrev; @@ -17,7 +17,7 @@ function main({ n }) { bench.start(); - for (var j = 0; j < n; j++) { + for (let j = 0; j < n; j++) { timer = next; next = timer._idlePrev; clearTimeout(timer); diff --git a/benchmark/timers/timers-cancel-unpooled.js b/benchmark/timers/timers-cancel-unpooled.js index 1daf68bde0ed51..df203ee4810b1d 100644 --- a/benchmark/timers/timers-cancel-unpooled.js +++ b/benchmark/timers/timers-cancel-unpooled.js @@ -10,7 +10,7 @@ const bench = common.createBenchmark(main, { function main({ n, direction }) { const timersList = []; - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { timersList.push(setTimeout(cb, i + 1)); } diff --git a/benchmark/timers/timers-insert-pooled.js b/benchmark/timers/timers-insert-pooled.js index a7441a9eaf76f6..91b69d34514a86 100644 --- a/benchmark/timers/timers-insert-pooled.js +++ b/benchmark/timers/timers-insert-pooled.js @@ -9,7 +9,7 @@ function main({ n }) { bench.start(); - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { setTimeout(() => {}, 1); } diff --git a/benchmark/timers/timers-insert-unpooled.js b/benchmark/timers/timers-insert-unpooled.js index 232cc7c31aff16..11d25d5fe79670 100644 --- a/benchmark/timers/timers-insert-unpooled.js +++ b/benchmark/timers/timers-insert-unpooled.js @@ -23,7 +23,7 @@ function main({ direction, n }) { } bench.end(n); - for (var j = 0; j < n; j++) { + for (let j = 0; j < n; j++) { clearTimeout(timersList[j]); } } diff --git a/benchmark/timers/timers-timeout-nexttick.js b/benchmark/timers/timers-timeout-nexttick.js index 638d8aec149cd5..784c8e0168dd28 100644 --- a/benchmark/timers/timers-timeout-nexttick.js +++ b/benchmark/timers/timers-timeout-nexttick.js @@ -30,7 +30,7 @@ function main({ n }) { bench.end(n); } - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { setTimeout(i % 2 ? cb : cb2, 1); } diff --git a/benchmark/timers/timers-timeout-pooled.js b/benchmark/timers/timers-timeout-pooled.js index 1cdae07dc98bdc..eb54d3c7a0082a 100644 --- a/benchmark/timers/timers-timeout-pooled.js +++ b/benchmark/timers/timers-timeout-pooled.js @@ -27,7 +27,7 @@ function main({ n }) { bench.end(n); } - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { setTimeout(i % 2 ? cb : cb2, 1); } diff --git a/benchmark/timers/timers-timeout-unpooled.js b/benchmark/timers/timers-timeout-unpooled.js index fecb73a36013b0..a7820805082047 100644 --- a/benchmark/timers/timers-timeout-unpooled.js +++ b/benchmark/timers/timers-timeout-unpooled.js @@ -27,7 +27,7 @@ function main({ n }) { bench.end(n); } - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { // unref().ref() will cause each of these timers to // allocate their own handle setTimeout(i % 2 ? cb : cb2, 1).unref().ref(); diff --git a/benchmark/tls/convertprotocols.js b/benchmark/tls/convertprotocols.js index 0ba6c6dd0873b5..74bb942bfcec4f 100644 --- a/benchmark/tls/convertprotocols.js +++ b/benchmark/tls/convertprotocols.js @@ -16,7 +16,7 @@ function main({ n }) { m = {}; } bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) tls.convertALPNProtocols(input, m); bench.end(n); } diff --git a/benchmark/tls/secure-pair.js b/benchmark/tls/secure-pair.js index c52f4cbf918a1d..bb7933d837f999 100644 --- a/benchmark/tls/secure-pair.js +++ b/benchmark/tls/secure-pair.js @@ -3,7 +3,7 @@ const common = require('../common.js'); const bench = common.createBenchmark(main, { dur: [5], securing: ['SecurePair', 'TLSSocket', 'clear'], - size: [2, 100, 1024, 1024 * 1024] + size: [100, 1024, 1024 * 1024] }); const fixtures = require('../../test/common/fixtures'); diff --git a/benchmark/tls/throughput.js b/benchmark/tls/throughput.js index a8f2d19649d04a..3ea84aa84ef453 100644 --- a/benchmark/tls/throughput.js +++ b/benchmark/tls/throughput.js @@ -3,7 +3,7 @@ const common = require('../common.js'); const bench = common.createBenchmark(main, { dur: [5], type: ['buf', 'asc', 'utf'], - size: [2, 1024, 1024 * 1024] + size: [100, 1024, 1024 * 1024, 4 * 1024 * 1024, 16 * 1024 * 1024] }); const fixtures = require('../../test/common/fixtures'); diff --git a/benchmark/tls/tls-connect.js b/benchmark/tls/tls-connect.js index 4300f6841f0cd6..1cb04d98a52721 100644 --- a/benchmark/tls/tls-connect.js +++ b/benchmark/tls/tls-connect.js @@ -31,7 +31,7 @@ function main(conf) { function onListening() { setTimeout(done, dur * 1000); bench.start(); - for (var i = 0; i < concurrency; i++) + for (let i = 0; i < concurrency; i++) makeConnection(); } diff --git a/benchmark/url/legacy-vs-whatwg-url-get-prop.js b/benchmark/url/legacy-vs-whatwg-url-get-prop.js index 16bcd226324ef8..fe0c464f52b3c9 100644 --- a/benchmark/url/legacy-vs-whatwg-url-get-prop.js +++ b/benchmark/url/legacy-vs-whatwg-url-get-prop.js @@ -71,9 +71,8 @@ function useWHATWG(data) { } function main({ type, method, e }) { - e = +e; - var data; - var noDead; // Avoid dead code elimination. + let data; + let noDead; // Avoid dead code elimination. switch (method) { case 'legacy': data = common.bakeUrlData(type, e, false, false); diff --git a/benchmark/url/legacy-vs-whatwg-url-parse.js b/benchmark/url/legacy-vs-whatwg-url-parse.js index 7c49654b47d8e2..6e5e25d231242f 100644 --- a/benchmark/url/legacy-vs-whatwg-url-parse.js +++ b/benchmark/url/legacy-vs-whatwg-url-parse.js @@ -46,7 +46,6 @@ function useWHATWGWithoutBase(data) { } function main({ e, method, type, withBase }) { - e = +e; withBase = withBase === 'true'; var noDead; // Avoid dead code elimination. var data; diff --git a/benchmark/url/legacy-vs-whatwg-url-serialize.js b/benchmark/url/legacy-vs-whatwg-url-serialize.js index d6d8c8a4e71152..5523e549ceb233 100644 --- a/benchmark/url/legacy-vs-whatwg-url-serialize.js +++ b/benchmark/url/legacy-vs-whatwg-url-serialize.js @@ -35,7 +35,6 @@ function useWHATWG(data) { } function main({ type, e, method }) { - e = +e; const data = common.bakeUrlData(type, e, false, false); var noDead; // Avoid dead code elimination. diff --git a/benchmark/url/url-format.js b/benchmark/url/url-format.js index 3e91cefd363c37..be5632d2b67367 100644 --- a/benchmark/url/url-format.js +++ b/benchmark/url/url-format.js @@ -13,7 +13,7 @@ const bench = common.createBenchmark(main, { }); function main({ type, n }) { - const input = inputs[type] || ''; + const input = inputs[type]; // Force-optimize url.format() so that the benchmark doesn't get // disrupted by the optimizer kicking in halfway through. diff --git a/benchmark/url/url-parse.js b/benchmark/url/url-parse.js index 751a11201b11e2..b3e83188b2192f 100644 --- a/benchmark/url/url-parse.js +++ b/benchmark/url/url-parse.js @@ -13,7 +13,7 @@ const bench = common.createBenchmark(main, { }); function main({ type, n }) { - const input = inputs[type] || ''; + const input = inputs[type]; bench.start(); for (let i = 0; i < n; i += 1) diff --git a/benchmark/url/whatwg-url-properties.js b/benchmark/url/whatwg-url-properties.js index 60f573e27a8fe2..ac71ff4f636d66 100644 --- a/benchmark/url/whatwg-url-properties.js +++ b/benchmark/url/whatwg-url-properties.js @@ -34,7 +34,6 @@ function get(data, prop) { } function main({ e, type, prop, withBase }) { - e = +e; withBase = withBase === 'true'; const data = common.bakeUrlData(type, e, withBase, true); switch (prop) { diff --git a/benchmark/util/format.js b/benchmark/util/format.js index 976e0f4e655486..f7a6caa81c96b6 100644 --- a/benchmark/util/format.js +++ b/benchmark/util/format.js @@ -23,8 +23,7 @@ const bench = common.createBenchmark(main, { }); function main({ n, type }) { - // For testing, if supplied with an empty type, default to string. - const [first, second] = inputs[type || 'string']; + const [first, second] = inputs[type]; bench.start(); for (let i = 0; i < n; i++) { diff --git a/benchmark/util/inspect-array.js b/benchmark/util/inspect-array.js index 4fd73785f789d1..987b40479184d2 100644 --- a/benchmark/util/inspect-array.js +++ b/benchmark/util/inspect-array.js @@ -23,8 +23,6 @@ function main({ n, len, type }) { opts = { showHidden: true }; arr = arr.fill('denseArray'); break; - // For testing, if supplied with an empty type, default to denseArray. - case '': case 'denseArray': arr = arr.fill('denseArray'); break; diff --git a/benchmark/util/type-check.js b/benchmark/util/type-check.js index 5b992e729e63ae..49cef48fe144db 100644 --- a/benchmark/util/type-check.js +++ b/benchmark/util/type-check.js @@ -35,9 +35,6 @@ const bench = common.createBenchmark(main, { }); function main({ type, argument, version, n }) { - // For testing, if supplied with an empty type, default to ArrayBufferView. - type = type || 'ArrayBufferView'; - const util = common.binding('util'); const types = require('internal/util/types'); diff --git a/benchmark/v8/get-stats.js b/benchmark/v8/get-stats.js index aa1f0516811983..d5ce102774df6e 100644 --- a/benchmark/v8/get-stats.js +++ b/benchmark/v8/get-stats.js @@ -13,7 +13,7 @@ const bench = common.createBenchmark(main, { function main({ method, n }) { bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) v8[method](); bench.end(n); } diff --git a/benchmark/vm/run-in-context.js b/benchmark/vm/run-in-context.js index 9b57067a19c9ac..980a08e7e56e8c 100644 --- a/benchmark/vm/run-in-context.js +++ b/benchmark/vm/run-in-context.js @@ -20,7 +20,7 @@ function main({ n, breakOnSigint, withSigintListener }) { const contextifiedSandbox = vm.createContext(); bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) vm.runInContext('0', contextifiedSandbox, options); bench.end(n); } diff --git a/benchmark/vm/run-in-this-context.js b/benchmark/vm/run-in-this-context.js index 0754287376d58c..c612c1ea49ecf6 100644 --- a/benchmark/vm/run-in-this-context.js +++ b/benchmark/vm/run-in-this-context.js @@ -18,7 +18,7 @@ function main({ n, breakOnSigint, withSigintListener }) { process.on('SIGINT', () => {}); bench.start(); - for (var i = 0; i < n; i++) + for (let i = 0; i < n; i++) vm.runInThisContext('0', options); bench.end(n); } diff --git a/benchmark/worker/echo.js b/benchmark/worker/echo.js index 3e729d0e26fa04..8d45a1f76b5eac 100644 --- a/benchmark/worker/echo.js +++ b/benchmark/worker/echo.js @@ -1,6 +1,7 @@ 'use strict'; const common = require('../common.js'); +const { Worker } = require('worker_threads'); const path = require('path'); const bench = common.createBenchmark(main, { workers: [1], @@ -11,19 +12,14 @@ const bench = common.createBenchmark(main, { const workerPath = path.resolve(__dirname, '..', 'fixtures', 'echo.worker.js'); -function main(conf) { - const { Worker } = require('worker_threads'); - - const n = +conf.n; - const workers = +conf.workers; - const sends = +conf.sendsPerBroadcast; +function main({ n, workers, sendsPerBroadcast: sends, payload: payloadType }) { const expectedPerBroadcast = sends * workers; - var payload; - var readies = 0; - var broadcasts = 0; - var msgCount = 0; + let payload; + let readies = 0; + let broadcasts = 0; + let msgCount = 0; - switch (conf.payload) { + switch (payloadType) { case 'string': payload = 'hello world!'; break; @@ -36,7 +32,7 @@ function main(conf) { const workerObjs = []; - for (var i = 0; i < workers; ++i) { + for (let i = 0; i < workers; ++i) { const worker = new Worker(workerPath); workerObjs.push(worker); worker.on('online', onOnline); diff --git a/benchmark/worker/messageport.js b/benchmark/worker/messageport.js new file mode 100644 index 00000000000000..8e2ddae73ff3ab --- /dev/null +++ b/benchmark/worker/messageport.js @@ -0,0 +1,42 @@ +'use strict'; + +const common = require('../common.js'); +const { MessageChannel } = require('worker_threads'); +const bench = common.createBenchmark(main, { + payload: ['string', 'object'], + n: [1e6] +}); + +function main(conf) { + const n = conf.n; + let payload; + + switch (conf.payload) { + case 'string': + payload = 'hello world!'; + break; + case 'object': + payload = { action: 'pewpewpew', powerLevel: 9001 }; + break; + default: + throw new Error('Unsupported payload type'); + } + + const { port1, port2 } = new MessageChannel(); + + let messages = 0; + port2.onmessage = () => { + if (messages++ === n) { + bench.end(n); + port1.close(); + } else { + write(); + } + }; + bench.start(); + write(); + + function write() { + port1.postMessage(payload); + } +} diff --git a/common.gypi b/common.gypi index 8c9076b7352d81..38a22fc5f1ddd6 100644 --- a/common.gypi +++ b/common.gypi @@ -38,7 +38,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.31', + 'v8_embedder_string': '-node.34', ##### V8 defaults for Node.js ##### @@ -136,6 +136,9 @@ ['OS=="mac"', { 'clang%': 1, }], + ['target_arch in "ppc64 s390x"', { + 'v8_enable_backtrace': 1, + }], ], }, diff --git a/configure.py b/configure.py index 14f5665e0299a2..5c1360615de6b3 100755 --- a/configure.py +++ b/configure.py @@ -88,6 +88,11 @@ dest='debug', help='also build debug build') +parser.add_option('--debug-node', + action='store_true', + dest='debug_node', + help='build the Node.js part of the binary with debugging symbols') + parser.add_option('--dest-cpu', action='store', dest='dest_cpu', @@ -295,6 +300,27 @@ dest='shared_zlib_libpath', help='a directory to search for the shared zlib DLL') +shared_optgroup.add_option('--shared-brotli', + action='store_true', + dest='shared_brotli', + help='link to a shared brotli DLL instead of static linking') + +shared_optgroup.add_option('--shared-brotli-includes', + action='store', + dest='shared_brotli_includes', + help='directory containing brotli header files') + +shared_optgroup.add_option('--shared-brotli-libname', + action='store', + dest='shared_brotli_libname', + default='brotlidec,brotlienc', + help='alternative lib name to link to [default: %default]') + +shared_optgroup.add_option('--shared-brotli-libpath', + action='store', + dest='shared_brotli_libpath', + help='a directory to search for the shared brotli DLL') + shared_optgroup.add_option('--shared-cares', action='store_true', dest='shared_cares', @@ -664,7 +690,11 @@ def pkg_config(pkg): retval = () for flag in ['--libs-only-l', '--cflags-only-I', '--libs-only-L', '--modversion']: - args += [flag, pkg] + args += [flag] + if isinstance(pkg, list): + args += pkg + else: + args += [pkg] try: proc = subprocess.Popen(shlex.split(pkg_config) + args, stdout=subprocess.PIPE) @@ -964,6 +994,7 @@ def configure_node(o): o['variables']['node_prefix'] = options.prefix o['variables']['node_install_npm'] = b(not options.without_npm) o['variables']['node_report'] = b(not options.without_report) + o['variables']['debug_node'] = b(options.debug_node) o['default_configuration'] = 'Debug' if options.debug else 'Release' host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc() @@ -1644,6 +1675,7 @@ def make_bin_override(): configure_library('zlib', output) configure_library('http_parser', output) configure_library('libuv', output) +configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc']) configure_library('cares', output, pkgname='libcares') configure_library('nghttp2', output, pkgname='libnghttp2') configure_v8(output) diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp index be7931f7743db1..0b5cd02c21dde1 100644 --- a/deps/cares/cares.gyp +++ b/deps/cares/cares.gyp @@ -112,7 +112,10 @@ 'defines': [ 'CARES_BUILDING_LIBRARY' ] }], [ 'OS=="win"', { - 'defines': [ 'CARES_PULL_WS2TCPIP_H=1' ], + 'defines': [ + 'CARES_PULL_WS2TCPIP_H=1', + '_WINSOCK_DEPRECATED_NO_WARNINGS', + ], 'include_dirs': [ 'config/win32' ], 'sources': [ 'src/config-win32.h', diff --git a/deps/icu-small/README-SMALL-ICU.txt b/deps/icu-small/README-SMALL-ICU.txt index efc3ebe925cbba..5530235095c8fd 100644 --- a/deps/icu-small/README-SMALL-ICU.txt +++ b/deps/icu-small/README-SMALL-ICU.txt @@ -1,8 +1,8 @@ Small ICU sources - auto generated by shrink-icu-src.py This directory contains the ICU subset used by --with-intl=small-icu (the default) -It is a strict subset of ICU 64 source files with the following exception(s): -* deps/icu-small/source/data/in/icudt64l.dat : Reduced-size data file +It is a strict subset of ICU 65 source files with the following exception(s): +* deps/icu-small/source/data/in/icudt65l.dat : Reduced-size data file To rebuild this directory, see ../../tools/icu/README.md diff --git a/deps/icu-small/source/common/brkeng.cpp b/deps/icu-small/source/common/brkeng.cpp index 42771b3617747d..68c74f2359c4a1 100644 --- a/deps/icu-small/source/common/brkeng.cpp +++ b/deps/icu-small/source/common/brkeng.cpp @@ -129,7 +129,7 @@ ICULanguageBreakFactory::getEngineFor(UChar32 c) { const LanguageBreakEngine *lbe = NULL; UErrorCode status = U_ZERO_ERROR; - static UMutex gBreakEngineMutex = U_MUTEX_INITIALIZER; + static UMutex gBreakEngineMutex; Mutex m(&gBreakEngineMutex); if (fEngines == NULL) { diff --git a/deps/icu-small/source/common/brkiter.cpp b/deps/icu-small/source/common/brkiter.cpp index 23e0cc3c153392..2fc4c345c7a038 100644 --- a/deps/icu-small/source/common/brkiter.cpp +++ b/deps/icu-small/source/common/brkiter.cpp @@ -277,7 +277,7 @@ ICUBreakIteratorService::~ICUBreakIteratorService() {} // defined in ucln_cmn.h U_NAMESPACE_END -static icu::UInitOnce gInitOnceBrkiter; +static icu::UInitOnce gInitOnceBrkiter = U_INITONCE_INITIALIZER; static icu::ICULocaleService* gService = NULL; diff --git a/deps/icu-small/source/common/bytesinkutil.h b/deps/icu-small/source/common/bytesinkutil.h index 69e4cbcd263932..6808fbe6777837 100644 --- a/deps/icu-small/source/common/bytesinkutil.h +++ b/deps/icu-small/source/common/bytesinkutil.h @@ -59,7 +59,7 @@ class U_COMMON_API ByteSinkUtil { ByteSink &sink, uint32_t options, Edits *edits); }; -class CharStringByteSink : public ByteSink { +class U_COMMON_API CharStringByteSink : public ByteSink { public: CharStringByteSink(CharString* dest); ~CharStringByteSink() override; diff --git a/deps/icu-small/source/common/characterproperties.cpp b/deps/icu-small/source/common/characterproperties.cpp index 5a57364375b372..7b50a4e2051b97 100644 --- a/deps/icu-small/source/common/characterproperties.cpp +++ b/deps/icu-small/source/common/characterproperties.cpp @@ -38,8 +38,8 @@ UBool U_CALLCONV characterproperties_cleanup(); constexpr int32_t NUM_INCLUSIONS = UPROPS_SRC_COUNT + UCHAR_INT_LIMIT - UCHAR_INT_START; struct Inclusion { - UnicodeSet *fSet; - UInitOnce fInitOnce; + UnicodeSet *fSet = nullptr; + UInitOnce fInitOnce = U_INITONCE_INITIALIZER; }; Inclusion gInclusions[NUM_INCLUSIONS]; // cached getInclusions() @@ -47,10 +47,7 @@ UnicodeSet *sets[UCHAR_BINARY_LIMIT] = {}; UCPMap *maps[UCHAR_INT_LIMIT - UCHAR_INT_START] = {}; -icu::UMutex *cpMutex() { - static icu::UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +icu::UMutex cpMutex; //---------------------------------------------------------------- // Inclusions list @@ -361,7 +358,7 @@ u_getBinaryPropertySet(UProperty property, UErrorCode *pErrorCode) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return nullptr; } - Mutex m(cpMutex()); + Mutex m(&cpMutex); UnicodeSet *set = sets[property]; if (set == nullptr) { sets[property] = set = makeSet(property, *pErrorCode); @@ -377,7 +374,7 @@ u_getIntPropertyMap(UProperty property, UErrorCode *pErrorCode) { *pErrorCode = U_ILLEGAL_ARGUMENT_ERROR; return nullptr; } - Mutex m(cpMutex()); + Mutex m(&cpMutex); UCPMap *map = maps[property - UCHAR_INT_START]; if (map == nullptr) { maps[property - UCHAR_INT_START] = map = makeMap(property, *pErrorCode); diff --git a/deps/icu-small/source/common/charstr.cpp b/deps/icu-small/source/common/charstr.cpp index 852cc539457760..dda29dac63273c 100644 --- a/deps/icu-small/source/common/charstr.cpp +++ b/deps/icu-small/source/common/charstr.cpp @@ -35,6 +35,17 @@ CharString& CharString::operator=(CharString&& src) U_NOEXCEPT { return *this; } +char *CharString::cloneData(UErrorCode &errorCode) const { + if (U_FAILURE(errorCode)) { return nullptr; } + char *p = static_cast(uprv_malloc(len + 1)); + if (p == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } + uprv_memcpy(p, buffer.getAlias(), len + 1); + return p; +} + CharString &CharString::copyFrom(const CharString &s, UErrorCode &errorCode) { if(U_SUCCESS(errorCode) && this!=&s && ensureCapacity(s.len+1, 0, errorCode)) { len=s.len; @@ -52,6 +63,18 @@ int32_t CharString::lastIndexOf(char c) const { return -1; } +bool CharString::contains(StringPiece s) const { + if (s.empty()) { return false; } + const char *p = buffer.getAlias(); + int32_t lastStart = len - s.length(); + for (int32_t i = 0; i <= lastStart; ++i) { + if (uprv_memcmp(p + i, s.data(), s.length()) == 0) { + return true; + } + } + return false; +} + CharString &CharString::truncate(int32_t newLength) { if(newLength<0) { newLength=0; diff --git a/deps/icu-small/source/common/charstr.h b/deps/icu-small/source/common/charstr.h index 1a97e01988f991..23b950ed6ecc76 100644 --- a/deps/icu-small/source/common/charstr.h +++ b/deps/icu-small/source/common/charstr.h @@ -82,10 +82,24 @@ class U_COMMON_API CharString : public UMemory { const char *data() const { return buffer.getAlias(); } char *data() { return buffer.getAlias(); } + /** + * Allocates length()+1 chars and copies the NUL-terminated data(). + * The caller must uprv_free() the result. + */ + char *cloneData(UErrorCode &errorCode) const; + + bool operator==(StringPiece other) const { + return len == other.length() && (len == 0 || uprv_memcmp(data(), other.data(), len) == 0); + } + bool operator!=(StringPiece other) const { + return !operator==(other); + } /** @return last index of c, or -1 if c is not in this string */ int32_t lastIndexOf(char c) const; + bool contains(StringPiece s) const; + CharString &clear() { len=0; buffer[0]=0; return *this; } CharString &truncate(int32_t newLength); diff --git a/deps/icu-small/source/common/cmemory.h b/deps/icu-small/source/common/cmemory.h index f501b20a14ca13..b24bd0ead2761c 100644 --- a/deps/icu-small/source/common/cmemory.h +++ b/deps/icu-small/source/common/cmemory.h @@ -64,38 +64,37 @@ uprv_free(void *mem); U_CAPI void * U_EXPORT2 uprv_calloc(size_t num, size_t size) U_MALLOC_ATTR U_ALLOC_SIZE_ATTR2(1,2); -/** - * This should align the memory properly on any machine. - * This is very useful for the safeClone functions. - */ -typedef union { - long t1; - double t2; - void *t3; -} UAlignedMemory; - /** * Get the least significant bits of a pointer (a memory address). * For example, with a mask of 3, the macro gets the 2 least significant bits, * which will be 0 if the pointer is 32-bit (4-byte) aligned. * - * ptrdiff_t is the most appropriate integer type to cast to. - * size_t should work too, since on most (or all?) platforms it has the same - * width as ptrdiff_t. + * uintptr_t is the most appropriate integer type to cast to. */ -#define U_POINTER_MASK_LSB(ptr, mask) (((ptrdiff_t)(char *)(ptr)) & (mask)) +#define U_POINTER_MASK_LSB(ptr, mask) ((uintptr_t)(ptr) & (mask)) /** - * Get the amount of bytes that a pointer is off by from - * the previous UAlignedMemory-aligned pointer. - */ -#define U_ALIGNMENT_OFFSET(ptr) U_POINTER_MASK_LSB(ptr, sizeof(UAlignedMemory) - 1) - -/** - * Get the amount of bytes to add to a pointer - * in order to get the next UAlignedMemory-aligned address. + * Create & return an instance of "type" in statically allocated storage. + * e.g. + * static std::mutex *myMutex = STATIC_NEW(std::mutex); + * To destroy an object created in this way, invoke the destructor explicitly, e.g. + * myMutex->~mutex(); + * DO NOT use delete. + * DO NOT use with class UMutex, which has specific support for static instances. + * + * STATIC_NEW is intended for use when + * - We want a static (or global) object. + * - We don't want it to ever be destructed, or to explicitly control destruction, + * to avoid use-after-destruction problems. + * - We want to avoid an ordinary heap allocated object, + * to avoid the possibility of memory allocation failures, and + * to avoid memory leak reports, from valgrind, for example. + * This is defined as a macro rather than a template function because each invocation + * must define distinct static storage for the object being returned. */ -#define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr)) +#define STATIC_NEW(type) [] () { \ + alignas(type) static char storage[sizeof(type)]; \ + return new(storage) type();} () /** * Heap clean up function, called from u_cleanup() diff --git a/deps/icu-small/source/common/edits.cpp b/deps/icu-small/source/common/edits.cpp index 00a8d601a1cc80..95f0c19a728cf4 100644 --- a/deps/icu-small/source/common/edits.cpp +++ b/deps/icu-small/source/common/edits.cpp @@ -243,7 +243,7 @@ UBool Edits::growArray() { return TRUE; } -UBool Edits::copyErrorTo(UErrorCode &outErrorCode) { +UBool Edits::copyErrorTo(UErrorCode &outErrorCode) const { if (U_FAILURE(outErrorCode)) { return TRUE; } if (U_SUCCESS(errorCode_)) { return FALSE; } outErrorCode = errorCode_; diff --git a/deps/icu-small/source/common/filteredbrk.cpp b/deps/icu-small/source/common/filteredbrk.cpp index 162b38de5d6fa2..ae7cf5270aeabf 100644 --- a/deps/icu-small/source/common/filteredbrk.cpp +++ b/deps/icu-small/source/common/filteredbrk.cpp @@ -173,7 +173,7 @@ class SimpleFilteredSentenceBreakIterator : public BreakIterator { status = U_SAFECLONE_ALLOCATED_WARNING; return clone(); } - virtual BreakIterator* clone(void) const { return new SimpleFilteredSentenceBreakIterator(*this); } + virtual SimpleFilteredSentenceBreakIterator* clone() const { return new SimpleFilteredSentenceBreakIterator(*this); } virtual UClassID getDynamicClassID(void) const { return NULL; } virtual UBool operator==(const BreakIterator& o) const { if(this==&o) return true; return false; } diff --git a/deps/icu-small/source/common/localebuilder.cpp b/deps/icu-small/source/common/localebuilder.cpp index fe931fcf759dfd..1dd8131e5895a5 100644 --- a/deps/icu-small/source/common/localebuilder.cpp +++ b/deps/icu-small/source/common/localebuilder.cpp @@ -157,13 +157,18 @@ _isKeywordValue(const char* key, const char* value, int32_t value_len) } static void -_copyExtensions(const Locale& from, Locale* to, bool validate, UErrorCode& errorCode) +_copyExtensions(const Locale& from, icu::StringEnumeration *keywords, + Locale& to, bool validate, UErrorCode& errorCode) { if (U_FAILURE(errorCode)) { return; } - LocalPointer iter(from.createKeywords(errorCode)); - if (U_FAILURE(errorCode) || iter.isNull()) { return; } + LocalPointer ownedKeywords; + if (keywords == nullptr) { + ownedKeywords.adoptInstead(from.createKeywords(errorCode)); + if (U_FAILURE(errorCode) || ownedKeywords.isNull()) { return; } + keywords = ownedKeywords.getAlias(); + } const char* key; - while ((key = iter->next(nullptr, errorCode)) != nullptr) { + while ((key = keywords->next(nullptr, errorCode)) != nullptr) { CharString value; CharStringByteSink sink(&value); from.getKeywordValue(key, sink, errorCode); @@ -176,34 +181,34 @@ _copyExtensions(const Locale& from, Locale* to, bool validate, UErrorCode& error errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } - to->setKeywordValue(key, value.data(), errorCode); + to.setKeywordValue(key, value.data(), errorCode); if (U_FAILURE(errorCode)) { return; } } } void static -_clearUAttributesAndKeyType(Locale* locale, UErrorCode& errorCode) +_clearUAttributesAndKeyType(Locale& locale, UErrorCode& errorCode) { // Clear Unicode attributes - locale->setKeywordValue(kAttributeKey, "", errorCode); + locale.setKeywordValue(kAttributeKey, "", errorCode); // Clear all Unicode keyword values - LocalPointer iter(locale->createUnicodeKeywords(errorCode)); + LocalPointer iter(locale.createUnicodeKeywords(errorCode)); if (U_FAILURE(errorCode) || iter.isNull()) { return; } const char* key; while ((key = iter->next(nullptr, errorCode)) != nullptr) { - locale->setUnicodeKeywordValue(key, nullptr, errorCode); + locale.setUnicodeKeywordValue(key, nullptr, errorCode); } } static void -_setUnicodeExtensions(Locale* locale, const CharString& value, UErrorCode& errorCode) +_setUnicodeExtensions(Locale& locale, const CharString& value, UErrorCode& errorCode) { // Add the unicode extensions to extensions_ CharString locale_str("und-u-", errorCode); locale_str.append(value, errorCode); _copyExtensions( - Locale::forLanguageTag(locale_str.data(), errorCode), + Locale::forLanguageTag(locale_str.data(), errorCode), nullptr, locale, false, errorCode); } @@ -235,10 +240,10 @@ LocaleBuilder& LocaleBuilder::setExtension(char key, StringPiece value) status_); return *this; } - _clearUAttributesAndKeyType(extensions_, status_); + _clearUAttributesAndKeyType(*extensions_, status_); if (U_FAILURE(status_)) { return *this; } if (!value.empty()) { - _setUnicodeExtensions(extensions_, value_str, status_); + _setUnicodeExtensions(*extensions_, value_str, status_); } return *this; } @@ -401,6 +406,24 @@ Locale makeBogusLocale() { return bogus; } +void LocaleBuilder::copyExtensionsFrom(const Locale& src, UErrorCode& errorCode) +{ + if (U_FAILURE(errorCode)) { return; } + LocalPointer keywords(src.createKeywords(errorCode)); + if (U_FAILURE(errorCode) || keywords.isNull() || keywords->count(errorCode) == 0) { + // Error, or no extensions to copy. + return; + } + if (extensions_ == nullptr) { + extensions_ = new Locale(); + if (extensions_ == nullptr) { + status_ = U_MEMORY_ALLOCATION_ERROR; + return; + } + } + _copyExtensions(src, keywords.getAlias(), *extensions_, false, errorCode); +} + Locale LocaleBuilder::build(UErrorCode& errorCode) { if (U_FAILURE(errorCode)) { @@ -425,7 +448,7 @@ Locale LocaleBuilder::build(UErrorCode& errorCode) } Locale product(locale_str.data()); if (extensions_ != nullptr) { - _copyExtensions(*extensions_, &product, true, errorCode); + _copyExtensions(*extensions_, nullptr, product, true, errorCode); } if (U_FAILURE(errorCode)) { return makeBogusLocale(); @@ -433,4 +456,13 @@ Locale LocaleBuilder::build(UErrorCode& errorCode) return product; } +UBool LocaleBuilder::copyErrorTo(UErrorCode &outErrorCode) const { + if (U_FAILURE(outErrorCode)) { + // Do not overwrite the older error code + return TRUE; + } + outErrorCode = status_; + return U_FAILURE(outErrorCode); +} + U_NAMESPACE_END diff --git a/deps/icu-small/source/common/localematcher.cpp b/deps/icu-small/source/common/localematcher.cpp new file mode 100644 index 00000000000000..d975fe759b4ce1 --- /dev/null +++ b/deps/icu-small/source/common/localematcher.cpp @@ -0,0 +1,720 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// localematcher.cpp +// created: 2019may08 Markus W. Scherer + +#ifndef __LOCMATCHER_H__ +#define __LOCMATCHER_H__ + +#include "unicode/utypes.h" +#include "unicode/localebuilder.h" +#include "unicode/localematcher.h" +#include "unicode/locid.h" +#include "unicode/stringpiece.h" +#include "unicode/uobject.h" +#include "cstring.h" +#include "localeprioritylist.h" +#include "loclikelysubtags.h" +#include "locdistance.h" +#include "lsr.h" +#include "uassert.h" +#include "uhash.h" +#include "uvector.h" + +#define UND_LSR LSR("und", "", "") + +/** + * Indicator for the lifetime of desired-locale objects passed into the LocaleMatcher. + * + * @draft ICU 65 + */ +enum ULocMatchLifetime { + /** + * Locale objects are temporary. + * The matcher will make a copy of a locale that will be used beyond one function call. + * + * @draft ICU 65 + */ + ULOCMATCH_TEMPORARY_LOCALES, + /** + * Locale objects are stored at least as long as the matcher is used. + * The matcher will keep only a pointer to a locale that will be used beyond one function call, + * avoiding a copy. + * + * @draft ICU 65 + */ + ULOCMATCH_STORED_LOCALES // TODO: permanent? cached? clone? +}; +#ifndef U_IN_DOXYGEN +typedef enum ULocMatchLifetime ULocMatchLifetime; +#endif + +U_NAMESPACE_BEGIN + +LocaleMatcher::Result::Result(LocaleMatcher::Result &&src) U_NOEXCEPT : + desiredLocale(src.desiredLocale), + supportedLocale(src.supportedLocale), + desiredIndex(src.desiredIndex), + supportedIndex(src.supportedIndex), + desiredIsOwned(src.desiredIsOwned) { + if (desiredIsOwned) { + src.desiredLocale = nullptr; + src.desiredIndex = -1; + src.desiredIsOwned = FALSE; + } +} + +LocaleMatcher::Result::~Result() { + if (desiredIsOwned) { + delete desiredLocale; + } +} + +LocaleMatcher::Result &LocaleMatcher::Result::operator=(LocaleMatcher::Result &&src) U_NOEXCEPT { + this->~Result(); + + desiredLocale = src.desiredLocale; + supportedLocale = src.supportedLocale; + desiredIndex = src.desiredIndex; + supportedIndex = src.supportedIndex; + desiredIsOwned = src.desiredIsOwned; + + if (desiredIsOwned) { + src.desiredLocale = nullptr; + src.desiredIndex = -1; + src.desiredIsOwned = FALSE; + } + return *this; +} + +Locale LocaleMatcher::Result::makeResolvedLocale(UErrorCode &errorCode) const { + if (U_FAILURE(errorCode) || supportedLocale == nullptr) { + return Locale::getRoot(); + } + const Locale *bestDesired = getDesiredLocale(); + if (bestDesired == nullptr || *supportedLocale == *bestDesired) { + return *supportedLocale; + } + LocaleBuilder b; + b.setLocale(*supportedLocale); + + // Copy the region from bestDesired, if there is one. + const char *region = bestDesired->getCountry(); + if (*region != 0) { + b.setRegion(region); + } + + // Copy the variants from bestDesired, if there are any. + // Note that this will override any supportedLocale variants. + // For example, "sco-ulster-fonipa" + "...-fonupa" => "sco-fonupa" (replacing ulster). + const char *variants = bestDesired->getVariant(); + if (*variants != 0) { + b.setVariant(variants); + } + + // Copy the extensions from bestDesired, if there are any. + // C++ note: The following note, copied from Java, may not be true, + // as long as C++ copies by legacy ICU keyword, not by extension singleton. + // Note that this will override any supportedLocale extensions. + // For example, "th-u-nu-latn-ca-buddhist" + "...-u-nu-native" => "th-u-nu-native" + // (replacing calendar). + b.copyExtensionsFrom(*bestDesired, errorCode); + return b.build(errorCode); +} + +LocaleMatcher::Builder::Builder(LocaleMatcher::Builder &&src) U_NOEXCEPT : + errorCode_(src.errorCode_), + supportedLocales_(src.supportedLocales_), + thresholdDistance_(src.thresholdDistance_), + demotion_(src.demotion_), + defaultLocale_(src.defaultLocale_), + favor_(src.favor_) { + src.supportedLocales_ = nullptr; + src.defaultLocale_ = nullptr; +} + +LocaleMatcher::Builder::~Builder() { + delete supportedLocales_; + delete defaultLocale_; +} + +LocaleMatcher::Builder &LocaleMatcher::Builder::operator=(LocaleMatcher::Builder &&src) U_NOEXCEPT { + this->~Builder(); + + errorCode_ = src.errorCode_; + supportedLocales_ = src.supportedLocales_; + thresholdDistance_ = src.thresholdDistance_; + demotion_ = src.demotion_; + defaultLocale_ = src.defaultLocale_; + favor_ = src.favor_; + + src.supportedLocales_ = nullptr; + src.defaultLocale_ = nullptr; + return *this; +} + +void LocaleMatcher::Builder::clearSupportedLocales() { + if (supportedLocales_ != nullptr) { + supportedLocales_->removeAllElements(); + } +} + +bool LocaleMatcher::Builder::ensureSupportedLocaleVector() { + if (U_FAILURE(errorCode_)) { return false; } + if (supportedLocales_ != nullptr) { return true; } + supportedLocales_ = new UVector(uprv_deleteUObject, nullptr, errorCode_); + if (U_FAILURE(errorCode_)) { return false; } + if (supportedLocales_ == nullptr) { + errorCode_ = U_MEMORY_ALLOCATION_ERROR; + return false; + } + return true; +} + +LocaleMatcher::Builder &LocaleMatcher::Builder::setSupportedLocalesFromListString( + StringPiece locales) { + LocalePriorityList list(locales, errorCode_); + if (U_FAILURE(errorCode_)) { return *this; } + clearSupportedLocales(); + if (!ensureSupportedLocaleVector()) { return *this; } + int32_t length = list.getLengthIncludingRemoved(); + for (int32_t i = 0; i < length; ++i) { + Locale *locale = list.orphanLocaleAt(i); + if (locale == nullptr) { continue; } + supportedLocales_->addElement(locale, errorCode_); + if (U_FAILURE(errorCode_)) { + delete locale; + break; + } + } + return *this; +} + +LocaleMatcher::Builder &LocaleMatcher::Builder::setSupportedLocales(Locale::Iterator &locales) { + if (U_FAILURE(errorCode_)) { return *this; } + clearSupportedLocales(); + if (!ensureSupportedLocaleVector()) { return *this; } + while (locales.hasNext()) { + const Locale &locale = locales.next(); + Locale *clone = locale.clone(); + if (clone == nullptr) { + errorCode_ = U_MEMORY_ALLOCATION_ERROR; + break; + } + supportedLocales_->addElement(clone, errorCode_); + if (U_FAILURE(errorCode_)) { + delete clone; + break; + } + } + return *this; +} + +LocaleMatcher::Builder &LocaleMatcher::Builder::addSupportedLocale(const Locale &locale) { + if (!ensureSupportedLocaleVector()) { return *this; } + Locale *clone = locale.clone(); + if (clone == nullptr) { + errorCode_ = U_MEMORY_ALLOCATION_ERROR; + return *this; + } + supportedLocales_->addElement(clone, errorCode_); + if (U_FAILURE(errorCode_)) { + delete clone; + } + return *this; +} + +LocaleMatcher::Builder &LocaleMatcher::Builder::setDefaultLocale(const Locale *defaultLocale) { + if (U_FAILURE(errorCode_)) { return *this; } + Locale *clone = nullptr; + if (defaultLocale != nullptr) { + clone = defaultLocale->clone(); + if (clone == nullptr) { + errorCode_ = U_MEMORY_ALLOCATION_ERROR; + return *this; + } + } + delete defaultLocale_; + defaultLocale_ = clone; + return *this; +} + +LocaleMatcher::Builder &LocaleMatcher::Builder::setFavorSubtag(ULocMatchFavorSubtag subtag) { + if (U_FAILURE(errorCode_)) { return *this; } + favor_ = subtag; + return *this; +} + +LocaleMatcher::Builder &LocaleMatcher::Builder::setDemotionPerDesiredLocale(ULocMatchDemotion demotion) { + if (U_FAILURE(errorCode_)) { return *this; } + demotion_ = demotion; + return *this; +} + +#if 0 +/** + * Internal only! + * + * @param thresholdDistance the thresholdDistance to set, with -1 = default + * @return this Builder object + * @internal + * @deprecated This API is ICU internal only. + */ +@Deprecated +LocaleMatcher::Builder &LocaleMatcher::Builder::internalSetThresholdDistance(int32_t thresholdDistance) { + if (U_FAILURE(errorCode_)) { return *this; } + if (thresholdDistance > 100) { + thresholdDistance = 100; + } + thresholdDistance_ = thresholdDistance; + return *this; +} +#endif + +UBool LocaleMatcher::Builder::copyErrorTo(UErrorCode &outErrorCode) const { + if (U_FAILURE(outErrorCode)) { return TRUE; } + if (U_SUCCESS(errorCode_)) { return FALSE; } + outErrorCode = errorCode_; + return TRUE; +} + +LocaleMatcher LocaleMatcher::Builder::build(UErrorCode &errorCode) const { + if (U_SUCCESS(errorCode) && U_FAILURE(errorCode_)) { + errorCode = errorCode_; + } + return LocaleMatcher(*this, errorCode); +} + +namespace { + +LSR getMaximalLsrOrUnd(const XLikelySubtags &likelySubtags, const Locale &locale, + UErrorCode &errorCode) { + if (U_FAILURE(errorCode) || locale.isBogus() || *locale.getName() == 0 /* "und" */) { + return UND_LSR; + } else { + return likelySubtags.makeMaximizedLsrFrom(locale, errorCode); + } +} + +int32_t hashLSR(const UHashTok token) { + const LSR *lsr = static_cast(token.pointer); + return lsr->hashCode; +} + +UBool compareLSRs(const UHashTok t1, const UHashTok t2) { + const LSR *lsr1 = static_cast(t1.pointer); + const LSR *lsr2 = static_cast(t2.pointer); + return *lsr1 == *lsr2; +} + +bool putIfAbsent(UHashtable *lsrToIndex, const LSR &lsr, int32_t i, UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return false; } + U_ASSERT(i > 0); + int32_t index = uhash_geti(lsrToIndex, &lsr); + if (index != 0) { + return false; + } else { + uhash_puti(lsrToIndex, const_cast(&lsr), i, &errorCode); + return U_SUCCESS(errorCode); + } +} + +} // namespace + +LocaleMatcher::LocaleMatcher(const Builder &builder, UErrorCode &errorCode) : + likelySubtags(*XLikelySubtags::getSingleton(errorCode)), + localeDistance(*LocaleDistance::getSingleton(errorCode)), + thresholdDistance(builder.thresholdDistance_), + demotionPerDesiredLocale(0), + favorSubtag(builder.favor_), + supportedLocales(nullptr), lsrs(nullptr), supportedLocalesLength(0), + supportedLsrToIndex(nullptr), + supportedLSRs(nullptr), supportedIndexes(nullptr), supportedLSRsLength(0), + ownedDefaultLocale(nullptr), defaultLocale(nullptr), defaultLocaleIndex(-1) { + if (U_FAILURE(errorCode)) { return; } + if (thresholdDistance < 0) { + thresholdDistance = localeDistance.getDefaultScriptDistance(); + } + supportedLocalesLength = builder.supportedLocales_ != nullptr ? + builder.supportedLocales_->size() : 0; + const Locale *def = builder.defaultLocale_; + int32_t idef = -1; + if (supportedLocalesLength > 0) { + // Store the supported locales in input order, + // so that when different types are used (e.g., language tag strings) + // we can return those by parallel index. + supportedLocales = static_cast( + uprv_malloc(supportedLocalesLength * sizeof(const Locale *))); + // Supported LRSs in input order. + // In C++, we store these permanently to simplify ownership management + // in the hash tables. Duplicate LSRs (if any) are unused overhead. + lsrs = new LSR[supportedLocalesLength]; + if (supportedLocales == nullptr || lsrs == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + // If the constructor fails partway, we need null pointers for destructibility. + uprv_memset(supportedLocales, 0, supportedLocalesLength * sizeof(const Locale *)); + // Also find the first supported locale whose LSR is + // the same as that for the default locale. + LSR builderDefaultLSR; + const LSR *defLSR = nullptr; + if (def != nullptr) { + builderDefaultLSR = getMaximalLsrOrUnd(likelySubtags, *def, errorCode); + if (U_FAILURE(errorCode)) { return; } + defLSR = &builderDefaultLSR; + } + for (int32_t i = 0; i < supportedLocalesLength; ++i) { + const Locale &locale = *static_cast(builder.supportedLocales_->elementAt(i)); + supportedLocales[i] = locale.clone(); + if (supportedLocales[i] == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + const Locale &supportedLocale = *supportedLocales[i]; + LSR &lsr = lsrs[i] = getMaximalLsrOrUnd(likelySubtags, supportedLocale, errorCode); + lsr.setHashCode(); + if (U_FAILURE(errorCode)) { return; } + if (idef < 0 && defLSR != nullptr && lsr == *defLSR) { + idef = i; + defLSR = &lsr; // owned pointer to put into supportedLsrToIndex + if (*def == supportedLocale) { + def = &supportedLocale; // owned pointer to keep + } + } + } + + // We need an unordered map from LSR to first supported locale with that LSR, + // and an ordered list of (LSR, supported index). + // We insert the supported locales in the following order: + // 1. Default locale, if it is supported. + // 2. Priority locales (aka "paradigm locales") in builder order. + // 3. Remaining locales in builder order. + // In Java, we use a LinkedHashMap for both map & ordered lists. + // In C++, we use separate structures. + // We over-allocate arrays of LSRs and indexes for simplicity. + // We reserve slots at the array starts for the default and paradigm locales, + // plus enough for all supported locales. + // If there are few paradigm locales and few duplicate supported LSRs, + // then the amount of wasted space is small. + supportedLsrToIndex = uhash_openSize(hashLSR, compareLSRs, uhash_compareLong, + supportedLocalesLength, &errorCode); + if (U_FAILURE(errorCode)) { return; } + int32_t paradigmLimit = 1 + localeDistance.getParadigmLSRsLength(); + int32_t suppLSRsCapacity = paradigmLimit + supportedLocalesLength; + supportedLSRs = static_cast( + uprv_malloc(suppLSRsCapacity * sizeof(const LSR *))); + supportedIndexes = static_cast( + uprv_malloc(suppLSRsCapacity * sizeof(int32_t))); + if (supportedLSRs == nullptr || supportedIndexes == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + int32_t paradigmIndex = 0; + int32_t otherIndex = paradigmLimit; + if (idef >= 0) { + uhash_puti(supportedLsrToIndex, const_cast(defLSR), idef + 1, &errorCode); + supportedLSRs[0] = defLSR; + supportedIndexes[0] = idef; + paradigmIndex = 1; + } + for (int32_t i = 0; i < supportedLocalesLength; ++i) { + if (i == idef) { continue; } + const Locale &locale = *supportedLocales[i]; + const LSR &lsr = lsrs[i]; + if (defLSR == nullptr) { + U_ASSERT(i == 0); + def = &locale; + defLSR = &lsr; + idef = 0; + uhash_puti(supportedLsrToIndex, const_cast(&lsr), 0 + 1, &errorCode); + supportedLSRs[0] = &lsr; + supportedIndexes[0] = 0; + paradigmIndex = 1; + } else if (idef >= 0 && lsr == *defLSR) { + // lsr == *defLSR means that this supported locale is + // a duplicate of the default locale. + // Either an explicit default locale is supported, and we added it before the loop, + // or there is no explicit default locale, and this is + // a duplicate of the first supported locale. + // In both cases, idef >= 0 now, so otherwise we can skip the comparison. + // For a duplicate, putIfAbsent() is a no-op, so nothing to do. + } else { + if (putIfAbsent(supportedLsrToIndex, lsr, i + 1, errorCode)) { + if (localeDistance.isParadigmLSR(lsr)) { + supportedLSRs[paradigmIndex] = &lsr; + supportedIndexes[paradigmIndex++] = i; + } else { + supportedLSRs[otherIndex] = &lsr; + supportedIndexes[otherIndex++] = i; + } + } + } + if (U_FAILURE(errorCode)) { return; } + } + // Squeeze out unused array slots. + if (paradigmIndex < paradigmLimit && paradigmLimit < otherIndex) { + uprv_memmove(supportedLSRs + paradigmIndex, supportedLSRs + paradigmLimit, + (otherIndex - paradigmLimit) * sizeof(const LSR *)); + uprv_memmove(supportedIndexes + paradigmIndex, supportedIndexes + paradigmLimit, + (otherIndex - paradigmLimit) * sizeof(int32_t)); + } + supportedLSRsLength = otherIndex - (paradigmLimit - paradigmIndex); + } + + if (def != nullptr && (idef < 0 || def != supportedLocales[idef])) { + ownedDefaultLocale = def->clone(); + if (ownedDefaultLocale == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + def = ownedDefaultLocale; + } + defaultLocale = def; + defaultLocaleIndex = idef; + + if (builder.demotion_ == ULOCMATCH_DEMOTION_REGION) { + demotionPerDesiredLocale = localeDistance.getDefaultDemotionPerDesiredLocale(); + } +} + +LocaleMatcher::LocaleMatcher(LocaleMatcher &&src) U_NOEXCEPT : + likelySubtags(src.likelySubtags), + localeDistance(src.localeDistance), + thresholdDistance(src.thresholdDistance), + demotionPerDesiredLocale(src.demotionPerDesiredLocale), + favorSubtag(src.favorSubtag), + supportedLocales(src.supportedLocales), lsrs(src.lsrs), + supportedLocalesLength(src.supportedLocalesLength), + supportedLsrToIndex(src.supportedLsrToIndex), + supportedLSRs(src.supportedLSRs), + supportedIndexes(src.supportedIndexes), + supportedLSRsLength(src.supportedLSRsLength), + ownedDefaultLocale(src.ownedDefaultLocale), defaultLocale(src.defaultLocale), + defaultLocaleIndex(src.defaultLocaleIndex) { + src.supportedLocales = nullptr; + src.lsrs = nullptr; + src.supportedLocalesLength = 0; + src.supportedLsrToIndex = nullptr; + src.supportedLSRs = nullptr; + src.supportedIndexes = nullptr; + src.supportedLSRsLength = 0; + src.ownedDefaultLocale = nullptr; + src.defaultLocale = nullptr; + src.defaultLocaleIndex = -1; +} + +LocaleMatcher::~LocaleMatcher() { + for (int32_t i = 0; i < supportedLocalesLength; ++i) { + delete supportedLocales[i]; + } + uprv_free(supportedLocales); + delete[] lsrs; + uhash_close(supportedLsrToIndex); + uprv_free(supportedLSRs); + uprv_free(supportedIndexes); + delete ownedDefaultLocale; +} + +LocaleMatcher &LocaleMatcher::operator=(LocaleMatcher &&src) U_NOEXCEPT { + this->~LocaleMatcher(); + + thresholdDistance = src.thresholdDistance; + demotionPerDesiredLocale = src.demotionPerDesiredLocale; + favorSubtag = src.favorSubtag; + supportedLocales = src.supportedLocales; + lsrs = src.lsrs; + supportedLocalesLength = src.supportedLocalesLength; + supportedLsrToIndex = src.supportedLsrToIndex; + supportedLSRs = src.supportedLSRs; + supportedIndexes = src.supportedIndexes; + supportedLSRsLength = src.supportedLSRsLength; + ownedDefaultLocale = src.ownedDefaultLocale; + defaultLocale = src.defaultLocale; + defaultLocaleIndex = src.defaultLocaleIndex; + + src.supportedLocales = nullptr; + src.lsrs = nullptr; + src.supportedLocalesLength = 0; + src.supportedLsrToIndex = nullptr; + src.supportedLSRs = nullptr; + src.supportedIndexes = nullptr; + src.supportedLSRsLength = 0; + src.ownedDefaultLocale = nullptr; + src.defaultLocale = nullptr; + src.defaultLocaleIndex = -1; + return *this; +} + +class LocaleLsrIterator { +public: + LocaleLsrIterator(const XLikelySubtags &likelySubtags, Locale::Iterator &locales, + ULocMatchLifetime lifetime) : + likelySubtags(likelySubtags), locales(locales), lifetime(lifetime) {} + + ~LocaleLsrIterator() { + if (lifetime == ULOCMATCH_TEMPORARY_LOCALES) { + delete remembered; + } + } + + bool hasNext() const { + return locales.hasNext(); + } + + LSR next(UErrorCode &errorCode) { + current = &locales.next(); + return getMaximalLsrOrUnd(likelySubtags, *current, errorCode); + } + + void rememberCurrent(int32_t desiredIndex, UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return; } + bestDesiredIndex = desiredIndex; + if (lifetime == ULOCMATCH_STORED_LOCALES) { + remembered = current; + } else { + // ULOCMATCH_TEMPORARY_LOCALES + delete remembered; + remembered = new Locale(*current); + if (remembered == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + } + } + } + + const Locale *orphanRemembered() { + const Locale *rem = remembered; + remembered = nullptr; + return rem; + } + + int32_t getBestDesiredIndex() const { + return bestDesiredIndex; + } + +private: + const XLikelySubtags &likelySubtags; + Locale::Iterator &locales; + ULocMatchLifetime lifetime; + const Locale *current = nullptr, *remembered = nullptr; + int32_t bestDesiredIndex = -1; +}; + +const Locale *LocaleMatcher::getBestMatch(const Locale &desiredLocale, UErrorCode &errorCode) const { + if (U_FAILURE(errorCode)) { return nullptr; } + int32_t suppIndex = getBestSuppIndex( + getMaximalLsrOrUnd(likelySubtags, desiredLocale, errorCode), + nullptr, errorCode); + return U_SUCCESS(errorCode) && suppIndex >= 0 ? supportedLocales[suppIndex] : defaultLocale; +} + +const Locale *LocaleMatcher::getBestMatch(Locale::Iterator &desiredLocales, + UErrorCode &errorCode) const { + if (U_FAILURE(errorCode)) { return nullptr; } + if (!desiredLocales.hasNext()) { + return defaultLocale; + } + LocaleLsrIterator lsrIter(likelySubtags, desiredLocales, ULOCMATCH_TEMPORARY_LOCALES); + int32_t suppIndex = getBestSuppIndex(lsrIter.next(errorCode), &lsrIter, errorCode); + return U_SUCCESS(errorCode) && suppIndex >= 0 ? supportedLocales[suppIndex] : defaultLocale; +} + +const Locale *LocaleMatcher::getBestMatchForListString( + StringPiece desiredLocaleList, UErrorCode &errorCode) const { + LocalePriorityList list(desiredLocaleList, errorCode); + LocalePriorityList::Iterator iter = list.iterator(); + return getBestMatch(iter, errorCode); +} + +LocaleMatcher::Result LocaleMatcher::getBestMatchResult( + const Locale &desiredLocale, UErrorCode &errorCode) const { + if (U_FAILURE(errorCode)) { + return Result(nullptr, defaultLocale, -1, defaultLocaleIndex, FALSE); + } + int32_t suppIndex = getBestSuppIndex( + getMaximalLsrOrUnd(likelySubtags, desiredLocale, errorCode), + nullptr, errorCode); + if (U_FAILURE(errorCode) || suppIndex < 0) { + return Result(nullptr, defaultLocale, -1, defaultLocaleIndex, FALSE); + } else { + return Result(&desiredLocale, supportedLocales[suppIndex], 0, suppIndex, FALSE); + } +} + +LocaleMatcher::Result LocaleMatcher::getBestMatchResult( + Locale::Iterator &desiredLocales, UErrorCode &errorCode) const { + if (U_FAILURE(errorCode) || !desiredLocales.hasNext()) { + return Result(nullptr, defaultLocale, -1, defaultLocaleIndex, FALSE); + } + LocaleLsrIterator lsrIter(likelySubtags, desiredLocales, ULOCMATCH_TEMPORARY_LOCALES); + int32_t suppIndex = getBestSuppIndex(lsrIter.next(errorCode), &lsrIter, errorCode); + if (U_FAILURE(errorCode) || suppIndex < 0) { + return Result(nullptr, defaultLocale, -1, defaultLocaleIndex, FALSE); + } else { + return Result(lsrIter.orphanRemembered(), supportedLocales[suppIndex], + lsrIter.getBestDesiredIndex(), suppIndex, TRUE); + } +} + +int32_t LocaleMatcher::getBestSuppIndex(LSR desiredLSR, LocaleLsrIterator *remainingIter, + UErrorCode &errorCode) const { + if (U_FAILURE(errorCode)) { return -1; } + int32_t desiredIndex = 0; + int32_t bestSupportedLsrIndex = -1; + for (int32_t bestDistance = thresholdDistance;;) { + // Quick check for exact maximized LSR. + // Returns suppIndex+1 where 0 means not found. + if (supportedLsrToIndex != nullptr) { + desiredLSR.setHashCode(); + int32_t index = uhash_geti(supportedLsrToIndex, &desiredLSR); + if (index != 0) { + int32_t suppIndex = index - 1; + if (remainingIter != nullptr) { + remainingIter->rememberCurrent(desiredIndex, errorCode); + } + return suppIndex; + } + } + int32_t bestIndexAndDistance = localeDistance.getBestIndexAndDistance( + desiredLSR, supportedLSRs, supportedLSRsLength, bestDistance, favorSubtag); + if (bestIndexAndDistance >= 0) { + bestDistance = bestIndexAndDistance & 0xff; + if (remainingIter != nullptr) { + remainingIter->rememberCurrent(desiredIndex, errorCode); + if (U_FAILURE(errorCode)) { return -1; } + } + bestSupportedLsrIndex = bestIndexAndDistance >= 0 ? bestIndexAndDistance >> 8 : -1; + } + if ((bestDistance -= demotionPerDesiredLocale) <= 0) { + break; + } + if (remainingIter == nullptr || !remainingIter->hasNext()) { + break; + } + desiredLSR = remainingIter->next(errorCode); + if (U_FAILURE(errorCode)) { return -1; } + ++desiredIndex; + } + if (bestSupportedLsrIndex < 0) { + // no good match + return -1; + } + return supportedIndexes[bestSupportedLsrIndex]; +} + +double LocaleMatcher::internalMatch(const Locale &desired, const Locale &supported, UErrorCode &errorCode) const { + // Returns the inverse of the distance: That is, 1-distance(desired, supported). + LSR suppLSR = getMaximalLsrOrUnd(likelySubtags, supported, errorCode); + if (U_FAILURE(errorCode)) { return 0; } + const LSR *pSuppLSR = &suppLSR; + int32_t distance = localeDistance.getBestIndexAndDistance( + getMaximalLsrOrUnd(likelySubtags, desired, errorCode), + &pSuppLSR, 1, + thresholdDistance, favorSubtag) & 0xff; + return (100 - distance) / 100.0; +} + +U_NAMESPACE_END + +#endif // __LOCMATCHER_H__ diff --git a/deps/icu-small/source/common/localeprioritylist.cpp b/deps/icu-small/source/common/localeprioritylist.cpp new file mode 100644 index 00000000000000..06442fb46a83ad --- /dev/null +++ b/deps/icu-small/source/common/localeprioritylist.cpp @@ -0,0 +1,239 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// localeprioritylist.cpp +// created: 2019jul11 Markus W. Scherer + +#include "unicode/utypes.h" +#include "unicode/localpointer.h" +#include "unicode/locid.h" +#include "unicode/stringpiece.h" +#include "unicode/uobject.h" +#include "charstr.h" +#include "cmemory.h" +#include "localeprioritylist.h" +#include "uarrsort.h" +#include "uassert.h" +#include "uhash.h" + +U_NAMESPACE_BEGIN + +namespace { + +int32_t hashLocale(const UHashTok token) { + auto *locale = static_cast(token.pointer); + return locale->hashCode(); +} + +UBool compareLocales(const UHashTok t1, const UHashTok t2) { + auto *l1 = static_cast(t1.pointer); + auto *l2 = static_cast(t2.pointer); + return *l1 == *l2; +} + +constexpr int32_t WEIGHT_ONE = 1000; + +struct LocaleAndWeight { + Locale *locale; + int32_t weight; // 0..1000 = 0.0..1.0 + int32_t index; // force stable sort + + int32_t compare(const LocaleAndWeight &other) const { + int32_t diff = other.weight - weight; // descending: other-this + if (diff != 0) { return diff; } + return index - other.index; + } +}; + +int32_t U_CALLCONV +compareLocaleAndWeight(const void * /*context*/, const void *left, const void *right) { + return static_cast(left)-> + compare(*static_cast(right)); +} + +const char *skipSpaces(const char *p, const char *limit) { + while (p < limit && *p == ' ') { ++p; } + return p; +} + +int32_t findTagLength(const char *p, const char *limit) { + // Look for accept-language delimiters. + // Leave other validation up to the Locale constructor. + const char *q; + for (q = p; q < limit; ++q) { + char c = *q; + if (c == ' ' || c == ',' || c == ';') { break; } + } + return static_cast(q - p); +} + +/** + * Parses and returns a qvalue weight in millis. + * Advances p to after the parsed substring. + * Returns a negative value if parsing fails. + */ +int32_t parseWeight(const char *&p, const char *limit) { + p = skipSpaces(p, limit); + char c; + if (p == limit || ((c = *p) != '0' && c != '1')) { return -1; } + int32_t weight = (c - '0') * 1000; + if (++p == limit || *p != '.') { return weight; } + int32_t multiplier = 100; + while (++p != limit && '0' <= (c = *p) && c <= '9') { + c -= '0'; + if (multiplier > 0) { + weight += c * multiplier; + multiplier /= 10; + } else if (multiplier == 0) { + // round up + if (c >= 5) { ++weight; } + multiplier = -1; + } // else ignore further fraction digits + } + return weight <= WEIGHT_ONE ? weight : -1; // bad if > 1.0 +} + +} // namespace + +/** + * Nothing but a wrapper over a MaybeStackArray of LocaleAndWeight. + * + * This wrapper exists (and is not in an anonymous namespace) + * so that we can forward-declare it in the header file and + * don't have to expose the MaybeStackArray specialization and + * the LocaleAndWeight to code (like the test) that #includes localeprioritylist.h. + * Also, otherwise we would have to do a platform-specific + * template export declaration of some kind for the MaybeStackArray specialization + * to be properly exported from the common DLL. + */ +struct LocaleAndWeightArray : public UMemory { + MaybeStackArray array; +}; + +LocalePriorityList::LocalePriorityList(StringPiece s, UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return; } + list = new LocaleAndWeightArray(); + if (list == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + const char *p = s.data(); + const char *limit = p + s.length(); + while ((p = skipSpaces(p, limit)) != limit) { + if (*p == ',') { // empty range field + ++p; + continue; + } + int32_t tagLength = findTagLength(p, limit); + if (tagLength == 0) { + errorCode = U_ILLEGAL_ARGUMENT_ERROR; + return; + } + CharString tag(p, tagLength, errorCode); + if (U_FAILURE(errorCode)) { return; } + Locale locale = Locale(tag.data()); + if (locale.isBogus()) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + int32_t weight = WEIGHT_ONE; + if ((p = skipSpaces(p + tagLength, limit)) != limit && *p == ';') { + if ((p = skipSpaces(p + 1, limit)) == limit || *p != 'q' || + (p = skipSpaces(p + 1, limit)) == limit || *p != '=' || + (++p, (weight = parseWeight(p, limit)) < 0)) { + errorCode = U_ILLEGAL_ARGUMENT_ERROR; + return; + } + p = skipSpaces(p, limit); + } + if (p != limit && *p != ',') { // trailing junk + errorCode = U_ILLEGAL_ARGUMENT_ERROR; + return; + } + add(locale, weight, errorCode); + if (p == limit) { break; } + ++p; + } + sort(errorCode); +} + +LocalePriorityList::~LocalePriorityList() { + if (list != nullptr) { + for (int32_t i = 0; i < listLength; ++i) { + delete list->array[i].locale; + } + delete list; + } + uhash_close(map); +} + +const Locale *LocalePriorityList::localeAt(int32_t i) const { + return list->array[i].locale; +} + +Locale *LocalePriorityList::orphanLocaleAt(int32_t i) { + if (list == nullptr) { return nullptr; } + LocaleAndWeight &lw = list->array[i]; + Locale *l = lw.locale; + lw.locale = nullptr; + return l; +} + +bool LocalePriorityList::add(const Locale &locale, int32_t weight, UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return false; } + if (map == nullptr) { + if (weight <= 0) { return true; } // do not add q=0 + map = uhash_open(hashLocale, compareLocales, uhash_compareLong, &errorCode); + if (U_FAILURE(errorCode)) { return false; } + } + LocalPointer clone; + int32_t index = uhash_geti(map, &locale); + if (index != 0) { + // Duplicate: Remove the old item and append it anew. + LocaleAndWeight &lw = list->array[index - 1]; + clone.adoptInstead(lw.locale); + lw.locale = nullptr; + lw.weight = 0; + ++numRemoved; + } + if (weight <= 0) { // do not add q=0 + if (index != 0) { + // Not strictly necessary but cleaner. + uhash_removei(map, &locale); + } + return true; + } + if (clone.isNull()) { + clone.adoptInstead(locale.clone()); + if (clone.isNull() || (clone->isBogus() && !locale.isBogus())) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return false; + } + } + if (listLength == list->array.getCapacity()) { + int32_t newCapacity = listLength < 50 ? 100 : 4 * listLength; + if (list->array.resize(newCapacity, listLength) == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return false; + } + } + uhash_puti(map, clone.getAlias(), listLength + 1, &errorCode); + if (U_FAILURE(errorCode)) { return false; } + LocaleAndWeight &lw = list->array[listLength]; + lw.locale = clone.orphan(); + lw.weight = weight; + lw.index = listLength++; + if (weight < WEIGHT_ONE) { hasWeights = true; } + U_ASSERT(uhash_count(map) == getLength()); + return true; +} + +void LocalePriorityList::sort(UErrorCode &errorCode) { + // Sort by descending weights if there is a mix of weights. + // The comparator forces a stable sort via the item index. + if (U_FAILURE(errorCode) || getLength() <= 1 || !hasWeights) { return; } + uprv_sortArray(list->array.getAlias(), listLength, sizeof(LocaleAndWeight), + compareLocaleAndWeight, nullptr, FALSE, &errorCode); +} + +U_NAMESPACE_END diff --git a/deps/icu-small/source/common/localeprioritylist.h b/deps/icu-small/source/common/localeprioritylist.h new file mode 100644 index 00000000000000..80ca38a7b52892 --- /dev/null +++ b/deps/icu-small/source/common/localeprioritylist.h @@ -0,0 +1,115 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// localeprioritylist.h +// created: 2019jul11 Markus W. Scherer + +#ifndef __LOCALEPRIORITYLIST_H__ +#define __LOCALEPRIORITYLIST_H__ + +#include "unicode/utypes.h" +#include "unicode/locid.h" +#include "unicode/stringpiece.h" +#include "unicode/uobject.h" + +struct UHashtable; + +U_NAMESPACE_BEGIN + +struct LocaleAndWeightArray; + +/** + * Parses a list of locales from an accept-language string. + * We are a bit more lenient than the spec: + * We accept extra whitespace in more places, empty range fields, + * and any number of qvalue fraction digits. + * + * https://tools.ietf.org/html/rfc2616#section-14.4 + * 14.4 Accept-Language + * + * Accept-Language = "Accept-Language" ":" + * 1#( language-range [ ";" "q" "=" qvalue ] ) + * language-range = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" ) + * + * Each language-range MAY be given an associated quality value which + * represents an estimate of the user's preference for the languages + * specified by that range. The quality value defaults to "q=1". For + * example, + * + * Accept-Language: da, en-gb;q=0.8, en;q=0.7 + * + * https://tools.ietf.org/html/rfc2616#section-3.9 + * 3.9 Quality Values + * + * HTTP content negotiation (section 12) uses short "floating point" + * numbers to indicate the relative importance ("weight") of various + * negotiable parameters. A weight is normalized to a real number in + * the range 0 through 1, where 0 is the minimum and 1 the maximum + * value. If a parameter has a quality value of 0, then content with + * this parameter is `not acceptable' for the client. HTTP/1.1 + * applications MUST NOT generate more than three digits after the + * decimal point. User configuration of these values SHOULD also be + * limited in this fashion. + * + * qvalue = ( "0" [ "." 0*3DIGIT ] ) + * | ( "1" [ "." 0*3("0") ] ) + */ +class U_COMMON_API LocalePriorityList : public UMemory { +public: + class Iterator : public Locale::Iterator { + public: + UBool hasNext() const override { return count < length; } + + const Locale &next() override { + for(;;) { + const Locale *locale = list.localeAt(index++); + if (locale != nullptr) { + ++count; + return *locale; + } + } + } + + private: + friend class LocalePriorityList; + + Iterator(const LocalePriorityList &list) : list(list), length(list.getLength()) {} + + const LocalePriorityList &list; + int32_t index = 0; + int32_t count = 0; + const int32_t length; + }; + + LocalePriorityList(StringPiece s, UErrorCode &errorCode); + + ~LocalePriorityList(); + + int32_t getLength() const { return listLength - numRemoved; } + + int32_t getLengthIncludingRemoved() const { return listLength; } + + Iterator iterator() const { return Iterator(*this); } + + const Locale *localeAt(int32_t i) const; + + Locale *orphanLocaleAt(int32_t i); + +private: + LocalePriorityList(const LocalePriorityList &) = delete; + LocalePriorityList &operator=(const LocalePriorityList &) = delete; + + bool add(const Locale &locale, int32_t weight, UErrorCode &errorCode); + + void sort(UErrorCode &errorCode); + + LocaleAndWeightArray *list = nullptr; + int32_t listLength = 0; + int32_t numRemoved = 0; + bool hasWeights = false; // other than 1.0 + UHashtable *map = nullptr; +}; + +U_NAMESPACE_END + +#endif // __LOCALEPRIORITYLIST_H__ diff --git a/deps/icu-small/source/common/locavailable.cpp b/deps/icu-small/source/common/locavailable.cpp index 1e608ffb9e1c84..ad9d2ca8c7bb53 100644 --- a/deps/icu-small/source/common/locavailable.cpp +++ b/deps/icu-small/source/common/locavailable.cpp @@ -19,11 +19,13 @@ * that then do not depend on resource bundle code and res_index bundles. */ +#include "unicode/errorcode.h" #include "unicode/utypes.h" #include "unicode/locid.h" #include "unicode/uloc.h" #include "unicode/ures.h" #include "cmemory.h" +#include "cstring.h" #include "ucln_cmn.h" #include "uassert.h" #include "umutex.h" @@ -95,84 +97,174 @@ U_NAMESPACE_USE /* ### Constants **************************************************/ -/* These strings describe the resources we attempt to load from - the locale ResourceBundle data file.*/ -static const char _kIndexLocaleName[] = "res_index"; -static const char _kIndexTag[] = "InstalledLocales"; +namespace { -static char** _installedLocales = NULL; -static int32_t _installedLocalesCount = 0; -static icu::UInitOnce _installedLocalesInitOnce; +// Enough capacity for the two lists in the res_index.res file +const char** gAvailableLocaleNames[2] = {}; +int32_t gAvailableLocaleCounts[2] = {}; +icu::UInitOnce ginstalledLocalesInitOnce = U_INITONCE_INITIALIZER; -/* ### Get available **************************************************/ +class AvailableLocalesSink : public ResourceSink { + public: + void put(const char *key, ResourceValue &value, UBool /*noFallback*/, UErrorCode &status) U_OVERRIDE { + ResourceTable resIndexTable = value.getTable(status); + if (U_FAILURE(status)) { + return; + } + for (int32_t i = 0; resIndexTable.getKeyAndValue(i, key, value); ++i) { + ULocAvailableType type; + if (uprv_strcmp(key, "InstalledLocales") == 0) { + type = ULOC_AVAILABLE_DEFAULT; + } else if (uprv_strcmp(key, "AliasLocales") == 0) { + type = ULOC_AVAILABLE_ONLY_LEGACY_ALIASES; + } else { + // CLDRVersion, etc. + continue; + } + ResourceTable availableLocalesTable = value.getTable(status); + if (U_FAILURE(status)) { + return; + } + gAvailableLocaleCounts[type] = availableLocalesTable.getSize(); + gAvailableLocaleNames[type] = static_cast( + uprv_malloc(gAvailableLocaleCounts[type] * sizeof(const char*))); + if (gAvailableLocaleNames[type] == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return; + } + for (int32_t j = 0; availableLocalesTable.getKeyAndValue(j, key, value); ++j) { + gAvailableLocaleNames[type][j] = key; + } + } + } +}; -static UBool U_CALLCONV uloc_cleanup(void) { - char ** temp; +class AvailableLocalesStringEnumeration : public StringEnumeration { + public: + AvailableLocalesStringEnumeration(ULocAvailableType type) : fType(type) { + } + + const char* next(int32_t *resultLength, UErrorCode&) override { + ULocAvailableType actualType = fType; + int32_t actualIndex = fIndex++; + + // If the "combined" list was requested, resolve that now + if (fType == ULOC_AVAILABLE_WITH_LEGACY_ALIASES) { + int32_t defaultLocalesCount = gAvailableLocaleCounts[ULOC_AVAILABLE_DEFAULT]; + if (actualIndex < defaultLocalesCount) { + actualType = ULOC_AVAILABLE_DEFAULT; + } else { + actualIndex -= defaultLocalesCount; + actualType = ULOC_AVAILABLE_ONLY_LEGACY_ALIASES; + } + } + + // Return the requested string + int32_t count = gAvailableLocaleCounts[actualType]; + const char* result; + if (actualIndex < count) { + result = gAvailableLocaleNames[actualType][actualIndex]; + if (resultLength != nullptr) { + *resultLength = static_cast(uprv_strlen(result)); + } + } else { + result = nullptr; + if (resultLength != nullptr) { + *resultLength = 0; + } + } + return result; + } + + void reset(UErrorCode&) override { + fIndex = 0; + } + + int32_t count(UErrorCode&) const override { + if (fType == ULOC_AVAILABLE_WITH_LEGACY_ALIASES) { + return gAvailableLocaleCounts[ULOC_AVAILABLE_DEFAULT] + + gAvailableLocaleCounts[ULOC_AVAILABLE_ONLY_LEGACY_ALIASES]; + } else { + return gAvailableLocaleCounts[fType]; + } + } - if (_installedLocales) { - temp = _installedLocales; - _installedLocales = NULL; + private: + ULocAvailableType fType; + int32_t fIndex = 0; +}; - _installedLocalesCount = 0; - _installedLocalesInitOnce.reset(); +/* ### Get available **************************************************/ - uprv_free(temp); +static UBool U_CALLCONV uloc_cleanup(void) { + for (int32_t i = 0; i < UPRV_LENGTHOF(gAvailableLocaleNames); i++) { + uprv_free(gAvailableLocaleNames[i]); + gAvailableLocaleNames[i] = nullptr; + gAvailableLocaleCounts[i] = 0; } + ginstalledLocalesInitOnce.reset(); return TRUE; } // Load Installed Locales. This function will be called exactly once // via the initOnce mechanism. -static void U_CALLCONV loadInstalledLocales() { - UErrorCode status = U_ZERO_ERROR; - int32_t i = 0; - int32_t localeCount; - - U_ASSERT(_installedLocales == NULL); - U_ASSERT(_installedLocalesCount == 0); +static void U_CALLCONV loadInstalledLocales(UErrorCode& status) { + ucln_common_registerCleanup(UCLN_COMMON_ULOC, uloc_cleanup); - _installedLocalesCount = 0; + icu::LocalUResourceBundlePointer rb(ures_openDirect(NULL, "res_index", &status)); + AvailableLocalesSink sink; + ures_getAllItemsWithFallback(rb.getAlias(), "", sink, status); +} - icu::LocalUResourceBundlePointer indexLocale(ures_openDirect(NULL, _kIndexLocaleName, &status)); - icu::StackUResourceBundle installed; +void _load_installedLocales(UErrorCode& status) { + umtx_initOnce(ginstalledLocalesInitOnce, &loadInstalledLocales, status); +} - ures_getByKey(indexLocale.getAlias(), _kIndexTag, installed.getAlias(), &status); +} // namespace - if(U_SUCCESS(status)) { - localeCount = ures_getSize(installed.getAlias()); - _installedLocales = (char **) uprv_malloc(sizeof(char*) * (localeCount+1)); - if (_installedLocales != NULL) { - ures_resetIterator(installed.getAlias()); - while(ures_hasNext(installed.getAlias())) { - ures_getNextString(installed.getAlias(), NULL, (const char **)&_installedLocales[i++], &status); - } - _installedLocales[i] = NULL; - _installedLocalesCount = localeCount; - ucln_common_registerCleanup(UCLN_COMMON_ULOC, uloc_cleanup); - } +U_CAPI const char* U_EXPORT2 +uloc_getAvailable(int32_t offset) { + icu::ErrorCode status; + _load_installedLocales(status); + if (status.isFailure()) { + return nullptr; + } + if (offset > gAvailableLocaleCounts[0]) { + // *status = U_ILLEGAL_ARGUMENT_ERROR; + return nullptr; } + return gAvailableLocaleNames[0][offset]; } -static void _load_installedLocales() -{ - umtx_initOnce(_installedLocalesInitOnce, &loadInstalledLocales); +U_CAPI int32_t U_EXPORT2 +uloc_countAvailable() { + icu::ErrorCode status; + _load_installedLocales(status); + if (status.isFailure()) { + return 0; + } + return gAvailableLocaleCounts[0]; } -U_CAPI const char* U_EXPORT2 -uloc_getAvailable(int32_t offset) -{ - - _load_installedLocales(); - - if (offset > _installedLocalesCount) - return NULL; - return _installedLocales[offset]; +U_CAPI UEnumeration* U_EXPORT2 +uloc_openAvailableByType(ULocAvailableType type, UErrorCode* status) { + if (U_FAILURE(*status)) { + return nullptr; + } + if (type < 0 || type >= ULOC_AVAILABLE_COUNT) { + *status = U_ILLEGAL_ARGUMENT_ERROR; + return nullptr; + } + _load_installedLocales(*status); + if (U_FAILURE(*status)) { + return nullptr; + } + LocalPointer result( + new AvailableLocalesStringEnumeration(type), *status); + if (U_FAILURE(*status)) { + return nullptr; + } + return uenum_openFromStringEnumeration(result.orphan(), status); } -U_CAPI int32_t U_EXPORT2 -uloc_countAvailable() -{ - _load_installedLocales(); - return _installedLocalesCount; -} diff --git a/deps/icu-small/source/common/locbased.h b/deps/icu-small/source/common/locbased.h index 6db6a41dc416df..9163bd11cfe65f 100644 --- a/deps/icu-small/source/common/locbased.h +++ b/deps/icu-small/source/common/locbased.h @@ -22,7 +22,7 @@ * `actualLocale' of size ULOC_FULLNAME_CAPACITY */ #define U_LOCALE_BASED(varname, objname) \ - LocaleBased varname((objname).validLocale, (objname).actualLocale); + LocaleBased varname((objname).validLocale, (objname).actualLocale) U_NAMESPACE_BEGIN diff --git a/deps/icu-small/source/common/locdistance.cpp b/deps/icu-small/source/common/locdistance.cpp new file mode 100644 index 00000000000000..800d0eacf2b605 --- /dev/null +++ b/deps/icu-small/source/common/locdistance.cpp @@ -0,0 +1,364 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// locdistance.cpp +// created: 2019may08 Markus W. Scherer + +#include "unicode/utypes.h" +#include "unicode/bytestrie.h" +#include "unicode/localematcher.h" +#include "unicode/locid.h" +#include "unicode/uobject.h" +#include "unicode/ures.h" +#include "cstring.h" +#include "locdistance.h" +#include "loclikelysubtags.h" +#include "uassert.h" +#include "ucln_cmn.h" +#include "uinvchar.h" +#include "umutex.h" + +U_NAMESPACE_BEGIN + +namespace { + +/** + * Bit flag used on the last character of a subtag in the trie. + * Must be set consistently by the builder and the lookup code. + */ +constexpr int32_t END_OF_SUBTAG = 0x80; +/** Distance value bit flag, set by the builder. */ +constexpr int32_t DISTANCE_SKIP_SCRIPT = 0x80; +/** Distance value bit flag, set by trieNext(). */ +constexpr int32_t DISTANCE_IS_FINAL = 0x100; +constexpr int32_t DISTANCE_IS_FINAL_OR_SKIP_SCRIPT = DISTANCE_IS_FINAL | DISTANCE_SKIP_SCRIPT; + +constexpr int32_t ABOVE_THRESHOLD = 100; + +// Indexes into array of distances. +enum { + IX_DEF_LANG_DISTANCE, + IX_DEF_SCRIPT_DISTANCE, + IX_DEF_REGION_DISTANCE, + IX_MIN_REGION_DISTANCE, + IX_LIMIT +}; + +LocaleDistance *gLocaleDistance = nullptr; +UInitOnce gInitOnce = U_INITONCE_INITIALIZER; + +UBool U_CALLCONV cleanup() { + delete gLocaleDistance; + gLocaleDistance = nullptr; + gInitOnce.reset(); + return TRUE; +} + +} // namespace + +void U_CALLCONV LocaleDistance::initLocaleDistance(UErrorCode &errorCode) { + // This function is invoked only via umtx_initOnce(). + U_ASSERT(gLocaleDistance == nullptr); + const XLikelySubtags &likely = *XLikelySubtags::getSingleton(errorCode); + if (U_FAILURE(errorCode)) { return; } + const LocaleDistanceData &data = likely.getDistanceData(); + if (data.distanceTrieBytes == nullptr || + data.regionToPartitions == nullptr || data.partitions == nullptr || + // ok if no paradigms + data.distances == nullptr) { + errorCode = U_MISSING_RESOURCE_ERROR; + return; + } + gLocaleDistance = new LocaleDistance(data); + if (gLocaleDistance == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + ucln_common_registerCleanup(UCLN_COMMON_LOCALE_DISTANCE, cleanup); +} + +const LocaleDistance *LocaleDistance::getSingleton(UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return nullptr; } + umtx_initOnce(gInitOnce, &LocaleDistance::initLocaleDistance, errorCode); + return gLocaleDistance; +} + +LocaleDistance::LocaleDistance(const LocaleDistanceData &data) : + trie(data.distanceTrieBytes), + regionToPartitionsIndex(data.regionToPartitions), partitionArrays(data.partitions), + paradigmLSRs(data.paradigms), paradigmLSRsLength(data.paradigmsLength), + defaultLanguageDistance(data.distances[IX_DEF_LANG_DISTANCE]), + defaultScriptDistance(data.distances[IX_DEF_SCRIPT_DISTANCE]), + defaultRegionDistance(data.distances[IX_DEF_REGION_DISTANCE]), + minRegionDistance(data.distances[IX_MIN_REGION_DISTANCE]) { + // For the default demotion value, use the + // default region distance between unrelated Englishes. + // Thus, unless demotion is turned off, + // a mere region difference for one desired locale + // is as good as a perfect match for the next following desired locale. + // As of CLDR 36, we have . + LSR en("en", "Latn", "US"); + LSR enGB("en", "Latn", "GB"); + const LSR *p_enGB = &enGB; + defaultDemotionPerDesiredLocale = getBestIndexAndDistance(en, &p_enGB, 1, + 50, ULOCMATCH_FAVOR_LANGUAGE) & 0xff; +} + +int32_t LocaleDistance::getBestIndexAndDistance( + const LSR &desired, + const LSR **supportedLSRs, int32_t supportedLSRsLength, + int32_t threshold, ULocMatchFavorSubtag favorSubtag) const { + BytesTrie iter(trie); + // Look up the desired language only once for all supported LSRs. + // Its "distance" is either a match point value of 0, or a non-match negative value. + // Note: The data builder verifies that there are no <*, supported> or rules. + int32_t desLangDistance = trieNext(iter, desired.language, false); + uint64_t desLangState = desLangDistance >= 0 && supportedLSRsLength > 1 ? iter.getState64() : 0; + // Index of the supported LSR with the lowest distance. + int32_t bestIndex = -1; + for (int32_t slIndex = 0; slIndex < supportedLSRsLength; ++slIndex) { + const LSR &supported = *supportedLSRs[slIndex]; + bool star = false; + int32_t distance = desLangDistance; + if (distance >= 0) { + U_ASSERT((distance & DISTANCE_IS_FINAL) == 0); + if (slIndex != 0) { + iter.resetToState64(desLangState); + } + distance = trieNext(iter, supported.language, true); + } + // Note: The data builder verifies that there are no rules with "any" (*) language and + // real (non *) script or region subtags. + // This means that if the lookup for either language fails we can use + // the default distances without further lookups. + int32_t flags; + if (distance >= 0) { + flags = distance & DISTANCE_IS_FINAL_OR_SKIP_SCRIPT; + distance &= ~DISTANCE_IS_FINAL_OR_SKIP_SCRIPT; + } else { // <*, *> + if (uprv_strcmp(desired.language, supported.language) == 0) { + distance = 0; + } else { + distance = defaultLanguageDistance; + } + flags = 0; + star = true; + } + U_ASSERT(0 <= distance && distance <= 100); + // We implement "favor subtag" by reducing the language subtag distance + // (unscientifically reducing it to a quarter of the normal value), + // so that the script distance is relatively more important. + // For example, given a default language distance of 80, we reduce it to 20, + // which is below the default threshold of 50, which is the default script distance. + if (favorSubtag == ULOCMATCH_FAVOR_SCRIPT) { + distance >>= 2; + } + if (distance >= threshold) { + continue; + } + + int32_t scriptDistance; + if (star || flags != 0) { + if (uprv_strcmp(desired.script, supported.script) == 0) { + scriptDistance = 0; + } else { + scriptDistance = defaultScriptDistance; + } + } else { + scriptDistance = getDesSuppScriptDistance(iter, iter.getState64(), + desired.script, supported.script); + flags = scriptDistance & DISTANCE_IS_FINAL; + scriptDistance &= ~DISTANCE_IS_FINAL; + } + distance += scriptDistance; + if (distance >= threshold) { + continue; + } + + if (uprv_strcmp(desired.region, supported.region) == 0) { + // regionDistance = 0 + } else if (star || (flags & DISTANCE_IS_FINAL) != 0) { + distance += defaultRegionDistance; + } else { + int32_t remainingThreshold = threshold - distance; + if (minRegionDistance >= remainingThreshold) { + continue; + } + + // From here on we know the regions are not equal. + // Map each region to zero or more partitions. (zero = one non-matching string) + // (Each array of single-character partition strings is encoded as one string.) + // If either side has more than one, then we find the maximum distance. + // This could be optimized by adding some more structure, but probably not worth it. + distance += getRegionPartitionsDistance( + iter, iter.getState64(), + partitionsForRegion(desired), + partitionsForRegion(supported), + remainingThreshold); + } + if (distance < threshold) { + if (distance == 0) { + return slIndex << 8; + } + bestIndex = slIndex; + threshold = distance; + } + } + return bestIndex >= 0 ? (bestIndex << 8) | threshold : 0xffffff00 | ABOVE_THRESHOLD; +} + +int32_t LocaleDistance::getDesSuppScriptDistance( + BytesTrie &iter, uint64_t startState, const char *desired, const char *supported) { + // Note: The data builder verifies that there are no <*, supported> or rules. + int32_t distance = trieNext(iter, desired, false); + if (distance >= 0) { + distance = trieNext(iter, supported, true); + } + if (distance < 0) { + UStringTrieResult result = iter.resetToState64(startState).next(u'*'); // <*, *> + U_ASSERT(USTRINGTRIE_HAS_VALUE(result)); + if (uprv_strcmp(desired, supported) == 0) { + distance = 0; // same script + } else { + distance = iter.getValue(); + U_ASSERT(distance >= 0); + } + if (result == USTRINGTRIE_FINAL_VALUE) { + distance |= DISTANCE_IS_FINAL; + } + } + return distance; +} + +int32_t LocaleDistance::getRegionPartitionsDistance( + BytesTrie &iter, uint64_t startState, + const char *desiredPartitions, const char *supportedPartitions, int32_t threshold) { + char desired = *desiredPartitions++; + char supported = *supportedPartitions++; + U_ASSERT(desired != 0 && supported != 0); + // See if we have single desired/supported partitions, from NUL-terminated + // partition strings without explicit length. + bool suppLengthGt1 = *supportedPartitions != 0; // gt1: more than 1 character + // equivalent to: if (desLength == 1 && suppLength == 1) + if (*desiredPartitions == 0 && !suppLengthGt1) { + // Fastpath for single desired/supported partitions. + UStringTrieResult result = iter.next(uprv_invCharToAscii(desired) | END_OF_SUBTAG); + if (USTRINGTRIE_HAS_NEXT(result)) { + result = iter.next(uprv_invCharToAscii(supported) | END_OF_SUBTAG); + if (USTRINGTRIE_HAS_VALUE(result)) { + return iter.getValue(); + } + } + return getFallbackRegionDistance(iter, startState); + } + + const char *supportedStart = supportedPartitions - 1; // for restart of inner loop + int32_t regionDistance = 0; + // Fall back to * only once, not for each pair of partition strings. + bool star = false; + for (;;) { + // Look up each desired-partition string only once, + // not for each (desired, supported) pair. + UStringTrieResult result = iter.next(uprv_invCharToAscii(desired) | END_OF_SUBTAG); + if (USTRINGTRIE_HAS_NEXT(result)) { + uint64_t desState = suppLengthGt1 ? iter.getState64() : 0; + for (;;) { + result = iter.next(uprv_invCharToAscii(supported) | END_OF_SUBTAG); + int32_t d; + if (USTRINGTRIE_HAS_VALUE(result)) { + d = iter.getValue(); + } else if (star) { + d = 0; + } else { + d = getFallbackRegionDistance(iter, startState); + star = true; + } + if (d >= threshold) { + return d; + } else if (regionDistance < d) { + regionDistance = d; + } + if ((supported = *supportedPartitions++) != 0) { + iter.resetToState64(desState); + } else { + break; + } + } + } else if (!star) { + int32_t d = getFallbackRegionDistance(iter, startState); + if (d >= threshold) { + return d; + } else if (regionDistance < d) { + regionDistance = d; + } + star = true; + } + if ((desired = *desiredPartitions++) != 0) { + iter.resetToState64(startState); + supportedPartitions = supportedStart; + supported = *supportedPartitions++; + } else { + break; + } + } + return regionDistance; +} + +int32_t LocaleDistance::getFallbackRegionDistance(BytesTrie &iter, uint64_t startState) { +#if U_DEBUG + UStringTrieResult result = +#endif + iter.resetToState64(startState).next(u'*'); // <*, *> + U_ASSERT(USTRINGTRIE_HAS_VALUE(result)); + int32_t distance = iter.getValue(); + U_ASSERT(distance >= 0); + return distance; +} + +int32_t LocaleDistance::trieNext(BytesTrie &iter, const char *s, bool wantValue) { + uint8_t c; + if ((c = *s) == 0) { + return -1; // no empty subtags in the distance data + } + for (;;) { + c = uprv_invCharToAscii(c); + // EBCDIC: If *s is not an invariant character, + // then c is now 0 and will simply not match anything, which is harmless. + uint8_t next = *++s; + if (next != 0) { + if (!USTRINGTRIE_HAS_NEXT(iter.next(c))) { + return -1; + } + } else { + // last character of this subtag + UStringTrieResult result = iter.next(c | END_OF_SUBTAG); + if (wantValue) { + if (USTRINGTRIE_HAS_VALUE(result)) { + int32_t value = iter.getValue(); + if (result == USTRINGTRIE_FINAL_VALUE) { + value |= DISTANCE_IS_FINAL; + } + return value; + } + } else { + if (USTRINGTRIE_HAS_NEXT(result)) { + return 0; + } + } + return -1; + } + c = next; + } +} + +UBool LocaleDistance::isParadigmLSR(const LSR &lsr) const { + // Linear search for a very short list (length 6 as of 2019). + // If there are many paradigm LSRs we should use a hash set. + U_ASSERT(paradigmLSRsLength <= 15); + for (int32_t i = 0; i < paradigmLSRsLength; ++i) { + if (lsr == paradigmLSRs[i]) { return true; } + } + return false; +} + +U_NAMESPACE_END diff --git a/deps/icu-small/source/common/locdistance.h b/deps/icu-small/source/common/locdistance.h new file mode 100644 index 00000000000000..7439f51c56bf8c --- /dev/null +++ b/deps/icu-small/source/common/locdistance.h @@ -0,0 +1,109 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// locdistance.h +// created: 2019may08 Markus W. Scherer + +#ifndef __LOCDISTANCE_H__ +#define __LOCDISTANCE_H__ + +#include "unicode/utypes.h" +#include "unicode/bytestrie.h" +#include "unicode/localematcher.h" +#include "unicode/locid.h" +#include "unicode/uobject.h" +#include "lsr.h" + +U_NAMESPACE_BEGIN + +struct LocaleDistanceData; + +/** + * Offline-built data for LocaleMatcher. + * Mostly but not only the data for mapping locales to their maximized forms. + */ +class LocaleDistance final : public UMemory { +public: + static const LocaleDistance *getSingleton(UErrorCode &errorCode); + + /** + * Finds the supported LSR with the smallest distance from the desired one. + * Equivalent LSR subtags must be normalized into a canonical form. + * + *

Returns the index of the lowest-distance supported LSR in bits 31..8 + * (negative if none has a distance below the threshold), + * and its distance (0..ABOVE_THRESHOLD) in bits 7..0. + */ + int32_t getBestIndexAndDistance(const LSR &desired, + const LSR **supportedLSRs, int32_t supportedLSRsLength, + int32_t threshold, ULocMatchFavorSubtag favorSubtag) const; + + int32_t getParadigmLSRsLength() const { return paradigmLSRsLength; } + + UBool isParadigmLSR(const LSR &lsr) const; + + int32_t getDefaultScriptDistance() const { + return defaultScriptDistance; + } + + int32_t getDefaultDemotionPerDesiredLocale() const { + return defaultDemotionPerDesiredLocale; + } + +private: + LocaleDistance(const LocaleDistanceData &data); + LocaleDistance(const LocaleDistance &other) = delete; + LocaleDistance &operator=(const LocaleDistance &other) = delete; + + static void initLocaleDistance(UErrorCode &errorCode); + + static int32_t getDesSuppScriptDistance(BytesTrie &iter, uint64_t startState, + const char *desired, const char *supported); + + static int32_t getRegionPartitionsDistance( + BytesTrie &iter, uint64_t startState, + const char *desiredPartitions, const char *supportedPartitions, + int32_t threshold); + + static int32_t getFallbackRegionDistance(BytesTrie &iter, uint64_t startState); + + static int32_t trieNext(BytesTrie &iter, const char *s, bool wantValue); + + const char *partitionsForRegion(const LSR &lsr) const { + // ill-formed region -> one non-matching string + int32_t pIndex = regionToPartitionsIndex[lsr.regionIndex]; + return partitionArrays[pIndex]; + } + + int32_t getDefaultRegionDistance() const { + return defaultRegionDistance; + } + + // The trie maps each dlang+slang+dscript+sscript+dregion+sregion + // (encoded in ASCII with bit 7 set on the last character of each subtag) to a distance. + // There is also a trie value for each subsequence of whole subtags. + // One '*' is used for a (desired, supported) pair of "und", "Zzzz"/"", or "ZZ"/"". + BytesTrie trie; + + /** + * Maps each region to zero or more single-character partitions. + */ + const uint8_t *regionToPartitionsIndex; + const char **partitionArrays; + + /** + * Used to get the paradigm region for a cluster, if there is one. + */ + const LSR *paradigmLSRs; + int32_t paradigmLSRsLength; + + int32_t defaultLanguageDistance; + int32_t defaultScriptDistance; + int32_t defaultRegionDistance; + int32_t minRegionDistance; + int32_t defaultDemotionPerDesiredLocale; +}; + +U_NAMESPACE_END + +#endif // __LOCDISTANCE_H__ diff --git a/deps/icu-small/source/common/locdspnm.cpp b/deps/icu-small/source/common/locdspnm.cpp index da35be9e766e50..43334f51964622 100644 --- a/deps/icu-small/source/common/locdspnm.cpp +++ b/deps/icu-small/source/common/locdspnm.cpp @@ -291,6 +291,7 @@ class LocaleDisplayNamesImpl : public LocaleDisplayNames { UnicodeString formatCloseParen; UnicodeString formatReplaceCloseParen; UDisplayContext nameLength; + UDisplayContext substitute; // Constants for capitalization context usage types. enum CapContextUsage { @@ -337,7 +338,7 @@ class LocaleDisplayNamesImpl : public LocaleDisplayNames { UnicodeString& result) const; private: UnicodeString& localeIdName(const char* localeId, - UnicodeString& result) const; + UnicodeString& result, bool substitute) const; UnicodeString& appendWithSep(UnicodeString& buffer, const UnicodeString& src) const; UnicodeString& adjustForUsageAndContext(CapContextUsage usage, UnicodeString& result) const; UnicodeString& scriptDisplayName(const char* script, UnicodeString& result, UBool skipAdjust) const; @@ -359,6 +360,7 @@ LocaleDisplayNamesImpl::LocaleDisplayNamesImpl(const Locale& locale, , capitalizationContext(UDISPCTX_CAPITALIZATION_NONE) , capitalizationBrkIter(NULL) , nameLength(UDISPCTX_LENGTH_FULL) + , substitute(UDISPCTX_SUBSTITUTE) { initialize(); } @@ -371,6 +373,7 @@ LocaleDisplayNamesImpl::LocaleDisplayNamesImpl(const Locale& locale, , capitalizationContext(UDISPCTX_CAPITALIZATION_NONE) , capitalizationBrkIter(NULL) , nameLength(UDISPCTX_LENGTH_FULL) + , substitute(UDISPCTX_SUBSTITUTE) { while (length-- > 0) { UDisplayContext value = *contexts++; @@ -385,6 +388,9 @@ LocaleDisplayNamesImpl::LocaleDisplayNamesImpl(const Locale& locale, case UDISPCTX_TYPE_DISPLAY_LENGTH: nameLength = value; break; + case UDISPCTX_TYPE_SUBSTITUTE_HANDLING: + substitute = value; + break; default: break; } @@ -535,6 +541,8 @@ LocaleDisplayNamesImpl::getContext(UDisplayContextType type) const { return capitalizationContext; case UDISPCTX_TYPE_DISPLAY_LENGTH: return nameLength; + case UDISPCTX_TYPE_SUBSTITUTE_HANDLING: + return substitute; default: break; } @@ -549,7 +557,7 @@ LocaleDisplayNamesImpl::adjustForUsageAndContext(CapContextUsage usage, if ( result.length() > 0 && u_islower(result.char32At(0)) && capitalizationBrkIter!= NULL && ( capitalizationContext==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || fCapitalization[usage] ) ) { // note fCapitalization[usage] won't be set unless capitalizationContext is UI_LIST_OR_MENU or STANDALONE - static UMutex capitalizationBrkIterLock = U_MUTEX_INITIALIZER; + static UMutex capitalizationBrkIterLock; Mutex lock(&capitalizationBrkIterLock); result.toTitle(capitalizationBrkIter, locale, U_TITLECASE_NO_LOWERCASE | U_TITLECASE_NO_BREAK_ADJUSTMENT); } @@ -583,7 +591,7 @@ LocaleDisplayNamesImpl::localeDisplayName(const Locale& loc, do { // loop construct is so we can break early out of search if (hasScript && hasCountry) { ncat(buffer, ULOC_FULLNAME_CAPACITY, lang, "_", script, "_", country, (char *)0); - localeIdName(buffer, resultName); + localeIdName(buffer, resultName, false); if (!resultName.isBogus()) { hasScript = FALSE; hasCountry = FALSE; @@ -592,7 +600,7 @@ LocaleDisplayNamesImpl::localeDisplayName(const Locale& loc, } if (hasScript) { ncat(buffer, ULOC_FULLNAME_CAPACITY, lang, "_", script, (char *)0); - localeIdName(buffer, resultName); + localeIdName(buffer, resultName, false); if (!resultName.isBogus()) { hasScript = FALSE; break; @@ -600,7 +608,7 @@ LocaleDisplayNamesImpl::localeDisplayName(const Locale& loc, } if (hasCountry) { ncat(buffer, ULOC_FULLNAME_CAPACITY, lang, "_", country, (char*)0); - localeIdName(buffer, resultName); + localeIdName(buffer, resultName, false); if (!resultName.isBogus()) { hasCountry = FALSE; break; @@ -609,7 +617,11 @@ LocaleDisplayNamesImpl::localeDisplayName(const Locale& loc, } while (FALSE); } if (resultName.isBogus() || resultName.isEmpty()) { - localeIdName(lang, resultName); + localeIdName(lang, resultName, substitute == UDISPCTX_SUBSTITUTE); + if (resultName.isBogus()) { + result.setToBogus(); + return result; + } } UnicodeString resultRemainder; @@ -617,13 +629,28 @@ LocaleDisplayNamesImpl::localeDisplayName(const Locale& loc, UErrorCode status = U_ZERO_ERROR; if (hasScript) { - resultRemainder.append(scriptDisplayName(script, temp, TRUE)); + UnicodeString script_str = scriptDisplayName(script, temp, TRUE); + if (script_str.isBogus()) { + result.setToBogus(); + return result; + } + resultRemainder.append(script_str); } if (hasCountry) { - appendWithSep(resultRemainder, regionDisplayName(country, temp, TRUE)); + UnicodeString region_str = regionDisplayName(country, temp, TRUE); + if (region_str.isBogus()) { + result.setToBogus(); + return result; + } + appendWithSep(resultRemainder, region_str); } if (hasVariant) { - appendWithSep(resultRemainder, variantDisplayName(variant, temp, TRUE)); + UnicodeString variant_str = variantDisplayName(variant, temp, TRUE); + if (variant_str.isBogus()) { + result.setToBogus(); + return result; + } + appendWithSep(resultRemainder, variant_str); } resultRemainder.findAndReplace(formatOpenParen, formatReplaceOpenParen); resultRemainder.findAndReplace(formatCloseParen, formatReplaceCloseParen); @@ -689,14 +716,18 @@ LocaleDisplayNamesImpl::localeDisplayName(const char* localeId, // private UnicodeString& LocaleDisplayNamesImpl::localeIdName(const char* localeId, - UnicodeString& result) const { + UnicodeString& result, bool substitute) const { if (nameLength == UDISPCTX_LENGTH_SHORT) { langData.getNoFallback("Languages%short", localeId, result); if (!result.isBogus()) { return result; } } - return langData.getNoFallback("Languages", localeId, result); + if (substitute) { + return langData.get("Languages", localeId, result); + } else { + return langData.getNoFallback("Languages", localeId, result); + } } UnicodeString& @@ -706,12 +737,16 @@ LocaleDisplayNamesImpl::languageDisplayName(const char* lang, return result = UnicodeString(lang, -1, US_INV); } if (nameLength == UDISPCTX_LENGTH_SHORT) { - langData.get("Languages%short", lang, result); + langData.getNoFallback("Languages%short", lang, result); if (!result.isBogus()) { return adjustForUsageAndContext(kCapContextUsageLanguage, result); } } - langData.get("Languages", lang, result); + if (substitute == UDISPCTX_SUBSTITUTE) { + langData.get("Languages", lang, result); + } else { + langData.getNoFallback("Languages", lang, result); + } return adjustForUsageAndContext(kCapContextUsageLanguage, result); } @@ -720,12 +755,16 @@ LocaleDisplayNamesImpl::scriptDisplayName(const char* script, UnicodeString& result, UBool skipAdjust) const { if (nameLength == UDISPCTX_LENGTH_SHORT) { - langData.get("Scripts%short", script, result); + langData.getNoFallback("Scripts%short", script, result); if (!result.isBogus()) { return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageScript, result); } } - langData.get("Scripts", script, result); + if (substitute == UDISPCTX_SUBSTITUTE) { + langData.get("Scripts", script, result); + } else { + langData.getNoFallback("Scripts", script, result); + } return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageScript, result); } @@ -746,12 +785,16 @@ LocaleDisplayNamesImpl::regionDisplayName(const char* region, UnicodeString& result, UBool skipAdjust) const { if (nameLength == UDISPCTX_LENGTH_SHORT) { - regionData.get("Countries%short", region, result); + regionData.getNoFallback("Countries%short", region, result); if (!result.isBogus()) { return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageTerritory, result); } } - regionData.get("Countries", region, result); + if (substitute == UDISPCTX_SUBSTITUTE) { + regionData.get("Countries", region, result); + } else { + regionData.getNoFallback("Countries", region, result); + } return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageTerritory, result); } @@ -767,7 +810,11 @@ LocaleDisplayNamesImpl::variantDisplayName(const char* variant, UnicodeString& result, UBool skipAdjust) const { // don't have a resource for short variant names - langData.get("Variants", variant, result); + if (substitute == UDISPCTX_SUBSTITUTE) { + langData.get("Variants", variant, result); + } else { + langData.getNoFallback("Variants", variant, result); + } return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageVariant, result); } @@ -782,7 +829,11 @@ LocaleDisplayNamesImpl::keyDisplayName(const char* key, UnicodeString& result, UBool skipAdjust) const { // don't have a resource for short key names - langData.get("Keys", key, result); + if (substitute == UDISPCTX_SUBSTITUTE) { + langData.get("Keys", key, result); + } else { + langData.getNoFallback("Keys", key, result); + } return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageKey, result); } @@ -802,9 +853,8 @@ LocaleDisplayNamesImpl::keyValueDisplayName(const char* key, UErrorCode sts = U_ZERO_ERROR; UnicodeString ustrValue(value, -1, US_INV); int32_t len; - UBool isChoice = FALSE; const UChar *currencyName = ucurr_getName(ustrValue.getTerminatedBuffer(), - locale.getBaseName(), UCURR_LONG_NAME, &isChoice, &len, &sts); + locale.getBaseName(), UCURR_LONG_NAME, nullptr /* isChoiceFormat */, &len, &sts); if (U_FAILURE(sts)) { // Return the value as is on failure result = ustrValue; @@ -815,12 +865,16 @@ LocaleDisplayNamesImpl::keyValueDisplayName(const char* key, } if (nameLength == UDISPCTX_LENGTH_SHORT) { - langData.get("Types%short", key, value, result); + langData.getNoFallback("Types%short", key, value, result); if (!result.isBogus()) { return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageKeyValue, result); } } - langData.get("Types", key, value, result); + if (substitute == UDISPCTX_SUBSTITUTE) { + langData.get("Types", key, value, result); + } else { + langData.getNoFallback("Types", key, value, result); + } return skipAdjust? result: adjustForUsageAndContext(kCapContextUsageKeyValue, result); } diff --git a/deps/icu-small/source/common/locid.cpp b/deps/icu-small/source/common/locid.cpp index 06986b636adc31..c6d3f88fc3be07 100644 --- a/deps/icu-small/source/common/locid.cpp +++ b/deps/icu-small/source/common/locid.cpp @@ -38,19 +38,19 @@ #include "unicode/strenum.h" #include "unicode/stringpiece.h" #include "unicode/uloc.h" -#include "putilimp.h" -#include "mutex.h" -#include "umutex.h" -#include "uassert.h" + +#include "bytesinkutil.h" +#include "charstr.h" #include "cmemory.h" #include "cstring.h" +#include "mutex.h" +#include "putilimp.h" #include "uassert.h" +#include "ucln_cmn.h" #include "uhash.h" #include "ulocimp.h" -#include "ucln_cmn.h" +#include "umutex.h" #include "ustr_imp.h" -#include "charstr.h" -#include "bytesinkutil.h" U_CDECL_BEGIN static UBool U_CALLCONV locale_cleanup(void); @@ -62,10 +62,7 @@ static Locale *gLocaleCache = NULL; static UInitOnce gLocaleCacheInitOnce = U_INITONCE_INITIALIZER; // gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and gDefaultLocale. -static UMutex *gDefaultLocaleMutex() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gDefaultLocaleMutex; static UHashtable *gDefaultLocalesHashT = NULL; static Locale *gDefaultLocale = NULL; @@ -174,7 +171,7 @@ U_NAMESPACE_BEGIN Locale *locale_set_default_internal(const char *id, UErrorCode& status) { // Synchronize this entire function. - Mutex lock(gDefaultLocaleMutex()); + Mutex lock(&gDefaultLocaleMutex); UBool canonicalize = FALSE; @@ -711,7 +708,7 @@ const Locale& U_EXPORT2 Locale::getDefault() { { - Mutex lock(gDefaultLocaleMutex()); + Mutex lock(&gDefaultLocaleMutex); if (gDefaultLocale != NULL) { return *gDefaultLocale; } @@ -1399,5 +1396,7 @@ Locale::getBaseName() const { return baseName; } +Locale::Iterator::~Iterator() = default; + //eof U_NAMESPACE_END diff --git a/deps/icu-small/source/common/loclikely.cpp b/deps/icu-small/source/common/loclikely.cpp index 50cc2a65de0b2d..3b71708e549d5f 100644 --- a/deps/icu-small/source/common/loclikely.cpp +++ b/deps/icu-small/source/common/loclikely.cpp @@ -807,24 +807,24 @@ createLikelySubtagsString( return FALSE; } -#define CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength) \ - { int32_t count = 0; \ - int32_t i; \ - for (i = 0; i < trailingLength; i++) { \ - if (trailing[i] == '-' || trailing[i] == '_') { \ - count = 0; \ - if (count > 8) { \ - goto error; \ - } \ - } else if (trailing[i] == '@') { \ - break; \ - } else if (count > 8) { \ +#define CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength) UPRV_BLOCK_MACRO_BEGIN { \ + int32_t count = 0; \ + int32_t i; \ + for (i = 0; i < trailingLength; i++) { \ + if (trailing[i] == '-' || trailing[i] == '_') { \ + count = 0; \ + if (count > 8) { \ goto error; \ - } else { \ - count++; \ } \ + } else if (trailing[i] == '@') { \ + break; \ + } else if (count > 8) { \ + goto error; \ + } else { \ + count++; \ } \ - } + } \ +} UPRV_BLOCK_MACRO_END static void _uloc_addLikelySubtags(const char* localeID, diff --git a/deps/icu-small/source/common/loclikelysubtags.cpp b/deps/icu-small/source/common/loclikelysubtags.cpp new file mode 100644 index 00000000000000..d7f5e124c2c790 --- /dev/null +++ b/deps/icu-small/source/common/loclikelysubtags.cpp @@ -0,0 +1,638 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// loclikelysubtags.cpp +// created: 2019may08 Markus W. Scherer + +#include +#include "unicode/utypes.h" +#include "unicode/bytestrie.h" +#include "unicode/localpointer.h" +#include "unicode/locid.h" +#include "unicode/uobject.h" +#include "unicode/ures.h" +#include "charstr.h" +#include "cstring.h" +#include "loclikelysubtags.h" +#include "lsr.h" +#include "uassert.h" +#include "ucln_cmn.h" +#include "uhash.h" +#include "uinvchar.h" +#include "umutex.h" +#include "uresdata.h" +#include "uresimp.h" + +U_NAMESPACE_BEGIN + +namespace { + +constexpr char PSEUDO_ACCENTS_PREFIX = '\''; // -XA, -PSACCENT +constexpr char PSEUDO_BIDI_PREFIX = '+'; // -XB, -PSBIDI +constexpr char PSEUDO_CRACKED_PREFIX = ','; // -XC, -PSCRACK + +/** + * Stores NUL-terminated strings with duplicate elimination. + * Checks for unique UTF-16 string pointers and converts to invariant characters. + */ +class UniqueCharStrings { +public: + UniqueCharStrings(UErrorCode &errorCode) : strings(nullptr) { + uhash_init(&map, uhash_hashUChars, uhash_compareUChars, uhash_compareLong, &errorCode); + if (U_FAILURE(errorCode)) { return; } + strings = new CharString(); + if (strings == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + } + } + ~UniqueCharStrings() { + uhash_close(&map); + delete strings; + } + + /** Returns/orphans the CharString that contains all strings. */ + CharString *orphanCharStrings() { + CharString *result = strings; + strings = nullptr; + return result; + } + + /** Adds a string and returns a unique number for it. */ + int32_t add(const UnicodeString &s, UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return 0; } + if (isFrozen) { + errorCode = U_NO_WRITE_PERMISSION; + return 0; + } + // The string points into the resource bundle. + const char16_t *p = s.getBuffer(); + int32_t oldIndex = uhash_geti(&map, p); + if (oldIndex != 0) { // found duplicate + return oldIndex; + } + // Explicit NUL terminator for the previous string. + // The strings object is also terminated with one implicit NUL. + strings->append(0, errorCode); + int32_t newIndex = strings->length(); + strings->appendInvariantChars(s, errorCode); + uhash_puti(&map, const_cast(p), newIndex, &errorCode); + return newIndex; + } + + void freeze() { isFrozen = true; } + + /** + * Returns a string pointer for its unique number, if this object is frozen. + * Otherwise nullptr. + */ + const char *get(int32_t i) const { + U_ASSERT(isFrozen); + return isFrozen && i > 0 ? strings->data() + i : nullptr; + } + +private: + UHashtable map; + CharString *strings; + bool isFrozen = false; +}; + +} // namespace + +LocaleDistanceData::LocaleDistanceData(LocaleDistanceData &&data) : + distanceTrieBytes(data.distanceTrieBytes), + regionToPartitions(data.regionToPartitions), + partitions(data.partitions), + paradigms(data.paradigms), paradigmsLength(data.paradigmsLength), + distances(data.distances) { + data.partitions = nullptr; + data.paradigms = nullptr; +} + +LocaleDistanceData::~LocaleDistanceData() { + uprv_free(partitions); + delete[] paradigms; +} + +// TODO(ICU-20777): Rename to just LikelySubtagsData. +struct XLikelySubtagsData { + UResourceBundle *langInfoBundle = nullptr; + UniqueCharStrings strings; + CharStringMap languageAliases; + CharStringMap regionAliases; + const uint8_t *trieBytes = nullptr; + LSR *lsrs = nullptr; + int32_t lsrsLength = 0; + + LocaleDistanceData distanceData; + + XLikelySubtagsData(UErrorCode &errorCode) : strings(errorCode) {} + + ~XLikelySubtagsData() { + ures_close(langInfoBundle); + delete[] lsrs; + } + + void load(UErrorCode &errorCode) { + langInfoBundle = ures_openDirect(nullptr, "langInfo", &errorCode); + if (U_FAILURE(errorCode)) { return; } + StackUResourceBundle stackTempBundle; + ResourceDataValue value; + ures_getValueWithFallback(langInfoBundle, "likely", stackTempBundle.getAlias(), + value, errorCode); + ResourceTable likelyTable = value.getTable(errorCode); + if (U_FAILURE(errorCode)) { return; } + + // Read all strings in the resource bundle and convert them to invariant char *. + LocalMemory languageIndexes, regionIndexes, lsrSubtagIndexes; + int32_t languagesLength = 0, regionsLength = 0, lsrSubtagsLength = 0; + if (!readStrings(likelyTable, "languageAliases", value, + languageIndexes, languagesLength, errorCode) || + !readStrings(likelyTable, "regionAliases", value, + regionIndexes, regionsLength, errorCode) || + !readStrings(likelyTable, "lsrs", value, + lsrSubtagIndexes,lsrSubtagsLength, errorCode)) { + return; + } + if ((languagesLength & 1) != 0 || + (regionsLength & 1) != 0 || + (lsrSubtagsLength % 3) != 0) { + errorCode = U_INVALID_FORMAT_ERROR; + return; + } + if (lsrSubtagsLength == 0) { + errorCode = U_MISSING_RESOURCE_ERROR; + return; + } + + if (!likelyTable.findValue("trie", value)) { + errorCode = U_MISSING_RESOURCE_ERROR; + return; + } + int32_t length; + trieBytes = value.getBinary(length, errorCode); + if (U_FAILURE(errorCode)) { return; } + + // Also read distance/matcher data if available, + // to open & keep only one resource bundle pointer + // and to use one single UniqueCharStrings. + UErrorCode matchErrorCode = U_ZERO_ERROR; + ures_getValueWithFallback(langInfoBundle, "match", stackTempBundle.getAlias(), + value, matchErrorCode); + LocalMemory partitionIndexes, paradigmSubtagIndexes; + int32_t partitionsLength = 0, paradigmSubtagsLength = 0; + if (U_SUCCESS(matchErrorCode)) { + ResourceTable matchTable = value.getTable(errorCode); + if (U_FAILURE(errorCode)) { return; } + + if (matchTable.findValue("trie", value)) { + distanceData.distanceTrieBytes = value.getBinary(length, errorCode); + if (U_FAILURE(errorCode)) { return; } + } + + if (matchTable.findValue("regionToPartitions", value)) { + distanceData.regionToPartitions = value.getBinary(length, errorCode); + if (U_FAILURE(errorCode)) { return; } + if (length < LSR::REGION_INDEX_LIMIT) { + errorCode = U_INVALID_FORMAT_ERROR; + return; + } + } + + if (!readStrings(matchTable, "partitions", value, + partitionIndexes, partitionsLength, errorCode) || + !readStrings(matchTable, "paradigms", value, + paradigmSubtagIndexes, paradigmSubtagsLength, errorCode)) { + return; + } + if ((paradigmSubtagsLength % 3) != 0) { + errorCode = U_INVALID_FORMAT_ERROR; + return; + } + + if (matchTable.findValue("distances", value)) { + distanceData.distances = value.getIntVector(length, errorCode); + if (U_FAILURE(errorCode)) { return; } + if (length < 4) { // LocaleDistance IX_LIMIT + errorCode = U_INVALID_FORMAT_ERROR; + return; + } + } + } else if (matchErrorCode == U_MISSING_RESOURCE_ERROR) { + // ok for likely subtags + } else { // error other than missing resource + errorCode = matchErrorCode; + return; + } + + // Fetch & store invariant-character versions of strings + // only after we have collected and de-duplicated all of them. + strings.freeze(); + + languageAliases = CharStringMap(languagesLength / 2, errorCode); + for (int32_t i = 0; i < languagesLength; i += 2) { + languageAliases.put(strings.get(languageIndexes[i]), + strings.get(languageIndexes[i + 1]), errorCode); + } + + regionAliases = CharStringMap(regionsLength / 2, errorCode); + for (int32_t i = 0; i < regionsLength; i += 2) { + regionAliases.put(strings.get(regionIndexes[i]), + strings.get(regionIndexes[i + 1]), errorCode); + } + if (U_FAILURE(errorCode)) { return; } + + lsrsLength = lsrSubtagsLength / 3; + lsrs = new LSR[lsrsLength]; + if (lsrs == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + for (int32_t i = 0, j = 0; i < lsrSubtagsLength; i += 3, ++j) { + lsrs[j] = LSR(strings.get(lsrSubtagIndexes[i]), + strings.get(lsrSubtagIndexes[i + 1]), + strings.get(lsrSubtagIndexes[i + 2])); + } + + if (partitionsLength > 0) { + distanceData.partitions = static_cast( + uprv_malloc(partitionsLength * sizeof(const char *))); + if (distanceData.partitions == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + for (int32_t i = 0; i < partitionsLength; ++i) { + distanceData.partitions[i] = strings.get(partitionIndexes[i]); + } + } + + if (paradigmSubtagsLength > 0) { + distanceData.paradigmsLength = paradigmSubtagsLength / 3; + LSR *paradigms = new LSR[distanceData.paradigmsLength]; + if (paradigms == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + for (int32_t i = 0, j = 0; i < paradigmSubtagsLength; i += 3, ++j) { + paradigms[j] = LSR(strings.get(paradigmSubtagIndexes[i]), + strings.get(paradigmSubtagIndexes[i + 1]), + strings.get(paradigmSubtagIndexes[i + 2])); + } + distanceData.paradigms = paradigms; + } + } + +private: + bool readStrings(const ResourceTable &table, const char *key, ResourceValue &value, + LocalMemory &indexes, int32_t &length, UErrorCode &errorCode) { + if (table.findValue(key, value)) { + ResourceArray stringArray = value.getArray(errorCode); + if (U_FAILURE(errorCode)) { return false; } + length = stringArray.getSize(); + if (length == 0) { return true; } + int32_t *rawIndexes = indexes.allocateInsteadAndCopy(length); + if (rawIndexes == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return false; + } + for (int i = 0; i < length; ++i) { + stringArray.getValue(i, value); // returns TRUE because i < length + rawIndexes[i] = strings.add(value.getUnicodeString(errorCode), errorCode); + if (U_FAILURE(errorCode)) { return false; } + } + } + return true; + } +}; + +namespace { + +XLikelySubtags *gLikelySubtags = nullptr; +UInitOnce gInitOnce = U_INITONCE_INITIALIZER; + +UBool U_CALLCONV cleanup() { + delete gLikelySubtags; + gLikelySubtags = nullptr; + gInitOnce.reset(); + return TRUE; +} + +} // namespace + +void U_CALLCONV XLikelySubtags::initLikelySubtags(UErrorCode &errorCode) { + // This function is invoked only via umtx_initOnce(). + U_ASSERT(gLikelySubtags == nullptr); + XLikelySubtagsData data(errorCode); + data.load(errorCode); + if (U_FAILURE(errorCode)) { return; } + gLikelySubtags = new XLikelySubtags(data); + if (gLikelySubtags == nullptr) { + errorCode = U_MEMORY_ALLOCATION_ERROR; + return; + } + ucln_common_registerCleanup(UCLN_COMMON_LIKELY_SUBTAGS, cleanup); +} + +const XLikelySubtags *XLikelySubtags::getSingleton(UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return nullptr; } + umtx_initOnce(gInitOnce, &XLikelySubtags::initLikelySubtags, errorCode); + return gLikelySubtags; +} + +XLikelySubtags::XLikelySubtags(XLikelySubtagsData &data) : + langInfoBundle(data.langInfoBundle), + strings(data.strings.orphanCharStrings()), + languageAliases(std::move(data.languageAliases)), + regionAliases(std::move(data.regionAliases)), + trie(data.trieBytes), + lsrs(data.lsrs), +#if U_DEBUG + lsrsLength(data.lsrsLength), +#endif + distanceData(std::move(data.distanceData)) { + data.langInfoBundle = nullptr; + data.lsrs = nullptr; + + // Cache the result of looking up language="und" encoded as "*", and "und-Zzzz" ("**"). + UStringTrieResult result = trie.next(u'*'); + U_ASSERT(USTRINGTRIE_HAS_NEXT(result)); + trieUndState = trie.getState64(); + result = trie.next(u'*'); + U_ASSERT(USTRINGTRIE_HAS_NEXT(result)); + trieUndZzzzState = trie.getState64(); + result = trie.next(u'*'); + U_ASSERT(USTRINGTRIE_HAS_VALUE(result)); + defaultLsrIndex = trie.getValue(); + trie.reset(); + + for (char16_t c = u'a'; c <= u'z'; ++c) { + result = trie.next(c); + if (result == USTRINGTRIE_NO_VALUE) { + trieFirstLetterStates[c - u'a'] = trie.getState64(); + } + trie.reset(); + } +} + +XLikelySubtags::~XLikelySubtags() { + ures_close(langInfoBundle); + delete strings; + delete[] lsrs; +} + +LSR XLikelySubtags::makeMaximizedLsrFrom(const Locale &locale, UErrorCode &errorCode) const { + const char *name = locale.getName(); + if (uprv_isAtSign(name[0]) && name[1] == 'x' && name[2] == '=') { // name.startsWith("@x=") + // Private use language tag x-subtag-subtag... + return LSR(name, "", ""); + } + return makeMaximizedLsr(locale.getLanguage(), locale.getScript(), locale.getCountry(), + locale.getVariant(), errorCode); +} + +namespace { + +const char *getCanonical(const CharStringMap &aliases, const char *alias) { + const char *canonical = aliases.get(alias); + return canonical == nullptr ? alias : canonical; +} + +} // namespace + +LSR XLikelySubtags::makeMaximizedLsr(const char *language, const char *script, const char *region, + const char *variant, UErrorCode &errorCode) const { + // Handle pseudolocales like en-XA, ar-XB, fr-PSCRACK. + // They should match only themselves, + // not other locales with what looks like the same language and script subtags. + char c1; + if (region[0] == 'X' && (c1 = region[1]) != 0 && region[2] == 0) { + switch (c1) { + case 'A': + return LSR(PSEUDO_ACCENTS_PREFIX, language, script, region, errorCode); + case 'B': + return LSR(PSEUDO_BIDI_PREFIX, language, script, region, errorCode); + case 'C': + return LSR(PSEUDO_CRACKED_PREFIX, language, script, region, errorCode); + default: // normal locale + break; + } + } + + if (variant[0] == 'P' && variant[1] == 'S') { + if (uprv_strcmp(variant, "PSACCENT") == 0) { + return LSR(PSEUDO_ACCENTS_PREFIX, language, script, + *region == 0 ? "XA" : region, errorCode); + } else if (uprv_strcmp(variant, "PSBIDI") == 0) { + return LSR(PSEUDO_BIDI_PREFIX, language, script, + *region == 0 ? "XB" : region, errorCode); + } else if (uprv_strcmp(variant, "PSCRACK") == 0) { + return LSR(PSEUDO_CRACKED_PREFIX, language, script, + *region == 0 ? "XC" : region, errorCode); + } + // else normal locale + } + + language = getCanonical(languageAliases, language); + // (We have no script mappings.) + region = getCanonical(regionAliases, region); + return maximize(language, script, region); +} + +LSR XLikelySubtags::maximize(const char *language, const char *script, const char *region) const { + if (uprv_strcmp(language, "und") == 0) { + language = ""; + } + if (uprv_strcmp(script, "Zzzz") == 0) { + script = ""; + } + if (uprv_strcmp(region, "ZZ") == 0) { + region = ""; + } + if (*script != 0 && *region != 0 && *language != 0) { + return LSR(language, script, region); // already maximized + } + + uint32_t retainOldMask = 0; + BytesTrie iter(trie); + uint64_t state; + int32_t value; + // Small optimization: Array lookup for first language letter. + int32_t c0; + if (0 <= (c0 = uprv_lowerOrdinal(language[0])) && c0 <= 25 && + language[1] != 0 && // language.length() >= 2 + (state = trieFirstLetterStates[c0]) != 0) { + value = trieNext(iter.resetToState64(state), language, 1); + } else { + value = trieNext(iter, language, 0); + } + if (value >= 0) { + if (*language != 0) { + retainOldMask |= 4; + } + state = iter.getState64(); + } else { + retainOldMask |= 4; + iter.resetToState64(trieUndState); // "und" ("*") + state = 0; + } + + if (value > 0) { + // Intermediate or final value from just language. + if (value == SKIP_SCRIPT) { + value = 0; + } + if (*script != 0) { + retainOldMask |= 2; + } + } else { + value = trieNext(iter, script, 0); + if (value >= 0) { + if (*script != 0) { + retainOldMask |= 2; + } + state = iter.getState64(); + } else { + retainOldMask |= 2; + if (state == 0) { + iter.resetToState64(trieUndZzzzState); // "und-Zzzz" ("**") + } else { + iter.resetToState64(state); + value = trieNext(iter, "", 0); + U_ASSERT(value >= 0); + state = iter.getState64(); + } + } + } + + if (value > 0) { + // Final value from just language or language+script. + if (*region != 0) { + retainOldMask |= 1; + } + } else { + value = trieNext(iter, region, 0); + if (value >= 0) { + if (*region != 0) { + retainOldMask |= 1; + } + } else { + retainOldMask |= 1; + if (state == 0) { + value = defaultLsrIndex; + } else { + iter.resetToState64(state); + value = trieNext(iter, "", 0); + U_ASSERT(value > 0); + } + } + } + U_ASSERT(value < lsrsLength); + const LSR &result = lsrs[value]; + + if (*language == 0) { + language = "und"; + } + + if (retainOldMask == 0) { + // Quickly return a copy of the lookup-result LSR + // without new allocation of the subtags. + return LSR(result.language, result.script, result.region); + } + if ((retainOldMask & 4) == 0) { + language = result.language; + } + if ((retainOldMask & 2) == 0) { + script = result.script; + } + if ((retainOldMask & 1) == 0) { + region = result.region; + } + return LSR(language, script, region); +} + +int32_t XLikelySubtags::trieNext(BytesTrie &iter, const char *s, int32_t i) { + UStringTrieResult result; + uint8_t c; + if ((c = s[i]) == 0) { + result = iter.next(u'*'); + } else { + for (;;) { + c = uprv_invCharToAscii(c); + // EBCDIC: If s[i] is not an invariant character, + // then c is now 0 and will simply not match anything, which is harmless. + uint8_t next = s[++i]; + if (next != 0) { + if (!USTRINGTRIE_HAS_NEXT(iter.next(c))) { + return -1; + } + } else { + // last character of this subtag + result = iter.next(c | 0x80); + break; + } + c = next; + } + } + switch (result) { + case USTRINGTRIE_NO_MATCH: return -1; + case USTRINGTRIE_NO_VALUE: return 0; + case USTRINGTRIE_INTERMEDIATE_VALUE: + U_ASSERT(iter.getValue() == SKIP_SCRIPT); + return SKIP_SCRIPT; + case USTRINGTRIE_FINAL_VALUE: return iter.getValue(); + default: return -1; + } +} + +// TODO(ICU-20777): Switch Locale/uloc_ likely-subtags API from the old code +// in loclikely.cpp to this new code, including activating this +// minimizeSubtags() function. The LocaleMatcher does not minimize. +#if 0 +LSR XLikelySubtags::minimizeSubtags(const char *languageIn, const char *scriptIn, + const char *regionIn, ULocale.Minimize fieldToFavor, + UErrorCode &errorCode) const { + LSR result = maximize(languageIn, scriptIn, regionIn); + + // We could try just a series of checks, like: + // LSR result2 = addLikelySubtags(languageIn, "", ""); + // if result.equals(result2) return result2; + // However, we can optimize 2 of the cases: + // (languageIn, "", "") + // (languageIn, "", regionIn) + + // value00 = lookup(result.language, "", "") + BytesTrie iter = new BytesTrie(trie); + int value = trieNext(iter, result.language, 0); + U_ASSERT(value >= 0); + if (value == 0) { + value = trieNext(iter, "", 0); + U_ASSERT(value >= 0); + if (value == 0) { + value = trieNext(iter, "", 0); + } + } + U_ASSERT(value > 0); + LSR value00 = lsrs[value]; + boolean favorRegionOk = false; + if (result.script.equals(value00.script)) { //script is default + if (result.region.equals(value00.region)) { + return new LSR(result.language, "", ""); + } else if (fieldToFavor == ULocale.Minimize.FAVOR_REGION) { + return new LSR(result.language, "", result.region); + } else { + favorRegionOk = true; + } + } + + // The last case is not as easy to optimize. + // Maybe do later, but for now use the straightforward code. + LSR result2 = maximize(languageIn, scriptIn, ""); + if (result2.equals(result)) { + return new LSR(result.language, result.script, ""); + } else if (favorRegionOk) { + return new LSR(result.language, "", result.region); + } + return result; +} +#endif + +U_NAMESPACE_END diff --git a/deps/icu-small/source/common/loclikelysubtags.h b/deps/icu-small/source/common/loclikelysubtags.h new file mode 100644 index 00000000000000..8c8a08ac5e314e --- /dev/null +++ b/deps/icu-small/source/common/loclikelysubtags.h @@ -0,0 +1,143 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// loclikelysubtags.h +// created: 2019may08 Markus W. Scherer + +#ifndef __LOCLIKELYSUBTAGS_H__ +#define __LOCLIKELYSUBTAGS_H__ + +#include +#include "unicode/utypes.h" +#include "unicode/bytestrie.h" +#include "unicode/locid.h" +#include "unicode/uobject.h" +#include "unicode/ures.h" +#include "lsr.h" +#include "uhash.h" + +U_NAMESPACE_BEGIN + +struct XLikelySubtagsData; + +/** + * Map of const char * keys & values. + * Stores pointers as is: Does not own/copy/adopt/release strings. + */ +class CharStringMap final : public UMemory { +public: + /** Constructs an unusable non-map. */ + CharStringMap() : map(nullptr) {} + CharStringMap(int32_t size, UErrorCode &errorCode) { + map = uhash_openSize(uhash_hashChars, uhash_compareChars, uhash_compareChars, + size, &errorCode); + } + CharStringMap(CharStringMap &&other) U_NOEXCEPT : map(other.map) { + other.map = nullptr; + } + CharStringMap(const CharStringMap &other) = delete; + ~CharStringMap() { + uhash_close(map); + } + + CharStringMap &operator=(CharStringMap &&other) U_NOEXCEPT { + map = other.map; + other.map = nullptr; + return *this; + } + CharStringMap &operator=(const CharStringMap &other) = delete; + + const char *get(const char *key) const { return static_cast(uhash_get(map, key)); } + void put(const char *key, const char *value, UErrorCode &errorCode) { + uhash_put(map, const_cast(key), const_cast(value), &errorCode); + } + +private: + UHashtable *map; +}; + +struct LocaleDistanceData { + LocaleDistanceData() = default; + LocaleDistanceData(LocaleDistanceData &&data); + ~LocaleDistanceData(); + + const uint8_t *distanceTrieBytes = nullptr; + const uint8_t *regionToPartitions = nullptr; + const char **partitions = nullptr; + const LSR *paradigms = nullptr; + int32_t paradigmsLength = 0; + const int32_t *distances = nullptr; + +private: + LocaleDistanceData &operator=(const LocaleDistanceData &) = delete; +}; + +// TODO(ICU-20777): Rename to just LikelySubtags. +class XLikelySubtags final : public UMemory { +public: + ~XLikelySubtags(); + + static constexpr int32_t SKIP_SCRIPT = 1; + + // VisibleForTesting + static const XLikelySubtags *getSingleton(UErrorCode &errorCode); + + // VisibleForTesting + LSR makeMaximizedLsrFrom(const Locale &locale, UErrorCode &errorCode) const; + + // TODO(ICU-20777): Switch Locale/uloc_ likely-subtags API from the old code + // in loclikely.cpp to this new code, including activating this + // minimizeSubtags() function. The LocaleMatcher does not minimize. +#if 0 + LSR minimizeSubtags(const char *languageIn, const char *scriptIn, const char *regionIn, + ULocale.Minimize fieldToFavor, UErrorCode &errorCode) const; +#endif + + // visible for LocaleDistance + const LocaleDistanceData &getDistanceData() const { return distanceData; } + +private: + XLikelySubtags(XLikelySubtagsData &data); + XLikelySubtags(const XLikelySubtags &other) = delete; + XLikelySubtags &operator=(const XLikelySubtags &other) = delete; + + static void initLikelySubtags(UErrorCode &errorCode); + + LSR makeMaximizedLsr(const char *language, const char *script, const char *region, + const char *variant, UErrorCode &errorCode) const; + + /** + * Raw access to addLikelySubtags. Input must be in canonical format, eg "en", not "eng" or "EN". + */ + LSR maximize(const char *language, const char *script, const char *region) const; + + static int32_t trieNext(BytesTrie &iter, const char *s, int32_t i); + + UResourceBundle *langInfoBundle; + // We could store the strings by value, except that if there were few enough strings, + // moving the contents could copy it to a different array, + // invalidating the pointers stored in the maps. + CharString *strings; + CharStringMap languageAliases; + CharStringMap regionAliases; + + // The trie maps each lang+script+region (encoded in ASCII) to an index into lsrs. + // There is also a trie value for each intermediate lang and lang+script. + // '*' is used instead of "und", "Zzzz"/"" and "ZZ"/"". + BytesTrie trie; + uint64_t trieUndState; + uint64_t trieUndZzzzState; + int32_t defaultLsrIndex; + uint64_t trieFirstLetterStates[26]; + const LSR *lsrs; +#if U_DEBUG + int32_t lsrsLength; +#endif + + // distance/matcher data: see comment in XLikelySubtagsData::load() + LocaleDistanceData distanceData; +}; + +U_NAMESPACE_END + +#endif // __LOCLIKELYSUBTAGS_H__ diff --git a/deps/icu-small/source/common/lsr.cpp b/deps/icu-small/source/common/lsr.cpp new file mode 100644 index 00000000000000..0c28eeda1bc7b6 --- /dev/null +++ b/deps/icu-small/source/common/lsr.cpp @@ -0,0 +1,101 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// lsr.cpp +// created: 2019may08 Markus W. Scherer + +#include "unicode/utypes.h" +#include "charstr.h" +#include "cmemory.h" +#include "cstring.h" +#include "lsr.h" +#include "uinvchar.h" +#include "ustr_imp.h" + +U_NAMESPACE_BEGIN + +LSR::LSR(char prefix, const char *lang, const char *scr, const char *r, UErrorCode &errorCode) : + language(nullptr), script(nullptr), region(r), + regionIndex(indexForRegion(region)) { + if (U_SUCCESS(errorCode)) { + CharString langScript; + langScript.append(prefix, errorCode).append(lang, errorCode).append('\0', errorCode); + int32_t scriptOffset = langScript.length(); + langScript.append(prefix, errorCode).append(scr, errorCode); + owned = langScript.cloneData(errorCode); + if (U_SUCCESS(errorCode)) { + language = owned; + script = owned + scriptOffset; + } + } +} + +LSR::LSR(LSR &&other) U_NOEXCEPT : + language(other.language), script(other.script), region(other.region), owned(other.owned), + regionIndex(other.regionIndex), hashCode(other.hashCode) { + if (owned != nullptr) { + other.language = other.script = ""; + other.owned = nullptr; + other.hashCode = 0; + } +} + +void LSR::deleteOwned() { + uprv_free(owned); +} + +LSR &LSR::operator=(LSR &&other) U_NOEXCEPT { + this->~LSR(); + language = other.language; + script = other.script; + region = other.region; + regionIndex = other.regionIndex; + owned = other.owned; + hashCode = other.hashCode; + if (owned != nullptr) { + other.language = other.script = ""; + other.owned = nullptr; + other.hashCode = 0; + } + return *this; +} + +UBool LSR::operator==(const LSR &other) const { + return + uprv_strcmp(language, other.language) == 0 && + uprv_strcmp(script, other.script) == 0 && + regionIndex == other.regionIndex && + // Compare regions if both are ill-formed (and their indexes are 0). + (regionIndex > 0 || uprv_strcmp(region, other.region) == 0); +} + +int32_t LSR::indexForRegion(const char *region) { + int32_t c = region[0]; + int32_t a = c - '0'; + if (0 <= a && a <= 9) { // digits: "419" + int32_t b = region[1] - '0'; + if (b < 0 || 9 < b) { return 0; } + c = region[2] - '0'; + if (c < 0 || 9 < c || region[3] != 0) { return 0; } + return (10 * a + b) * 10 + c + 1; + } else { // letters: "DE" + a = uprv_upperOrdinal(c); + if (a < 0 || 25 < a) { return 0; } + int32_t b = uprv_upperOrdinal(region[1]); + if (b < 0 || 25 < b || region[2] != 0) { return 0; } + return 26 * a + b + 1001; + } + return 0; +} + +LSR &LSR::setHashCode() { + if (hashCode == 0) { + hashCode = + (ustr_hashCharsN(language, static_cast(uprv_strlen(language))) * 37 + + ustr_hashCharsN(script, static_cast(uprv_strlen(script)))) * 37 + + regionIndex; + } + return *this; +} + +U_NAMESPACE_END diff --git a/deps/icu-small/source/common/lsr.h b/deps/icu-small/source/common/lsr.h new file mode 100644 index 00000000000000..db6cf938f47d02 --- /dev/null +++ b/deps/icu-small/source/common/lsr.h @@ -0,0 +1,72 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// lsr.h +// created: 2019may08 Markus W. Scherer + +#ifndef __LSR_H__ +#define __LSR_H__ + +#include "unicode/utypes.h" +#include "unicode/uobject.h" +#include "cstring.h" + +U_NAMESPACE_BEGIN + +struct LSR final : public UMemory { + static constexpr int32_t REGION_INDEX_LIMIT = 1001 + 26 * 26; + + const char *language; + const char *script; + const char *region; + char *owned = nullptr; + /** Index for region, 0 if ill-formed. @see indexForRegion */ + int32_t regionIndex = 0; + /** Only set for LSRs that will be used in a hash table. */ + int32_t hashCode = 0; + + LSR() : language("und"), script(""), region("") {} + + /** Constructor which aliases all subtag pointers. */ + LSR(const char *lang, const char *scr, const char *r) : + language(lang), script(scr), region(r), + regionIndex(indexForRegion(region)) {} + /** + * Constructor which prepends the prefix to the language and script, + * copies those into owned memory, and aliases the region. + */ + LSR(char prefix, const char *lang, const char *scr, const char *r, UErrorCode &errorCode); + LSR(LSR &&other) U_NOEXCEPT; + LSR(const LSR &other) = delete; + inline ~LSR() { + // Pure inline code for almost all instances. + if (owned != nullptr) { + deleteOwned(); + } + } + + LSR &operator=(LSR &&other) U_NOEXCEPT; + LSR &operator=(const LSR &other) = delete; + + /** + * Returns a positive index (>0) for a well-formed region code. + * Do not rely on a particular region->index mapping; it may change. + * Returns 0 for ill-formed strings. + */ + static int32_t indexForRegion(const char *region); + + UBool operator==(const LSR &other) const; + + inline UBool operator!=(const LSR &other) const { + return !operator==(other); + } + + LSR &setHashCode(); + +private: + void deleteOwned(); +}; + +U_NAMESPACE_END + +#endif // __LSR_H__ diff --git a/deps/icu-small/source/common/mutex.h b/deps/icu-small/source/common/mutex.h index 5223397bbcc10a..44b1f90ba04dd2 100644 --- a/deps/icu-small/source/common/mutex.h +++ b/deps/icu-small/source/common/mutex.h @@ -28,50 +28,48 @@ U_NAMESPACE_BEGIN -//---------------------------------------------------------------------------- -// Code within that accesses shared static or global data should -// should instantiate a Mutex object while doing so. You should make your own -// private mutex where possible. - -// For example: -// -// UMutex myMutex = U_MUTEX_INITIALIZER; -// -// void Function(int arg1, int arg2) -// { -// static Object* foo; // Shared read-write object -// Mutex mutex(&myMutex); // or no args for the global lock -// foo->Method(); -// // When 'mutex' goes out of scope and gets destroyed here, the lock is released -// } -// -// Note: Do NOT use the form 'Mutex mutex();' as that merely forward-declares a function -// returning a Mutex. This is a common mistake which silently slips through the -// compiler!! -// +/** + * Mutex is a helper class for convenient locking and unlocking of a UMutex. + * + * Creating a local scope Mutex will lock a UMutex, holding the lock until the Mutex + * goes out of scope. + * + * If no UMutex is specified, the ICU global mutex is implied. + * + * For example: + * + * static UMutex myMutex; + * + * void Function(int arg1, int arg2) + * { + * static Object* foo; // Shared read-write object + * Mutex mutex(&myMutex); // or no args for the global lock + * foo->Method(); + * // When 'mutex' goes out of scope and gets destroyed here, the lock is released + * } + * + * Note: Do NOT use the form 'Mutex mutex();' as that merely forward-declares a function + * returning a Mutex. This is a common mistake which silently slips through the + * compiler!! + */ class U_COMMON_API Mutex : public UMemory { public: - inline Mutex(UMutex *mutex = NULL); - inline ~Mutex(); + Mutex(UMutex *mutex = nullptr) : fMutex(mutex) { + umtx_lock(fMutex); + } + ~Mutex() { + umtx_unlock(fMutex); + } -private: - UMutex *fMutex; + Mutex(const Mutex &other) = delete; // forbid assigning of this class + Mutex &operator=(const Mutex &other) = delete; // forbid copying of this class + void *operator new(size_t s) = delete; // forbid heap allocation. Locals only. - Mutex(const Mutex &other); // forbid copying of this class - Mutex &operator=(const Mutex &other); // forbid copying of this class +private: + UMutex *fMutex; }; -inline Mutex::Mutex(UMutex *mutex) - : fMutex(mutex) -{ - umtx_lock(fMutex); -} - -inline Mutex::~Mutex() -{ - umtx_unlock(fMutex); -} U_NAMESPACE_END diff --git a/deps/icu-small/source/common/normalizer2impl.h b/deps/icu-small/source/common/normalizer2impl.h index 7ecdef6d9c8032..cf3015ea881bfc 100644 --- a/deps/icu-small/source/common/normalizer2impl.h +++ b/deps/icu-small/source/common/normalizer2impl.h @@ -245,9 +245,7 @@ class U_COMMON_API ReorderingBuffer : public UMemory { */ class U_COMMON_API Normalizer2Impl : public UObject { public: - Normalizer2Impl() : normTrie(NULL), fCanonIterData(NULL) { - fCanonIterDataInitOnce.reset(); - } + Normalizer2Impl() : normTrie(NULL), fCanonIterData(NULL) { } virtual ~Normalizer2Impl(); void init(const int32_t *inIndexes, const UCPTrie *inTrie, @@ -723,7 +721,7 @@ class U_COMMON_API Normalizer2Impl : public UObject { const uint16_t *extraData; // mappings and/or compositions for yesYes, yesNo & noNo characters const uint8_t *smallFCD; // [0x100] one bit per 32 BMP code points, set if any FCD!=0 - UInitOnce fCanonIterDataInitOnce; + UInitOnce fCanonIterDataInitOnce = U_INITONCE_INITIALIZER; CanonIterData *fCanonIterData; }; diff --git a/deps/icu-small/source/common/putil.cpp b/deps/icu-small/source/common/putil.cpp index e105befc3fc740..207350f8f26120 100644 --- a/deps/icu-small/source/common/putil.cpp +++ b/deps/icu-small/source/common/putil.cpp @@ -249,7 +249,7 @@ static UDate getUTCtime_real() { } static UDate getUTCtime_fake() { - static UMutex fakeClockMutex = U_MUTEX_INTIALIZER; + static UMutex fakeClockMutex; umtx_lock(&fakeClockMutex); if(!fakeClock_set) { UDate real = getUTCtime_real(); @@ -1315,11 +1315,10 @@ uprv_pathIsAbsolute(const char *path) # endif #endif -#if U_PLATFORM_HAS_WINUWP_API != 0 +#if defined(ICU_DATA_DIR_WINDOWS) // Helper function to get the ICU Data Directory under the Windows directory location. static BOOL U_CALLCONV getIcuDataDirectoryUnderWindowsDirectory(char* directoryBuffer, UINT bufferLength) { -#if defined(ICU_DATA_DIR_WINDOWS) wchar_t windowsPath[MAX_PATH]; char windowsPathUtf8[MAX_PATH]; @@ -1346,7 +1345,6 @@ static BOOL U_CALLCONV getIcuDataDirectoryUnderWindowsDirectory(char* directoryB } } } -#endif return FALSE; } @@ -1380,9 +1378,9 @@ static void U_CALLCONV dataDirectoryInitFn() { */ # if !defined(ICU_NO_USER_DATA_OVERRIDE) && !UCONFIG_NO_FILE_IO /* First try to get the environment variable */ -# if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP does not support getenv +# if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP does not support getenv path=getenv("ICU_DATA"); -# endif +# endif # endif /* ICU_DATA_DIR may be set as a compile option. @@ -1411,7 +1409,7 @@ static void U_CALLCONV dataDirectoryInitFn() { } #endif -#if U_PLATFORM_HAS_WINUWP_API != 0 && defined(ICU_DATA_DIR_WINDOWS) +#if defined(ICU_DATA_DIR_WINDOWS) char datadir_path_buffer[MAX_PATH]; if (getIcuDataDirectoryUnderWindowsDirectory(datadir_path_buffer, UPRV_LENGTHOF(datadir_path_buffer))) { path = datadir_path_buffer; @@ -1461,12 +1459,17 @@ static void U_CALLCONV TimeZoneDataDirInitFn(UErrorCode &status) { const char *dir = ""; -#if U_PLATFORM_HAS_WINUWP_API != 0 - // The UWP version does not support the environment variable setting, but can possibly pick them up from the Windows directory. +#if U_PLATFORM_HAS_WINUWP_API == 1 +// The UWP version does not support the environment variable setting. + +# if defined(ICU_DATA_DIR_WINDOWS) + // When using the Windows system data, we can possibly pick up time zone data from the Windows directory. char datadir_path_buffer[MAX_PATH]; if (getIcuDataDirectoryUnderWindowsDirectory(datadir_path_buffer, UPRV_LENGTHOF(datadir_path_buffer))) { dir = datadir_path_buffer; } +# endif + #else dir = getenv("ICU_TIMEZONE_FILES_DIR"); #endif // U_PLATFORM_HAS_WINUWP_API @@ -1560,6 +1563,10 @@ static const char *uprv_getPOSIXIDForCategory(int category) { /* Nothing worked. Give it a nice POSIX default value. */ posixID = "en_US_POSIX"; + // Note: this test will not catch 'C.UTF-8', + // that will be handled in uprv_getDefaultLocaleID(). + // Leave this mapping here for the uprv_getPOSIXIDForDefaultCodepage() + // caller which expects to see "en_US_POSIX" in many branches. } return posixID; } @@ -1631,8 +1638,8 @@ The leftmost codepage (.xxx) wins. } // Copy the ID into owned memory. - // Over-allocate in case we replace "@" with "__". - char *correctedPOSIXLocale = static_cast(uprv_malloc(uprv_strlen(posixID) + 1 + 1)); + // Over-allocate in case we replace "C" with "en_US_POSIX" (+10), + null termination + char *correctedPOSIXLocale = static_cast(uprv_malloc(uprv_strlen(posixID) + 10 + 1)); if (correctedPOSIXLocale == nullptr) { return nullptr; } @@ -1641,9 +1648,16 @@ The leftmost codepage (.xxx) wins. char *limit; if ((limit = uprv_strchr(correctedPOSIXLocale, '.')) != nullptr) { *limit = 0; - if ((limit = uprv_strchr(correctedPOSIXLocale, '@')) != nullptr) { - *limit = 0; - } + } + if ((limit = uprv_strchr(correctedPOSIXLocale, '@')) != nullptr) { + *limit = 0; + } + + if ((uprv_strcmp("C", correctedPOSIXLocale) == 0) // no @ variant + || (uprv_strcmp("POSIX", correctedPOSIXLocale) == 0)) { + // Raw input was C.* or POSIX.*, Give it a nice POSIX default value. + // (The "C"/"POSIX" case is handled in uprv_getPOSIXIDForCategory()) + uprv_strcpy(correctedPOSIXLocale, "en_US_POSIX"); } /* Note that we scan the *uncorrected* ID. */ @@ -1668,7 +1682,7 @@ The leftmost codepage (.xxx) wins. if ((q = uprv_strchr(p, '.')) != nullptr) { /* How big will the resulting string be? */ int32_t len = (int32_t)(uprv_strlen(correctedPOSIXLocale) + (q-p)); - uprv_strncat(correctedPOSIXLocale, p, q-p); + uprv_strncat(correctedPOSIXLocale, p, q-p); // do not include charset correctedPOSIXLocale[len] = 0; } else { @@ -2053,7 +2067,7 @@ int_getDefaultCodepage() static char codepage[64]; DWORD codepageNumber = 0; -#if U_PLATFORM_HAS_WINUWP_API > 0 +#if U_PLATFORM_HAS_WINUWP_API == 1 // UWP doesn't have a direct API to get the default ACP as Microsoft would rather // have folks use Unicode than a "system" code page, however this is the same // codepage as the system default locale codepage. (FWIW, the system locale is diff --git a/deps/icu-small/source/common/putilimp.h b/deps/icu-small/source/common/putilimp.h index f9c13d8e1b27bf..2e9fbcc4837cd8 100644 --- a/deps/icu-small/source/common/putilimp.h +++ b/deps/icu-small/source/common/putilimp.h @@ -178,76 +178,6 @@ typedef size_t uintptr_t; /** @} */ -/*===========================================================================*/ -/** @{ GCC built in functions for atomic memory operations */ -/*===========================================================================*/ - -/** - * \def U_HAVE_GCC_ATOMICS - * @internal - */ -#ifdef U_HAVE_GCC_ATOMICS - /* Use the predefined value. */ -#elif U_PLATFORM == U_PF_MINGW - #define U_HAVE_GCC_ATOMICS 0 -#elif U_GCC_MAJOR_MINOR >= 404 || defined(__clang__) - /* TODO: Intel icc and IBM xlc on AIX also support gcc atomics. (Intel originated them.) - * Add them for these compilers. - * Note: Clang sets __GNUC__ defines for version 4.2, so misses the 4.4 test here. - */ -# define U_HAVE_GCC_ATOMICS 1 -#else -# define U_HAVE_GCC_ATOMICS 0 -#endif - -/** @} */ - -/** - * \def U_HAVE_STD_ATOMICS - * Defines whether to use the C++11 std::atomic functions. - * If false, ICU will fall back to compiler or platform specific alternatives. - * Note: support for these fall back options for atomics will be removed in a future version - * of ICU, and the use of C++ 11 atomics will be required. - * @internal - */ -#ifdef U_HAVE_STD_ATOMICS - /* Use the predefined value. */ -#else -# define U_HAVE_STD_ATOMICS 1 -#endif - -/** - * \def U_HAVE_CLANG_ATOMICS - * Defines whether Clang c11 style built-in atomics are available. - * These are used in preference to gcc atomics when both are available. - */ -#ifdef U_HAVE_CLANG_ATOMICS - /* Use the predefined value. */ -#elif __has_builtin(__c11_atomic_load) && \ - __has_builtin(__c11_atomic_store) && \ - __has_builtin(__c11_atomic_fetch_add) && \ - __has_builtin(__c11_atomic_fetch_sub) -# define U_HAVE_CLANG_ATOMICS 1 -#else -# define U_HAVE_CLANG_ATOMICS 0 -#endif - - -/** - * \def U_HAVE_STD_MUTEX - * Defines whether to use the C++11 std::mutex functions. - * If false, ICU will fall back to compiler or platform specific alternatives. - * std::mutex is preferred, and used by default unless this setting is overridden. - * Note: support for other options for mutexes will be removed in a future version - * of ICU, and the use of std::mutex will be required. - * @internal - */ -#ifdef U_HAVE_STD_MUTEX - /* Use the predefined value. */ -#else -# define U_HAVE_STD_MUTEX 1 -#endif - /*===========================================================================*/ /** @{ Programs used by ICU code */ /*===========================================================================*/ diff --git a/deps/icu-small/source/common/rbbi.cpp b/deps/icu-small/source/common/rbbi.cpp index 3b116ffaf6cba7..01dae48de44c1d 100644 --- a/deps/icu-small/source/common/rbbi.cpp +++ b/deps/icu-small/source/common/rbbi.cpp @@ -323,8 +323,8 @@ void RuleBasedBreakIterator::init(UErrorCode &status) { // Virtual function: does the right thing with subclasses. // //----------------------------------------------------------------------------- -BreakIterator* -RuleBasedBreakIterator::clone(void) const { +RuleBasedBreakIterator* +RuleBasedBreakIterator::clone() const { return new RuleBasedBreakIterator(*this); } @@ -352,7 +352,7 @@ RuleBasedBreakIterator::operator==(const BreakIterator& that) const { // or have a different iteration position. // Note that fText's position is always the same as the break iterator's position. return FALSE; - }; + } if (!(fPosition == that2.fPosition && fRuleStatusIndex == that2.fRuleStatusIndex && @@ -1079,10 +1079,8 @@ const uint8_t *RuleBasedBreakIterator::getBinaryRules(uint32_t &length) { } -BreakIterator * RuleBasedBreakIterator::createBufferClone(void * /*stackBuffer*/, - int32_t &bufferSize, - UErrorCode &status) -{ +RuleBasedBreakIterator *RuleBasedBreakIterator::createBufferClone( + void * /*stackBuffer*/, int32_t &bufferSize, UErrorCode &status) { if (U_FAILURE(status)){ return NULL; } diff --git a/deps/icu-small/source/common/rbbi_cache.cpp b/deps/icu-small/source/common/rbbi_cache.cpp index 17ee2320802f60..4f9e83360a2a32 100644 --- a/deps/icu-small/source/common/rbbi_cache.cpp +++ b/deps/icu-small/source/common/rbbi_cache.cpp @@ -519,7 +519,7 @@ UBool RuleBasedBreakIterator::BreakCache::populatePreceding(UErrorCode &status) // The initial handleNext() only advanced by a single code point. Go again. position = fBI->handleNext(); // Safe rules identify safe pairs. } - }; + } positionStatusIdx = fBI->fRuleStatusIndex; } } while (position >= fromPosition); diff --git a/deps/icu-small/source/common/resbund.cpp b/deps/icu-small/source/common/resbund.cpp index 00dbf6f8fe2e9c..5ec7541b4db636 100644 --- a/deps/icu-small/source/common/resbund.cpp +++ b/deps/icu-small/source/common/resbund.cpp @@ -51,6 +51,7 @@ #include "unicode/utypes.h" #include "unicode/resbund.h" +#include "cmemory.h" #include "mutex.h" #include "uassert.h" #include "umutex.h" @@ -377,7 +378,7 @@ void ResourceBundle::getVersion(UVersionInfo versionInfo) const { } const Locale &ResourceBundle::getLocale(void) const { - static UMutex gLocaleLock = U_MUTEX_INITIALIZER; + static UMutex gLocaleLock; Mutex lock(&gLocaleLock); if (fLocale != NULL) { return *fLocale; diff --git a/deps/icu-small/source/common/resource.h b/deps/icu-small/source/common/resource.h index 3dbff785ef12a8..5199b858880770 100644 --- a/deps/icu-small/source/common/resource.h +++ b/deps/icu-small/source/common/resource.h @@ -28,6 +28,7 @@ #include "unicode/utypes.h" #include "unicode/unistr.h" #include "unicode/ures.h" +#include "restrace.h" struct ResourceData; @@ -47,8 +48,10 @@ class U_COMMON_API ResourceArray { ResourceArray() : items16(NULL), items32(NULL), length(0) {} /** Only for implementation use. @internal */ - ResourceArray(const uint16_t *i16, const uint32_t *i32, int32_t len) : - items16(i16), items32(i32), length(len) {} + ResourceArray(const uint16_t *i16, const uint32_t *i32, int32_t len, + const ResourceTracer& traceInfo) : + items16(i16), items32(i32), length(len), + fTraceInfo(traceInfo) {} /** * @return The number of items in the array resource. @@ -68,6 +71,7 @@ class U_COMMON_API ResourceArray { const uint16_t *items16; const uint32_t *items32; int32_t length; + ResourceTracer fTraceInfo; }; /** @@ -80,27 +84,37 @@ class U_COMMON_API ResourceTable { /** Only for implementation use. @internal */ ResourceTable(const uint16_t *k16, const int32_t *k32, - const uint16_t *i16, const uint32_t *i32, int32_t len) : - keys16(k16), keys32(k32), items16(i16), items32(i32), length(len) {} + const uint16_t *i16, const uint32_t *i32, int32_t len, + const ResourceTracer& traceInfo) : + keys16(k16), keys32(k32), items16(i16), items32(i32), length(len), + fTraceInfo(traceInfo) {} /** * @return The number of items in the array resource. */ int32_t getSize() const { return length; } /** - * @param i Array item index. + * @param i Table item index. * @param key Output-only, receives the key of the i'th item. * @param value Output-only, receives the value of the i'th item. * @return TRUE if i is non-negative and less than getSize(). */ UBool getKeyAndValue(int32_t i, const char *&key, ResourceValue &value) const; + /** + * @param key Key string to find in the table. + * @param value Output-only, receives the value of the item with that key. + * @return TRUE if the table contains the key. + */ + UBool findValue(const char *key, ResourceValue &value) const; + private: const uint16_t *keys16; const int32_t *keys32; const uint16_t *items16; const uint32_t *items32; int32_t length; + ResourceTracer fTraceInfo; }; /** diff --git a/deps/icu-small/source/common/restrace.cpp b/deps/icu-small/source/common/restrace.cpp new file mode 100644 index 00000000000000..5c6498850e2f8f --- /dev/null +++ b/deps/icu-small/source/common/restrace.cpp @@ -0,0 +1,130 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if U_ENABLE_TRACING + +#include "restrace.h" +#include "charstr.h" +#include "cstring.h" +#include "utracimp.h" +#include "uresimp.h" +#include "uassert.h" +#include "util.h" + +U_NAMESPACE_BEGIN + +ResourceTracer::~ResourceTracer() = default; + +void ResourceTracer::trace(const char* resType) const { + U_ASSERT(fResB || fParent); + UTRACE_ENTRY(UTRACE_UDATA_RESOURCE); + UErrorCode status = U_ZERO_ERROR; + + CharString filePath; + getFilePath(filePath, status); + + CharString resPath; + getResPath(resPath, status); + + // The longest type ("intvector") is 9 chars + const char kSpaces[] = " "; + CharString format; + format.append(kSpaces, sizeof(kSpaces) - 1 - uprv_strlen(resType), status); + format.append("(%s) %s @ %s", status); + + UTRACE_DATA3(UTRACE_VERBOSE, + format.data(), + resType, + filePath.data(), + resPath.data()); + UTRACE_EXIT_STATUS(status); +} + +void ResourceTracer::traceOpen() const { + U_ASSERT(fResB); + UTRACE_ENTRY(UTRACE_UDATA_BUNDLE); + UErrorCode status = U_ZERO_ERROR; + + CharString filePath; + UTRACE_DATA1(UTRACE_VERBOSE, "%s", getFilePath(filePath, status).data()); + UTRACE_EXIT_STATUS(status); +} + +CharString& ResourceTracer::getFilePath(CharString& output, UErrorCode& status) const { + if (fResB) { + output.append(fResB->fData->fPath, status); + output.append('/', status); + output.append(fResB->fData->fName, status); + output.append(".res", status); + } else { + fParent->getFilePath(output, status); + } + return output; +} + +CharString& ResourceTracer::getResPath(CharString& output, UErrorCode& status) const { + if (fResB) { + output.append('/', status); + output.append(fResB->fResPath, status); + // removing the trailing / + U_ASSERT(output[output.length()-1] == '/'); + output.truncate(output.length()-1); + } else { + fParent->getResPath(output, status); + } + if (fKey) { + output.append('/', status); + output.append(fKey, status); + } + if (fIndex != -1) { + output.append('[', status); + UnicodeString indexString; + ICU_Utility::appendNumber(indexString, fIndex); + output.appendInvariantChars(indexString, status); + output.append(']', status); + } + return output; +} + +void FileTracer::traceOpen(const char* path, const char* type, const char* name) { + if (uprv_strcmp(type, "res") == 0) { + traceOpenResFile(path, name); + } else { + traceOpenDataFile(path, type, name); + } +} + +void FileTracer::traceOpenDataFile(const char* path, const char* type, const char* name) { + UTRACE_ENTRY(UTRACE_UDATA_DATA_FILE); + UErrorCode status = U_ZERO_ERROR; + + CharString filePath; + filePath.append(path, status); + filePath.append('/', status); + filePath.append(name, status); + filePath.append('.', status); + filePath.append(type, status); + + UTRACE_DATA1(UTRACE_VERBOSE, "%s", filePath.data()); + UTRACE_EXIT_STATUS(status); +} + +void FileTracer::traceOpenResFile(const char* path, const char* name) { + UTRACE_ENTRY(UTRACE_UDATA_RES_FILE); + UErrorCode status = U_ZERO_ERROR; + + CharString filePath; + filePath.append(path, status); + filePath.append('/', status); + filePath.append(name, status); + filePath.append(".res", status); + + UTRACE_DATA1(UTRACE_VERBOSE, "%s", filePath.data()); + UTRACE_EXIT_STATUS(status); +} + +U_NAMESPACE_END + +#endif // U_ENABLE_TRACING diff --git a/deps/icu-small/source/common/restrace.h b/deps/icu-small/source/common/restrace.h new file mode 100644 index 00000000000000..ef29eaed578107 --- /dev/null +++ b/deps/icu-small/source/common/restrace.h @@ -0,0 +1,147 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#ifndef __RESTRACE_H__ +#define __RESTRACE_H__ + +#include "unicode/utypes.h" + +#if U_ENABLE_TRACING + +struct UResourceBundle; + +U_NAMESPACE_BEGIN + +class CharString; + +/** + * Instances of this class store information used to trace reads from resource + * bundles when ICU is built with --enable-tracing. + * + * All arguments of type const UResourceBundle*, const char*, and + * const ResourceTracer& are stored as pointers. The caller must retain + * ownership for the lifetime of this ResourceTracer. + * + * Exported as U_COMMON_API for Windows because it is a value field + * in other exported types. + */ +class U_COMMON_API ResourceTracer { +public: + ResourceTracer() : + fResB(nullptr), + fParent(nullptr), + fKey(nullptr), + fIndex(-1) {} + + ResourceTracer(const UResourceBundle* resB) : + fResB(resB), + fParent(nullptr), + fKey(nullptr), + fIndex(-1) {} + + ResourceTracer(const UResourceBundle* resB, const char* key) : + fResB(resB), + fParent(nullptr), + fKey(key), + fIndex(-1) {} + + ResourceTracer(const UResourceBundle* resB, int32_t index) : + fResB(resB), + fParent(nullptr), + fKey(nullptr), + fIndex(index) {} + + ResourceTracer(const ResourceTracer& parent, const char* key) : + fResB(nullptr), + fParent(&parent), + fKey(key), + fIndex(-1) {} + + ResourceTracer(const ResourceTracer& parent, int32_t index) : + fResB(nullptr), + fParent(&parent), + fKey(nullptr), + fIndex(index) {} + + ~ResourceTracer(); + + void trace(const char* type) const; + void traceOpen() const; + + /** + * Calls trace() if the resB or parent provided to the constructor was + * non-null; otherwise, does nothing. + */ + void maybeTrace(const char* type) const { + if (fResB || fParent) { + trace(type); + } + } + +private: + const UResourceBundle* fResB; + const ResourceTracer* fParent; + const char* fKey; + int32_t fIndex; + + CharString& getFilePath(CharString& output, UErrorCode& status) const; + + CharString& getResPath(CharString& output, UErrorCode& status) const; +}; + +/** + * This class provides methods to trace data file reads when ICU is built + * with --enable-tracing. + */ +class FileTracer { +public: + static void traceOpen(const char* path, const char* type, const char* name); + +private: + static void traceOpenDataFile(const char* path, const char* type, const char* name); + static void traceOpenResFile(const char* path, const char* name); +}; + +U_NAMESPACE_END + +#else // U_ENABLE_TRACING + +U_NAMESPACE_BEGIN + +/** + * Default trivial implementation when --enable-tracing is not used. + */ +class U_COMMON_API ResourceTracer { +public: + ResourceTracer() {} + + ResourceTracer(const void*) {} + + ResourceTracer(const void*, const char*) {} + + ResourceTracer(const void*, int32_t) {} + + ResourceTracer(const ResourceTracer&, const char*) {} + + ResourceTracer(const ResourceTracer&, int32_t) {} + + void trace(const char*) const {} + + void traceOpen() const {} + + void maybeTrace(const char*) const {} +}; + +/** + * Default trivial implementation when --enable-tracing is not used. + */ +class FileTracer { +public: + static void traceOpen(const char*, const char*, const char*) {} +}; + +U_NAMESPACE_END + +#endif // U_ENABLE_TRACING + +#endif //__RESTRACE_H__ diff --git a/deps/icu-small/source/common/schriter.cpp b/deps/icu-small/source/common/schriter.cpp index f852800aaae6bd..17b68aee9d923a 100644 --- a/deps/icu-small/source/common/schriter.cpp +++ b/deps/icu-small/source/common/schriter.cpp @@ -101,7 +101,7 @@ StringCharacterIterator::operator==(const ForwardCharacterIterator& that) const && end == realThat.end; } -CharacterIterator* +StringCharacterIterator* StringCharacterIterator::clone() const { return new StringCharacterIterator(*this); } diff --git a/deps/icu-small/source/common/serv.cpp b/deps/icu-small/source/common/serv.cpp index 40940740d02b45..044864b859c7e8 100644 --- a/deps/icu-small/source/common/serv.cpp +++ b/deps/icu-small/source/common/serv.cpp @@ -333,10 +333,7 @@ U_CDECL_END ****************************************************************** */ -static UMutex *lock() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex lock; ICUService::ICUService() : name() @@ -361,7 +358,7 @@ ICUService::ICUService(const UnicodeString& newName) ICUService::~ICUService() { { - Mutex mutex(lock()); + Mutex mutex(&lock); clearCaches(); delete factories; factories = NULL; @@ -452,7 +449,7 @@ ICUService::getKey(ICUServiceKey& key, UnicodeString* actualReturn, const ICUSer // if factory is not null, we're calling from within the mutex, // and since some unix machines don't have reentrant mutexes we // need to make sure not to try to lock it again. - XMutex mutex(lock(), factory != NULL); + XMutex mutex(&lock, factory != NULL); if (serviceCache == NULL) { ncthis->serviceCache = new Hashtable(status); @@ -618,7 +615,7 @@ ICUService::getVisibleIDs(UVector& result, const UnicodeString* matchID, UErrorC } { - Mutex mutex(lock()); + Mutex mutex(&lock); const Hashtable* map = getVisibleIDMap(status); if (map != NULL) { ICUServiceKey* fallbackKey = createKey(matchID, status); @@ -695,7 +692,7 @@ ICUService::getDisplayName(const UnicodeString& id, UnicodeString& result, const { { UErrorCode status = U_ZERO_ERROR; - Mutex mutex(lock()); + Mutex mutex(&lock); const Hashtable* map = getVisibleIDMap(status); if (map != NULL) { ICUServiceFactory* f = (ICUServiceFactory*)map->get(id); @@ -747,7 +744,7 @@ ICUService::getDisplayNames(UVector& result, result.setDeleter(userv_deleteStringPair); if (U_SUCCESS(status)) { ICUService* ncthis = (ICUService*)this; // cast away semantic const - Mutex mutex(lock()); + Mutex mutex(&lock); if (dnCache != NULL && dnCache->locale != locale) { delete dnCache; @@ -852,7 +849,7 @@ URegistryKey ICUService::registerFactory(ICUServiceFactory* factoryToAdopt, UErrorCode& status) { if (U_SUCCESS(status) && factoryToAdopt != NULL) { - Mutex mutex(lock()); + Mutex mutex(&lock); if (factories == NULL) { factories = new UVector(deleteUObject, NULL, status); @@ -883,7 +880,7 @@ ICUService::unregister(URegistryKey rkey, UErrorCode& status) ICUServiceFactory *factory = (ICUServiceFactory*)rkey; UBool result = FALSE; if (factory != NULL && factories != NULL) { - Mutex mutex(lock()); + Mutex mutex(&lock); if (factories->removeElement(factory)) { clearCaches(); @@ -903,7 +900,7 @@ void ICUService::reset() { { - Mutex mutex(lock()); + Mutex mutex(&lock); reInitializeFactories(); clearCaches(); } diff --git a/deps/icu-small/source/common/servls.cpp b/deps/icu-small/source/common/servls.cpp index 0b1b1b947d514e..0c2a73d98e2275 100644 --- a/deps/icu-small/source/common/servls.cpp +++ b/deps/icu-small/source/common/servls.cpp @@ -263,7 +263,7 @@ ICULocaleService::validateFallbackLocale() const { const Locale& loc = Locale::getDefault(); ICULocaleService* ncThis = (ICULocaleService*)this; - static UMutex llock = U_MUTEX_INITIALIZER; + static UMutex llock; { Mutex mutex(&llock); if (loc != fallbackLocale) { diff --git a/deps/icu-small/source/common/servnotf.cpp b/deps/icu-small/source/common/servnotf.cpp index 9b5997bd17f509..435f36b0d00671 100644 --- a/deps/icu-small/source/common/servnotf.cpp +++ b/deps/icu-small/source/common/servnotf.cpp @@ -21,10 +21,7 @@ U_NAMESPACE_BEGIN EventListener::~EventListener() {} UOBJECT_DEFINE_RTTI_IMPLEMENTATION(EventListener) -static UMutex *notifyLock() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex notifyLock; ICUNotifier::ICUNotifier(void) : listeners(NULL) @@ -33,7 +30,7 @@ ICUNotifier::ICUNotifier(void) ICUNotifier::~ICUNotifier(void) { { - Mutex lmx(notifyLock()); + Mutex lmx(¬ifyLock); delete listeners; listeners = NULL; } @@ -50,7 +47,7 @@ ICUNotifier::addListener(const EventListener* l, UErrorCode& status) } if (acceptsListener(*l)) { - Mutex lmx(notifyLock()); + Mutex lmx(¬ifyLock); if (listeners == NULL) { listeners = new UVector(5, status); } else { @@ -83,7 +80,7 @@ ICUNotifier::removeListener(const EventListener *l, UErrorCode& status) } { - Mutex lmx(notifyLock()); + Mutex lmx(¬ifyLock); if (listeners != NULL) { // identity equality check for (int i = 0, e = listeners->size(); i < e; ++i) { @@ -106,7 +103,7 @@ void ICUNotifier::notifyChanged(void) { if (listeners != NULL) { - Mutex lmx(notifyLock()); + Mutex lmx(¬ifyLock); if (listeners != NULL) { for (int i = 0, e = listeners->size(); i < e; ++i) { EventListener* el = (EventListener*)listeners->elementAt(i); diff --git a/deps/icu-small/source/common/uarrsort.cpp b/deps/icu-small/source/common/uarrsort.cpp index 03c4d4e7fc44aa..60905821649db9 100644 --- a/deps/icu-small/source/common/uarrsort.cpp +++ b/deps/icu-small/source/common/uarrsort.cpp @@ -34,6 +34,10 @@ enum { STACK_ITEM_SIZE=200 }; +static constexpr int32_t sizeInMaxAlignTs(int32_t sizeInBytes) { + return (sizeInBytes + sizeof(max_align_t) - 1) / sizeof(max_align_t); +} + /* UComparator convenience implementations ---------------------------------- */ U_CAPI int32_t U_EXPORT2 @@ -134,25 +138,15 @@ doInsertionSort(char *array, int32_t length, int32_t itemSize, static void insertionSort(char *array, int32_t length, int32_t itemSize, UComparator *cmp, const void *context, UErrorCode *pErrorCode) { - UAlignedMemory v[STACK_ITEM_SIZE/sizeof(UAlignedMemory)+1]; - void *pv; - /* allocate an intermediate item variable (v) */ - if(itemSize<=STACK_ITEM_SIZE) { - pv=v; - } else { - pv=uprv_malloc(itemSize); - if(pv==NULL) { - *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return; - } + icu::MaybeStackArray v; + if (sizeInMaxAlignTs(itemSize) > v.getCapacity() && + v.resize(sizeInMaxAlignTs(itemSize)) == nullptr) { + *pErrorCode = U_MEMORY_ALLOCATION_ERROR; + return; } - doInsertionSort(array, length, itemSize, cmp, context, pv); - - if(pv!=v) { - uprv_free(pv); - } + doInsertionSort(array, length, itemSize, cmp, context, v.getAlias()); } /* QuickSort ---------------------------------------------------------------- */ @@ -238,26 +232,16 @@ subQuickSort(char *array, int32_t start, int32_t limit, int32_t itemSize, static void quickSort(char *array, int32_t length, int32_t itemSize, UComparator *cmp, const void *context, UErrorCode *pErrorCode) { - UAlignedMemory xw[(2*STACK_ITEM_SIZE)/sizeof(UAlignedMemory)+1]; - void *p; - /* allocate two intermediate item variables (x and w) */ - if(itemSize<=STACK_ITEM_SIZE) { - p=xw; - } else { - p=uprv_malloc(2*itemSize); - if(p==NULL) { - *pErrorCode=U_MEMORY_ALLOCATION_ERROR; - return; - } + icu::MaybeStackArray xw; + if(sizeInMaxAlignTs(itemSize)*2 > xw.getCapacity() && + xw.resize(sizeInMaxAlignTs(itemSize) * 2) == nullptr) { + *pErrorCode=U_MEMORY_ALLOCATION_ERROR; + return; } - subQuickSort(array, 0, length, itemSize, - cmp, context, p, (char *)p+itemSize); - - if(p!=xw) { - uprv_free(p); - } + subQuickSort(array, 0, length, itemSize, cmp, context, + xw.getAlias(), xw.getAlias() + sizeInMaxAlignTs(itemSize)); } /* uprv_sortArray() API ----------------------------------------------------- */ diff --git a/deps/icu-small/source/common/ubidiimp.h b/deps/icu-small/source/common/ubidiimp.h index a5d0727495d767..9746b2bc103102 100644 --- a/deps/icu-small/source/common/ubidiimp.h +++ b/deps/icu-small/source/common/ubidiimp.h @@ -198,8 +198,8 @@ typedef struct Run { /* in a Run, logicalStart will get this bit set if the run level is odd */ #define INDEX_ODD_BIT (1UL<<31) -#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((int32_t)(level)<<31)) -#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((int32_t)(level)<<31)) +#define MAKE_INDEX_ODD_PAIR(index, level) ((index)|((int32_t)((level)&1)<<31)) +#define ADD_ODD_BIT_FROM_LEVEL(x, level) ((x)|=((int32_t)((level)&1)<<31)) #define REMOVE_ODD_BIT(x) ((x)&=~INDEX_ODD_BIT) #define GET_INDEX(x) ((x)&~INDEX_ODD_BIT) @@ -387,41 +387,49 @@ typedef union { } BidiMemoryForAllocation; /* Macros for initial checks at function entry */ -#define RETURN_IF_NULL_OR_FAILING_ERRCODE(pErrcode, retvalue) \ - if((pErrcode)==NULL || U_FAILURE(*pErrcode)) return retvalue -#define RETURN_IF_NOT_VALID_PARA(bidi, errcode, retvalue) \ - if(!IS_VALID_PARA(bidi)) { \ - errcode=U_INVALID_STATE_ERROR; \ - return retvalue; \ - } -#define RETURN_IF_NOT_VALID_PARA_OR_LINE(bidi, errcode, retvalue) \ - if(!IS_VALID_PARA_OR_LINE(bidi)) { \ - errcode=U_INVALID_STATE_ERROR; \ - return retvalue; \ - } -#define RETURN_IF_BAD_RANGE(arg, start, limit, errcode, retvalue) \ - if((arg)<(start) || (arg)>=(limit)) { \ - (errcode)=U_ILLEGAL_ARGUMENT_ERROR; \ - return retvalue; \ - } - -#define RETURN_VOID_IF_NULL_OR_FAILING_ERRCODE(pErrcode) \ - if((pErrcode)==NULL || U_FAILURE(*pErrcode)) return -#define RETURN_VOID_IF_NOT_VALID_PARA(bidi, errcode) \ - if(!IS_VALID_PARA(bidi)) { \ - errcode=U_INVALID_STATE_ERROR; \ - return; \ - } -#define RETURN_VOID_IF_NOT_VALID_PARA_OR_LINE(bidi, errcode) \ - if(!IS_VALID_PARA_OR_LINE(bidi)) { \ - errcode=U_INVALID_STATE_ERROR; \ - return; \ - } -#define RETURN_VOID_IF_BAD_RANGE(arg, start, limit, errcode) \ - if((arg)<(start) || (arg)>=(limit)) { \ - (errcode)=U_ILLEGAL_ARGUMENT_ERROR; \ - return; \ - } +#define RETURN_IF_NULL_OR_FAILING_ERRCODE(pErrcode, retvalue) UPRV_BLOCK_MACRO_BEGIN { \ + if((pErrcode)==NULL || U_FAILURE(*pErrcode)) return retvalue; \ +} UPRV_BLOCK_MACRO_END +#define RETURN_IF_NOT_VALID_PARA(bidi, errcode, retvalue) UPRV_BLOCK_MACRO_BEGIN { \ + if(!IS_VALID_PARA(bidi)) { \ + errcode=U_INVALID_STATE_ERROR; \ + return retvalue; \ + } \ +} UPRV_BLOCK_MACRO_END +#define RETURN_IF_NOT_VALID_PARA_OR_LINE(bidi, errcode, retvalue) UPRV_BLOCK_MACRO_BEGIN { \ + if(!IS_VALID_PARA_OR_LINE(bidi)) { \ + errcode=U_INVALID_STATE_ERROR; \ + return retvalue; \ + } \ +} UPRV_BLOCK_MACRO_END +#define RETURN_IF_BAD_RANGE(arg, start, limit, errcode, retvalue) UPRV_BLOCK_MACRO_BEGIN { \ + if((arg)<(start) || (arg)>=(limit)) { \ + (errcode)=U_ILLEGAL_ARGUMENT_ERROR; \ + return retvalue; \ + } \ +} UPRV_BLOCK_MACRO_END + +#define RETURN_VOID_IF_NULL_OR_FAILING_ERRCODE(pErrcode) UPRV_BLOCK_MACRO_BEGIN { \ + if((pErrcode)==NULL || U_FAILURE(*pErrcode)) return; \ +} UPRV_BLOCK_MACRO_END +#define RETURN_VOID_IF_NOT_VALID_PARA(bidi, errcode) UPRV_BLOCK_MACRO_BEGIN { \ + if(!IS_VALID_PARA(bidi)) { \ + errcode=U_INVALID_STATE_ERROR; \ + return; \ + } \ +} UPRV_BLOCK_MACRO_END +#define RETURN_VOID_IF_NOT_VALID_PARA_OR_LINE(bidi, errcode) UPRV_BLOCK_MACRO_BEGIN { \ + if(!IS_VALID_PARA_OR_LINE(bidi)) { \ + errcode=U_INVALID_STATE_ERROR; \ + return; \ + } \ +} UPRV_BLOCK_MACRO_END +#define RETURN_VOID_IF_BAD_RANGE(arg, start, limit, errcode) UPRV_BLOCK_MACRO_BEGIN { \ + if((arg)<(start) || (arg)>=(limit)) { \ + (errcode)=U_ILLEGAL_ARGUMENT_ERROR; \ + return; \ + } \ +} UPRV_BLOCK_MACRO_END /* helper function to (re)allocate memory if allowed */ U_CFUNC UBool diff --git a/deps/icu-small/source/common/ubiditransform.cpp b/deps/icu-small/source/common/ubiditransform.cpp index 394df6092d21b1..bb3ce8cb934d43 100644 --- a/deps/icu-small/source/common/ubiditransform.cpp +++ b/deps/icu-small/source/common/ubiditransform.cpp @@ -31,11 +31,11 @@ #define SHAPE_LOGICAL U_SHAPE_TEXT_DIRECTION_LOGICAL #define SHAPE_VISUAL U_SHAPE_TEXT_DIRECTION_VISUAL_LTR -#define CHECK_LEN(STR, LEN, ERROR) { \ - if (LEN == 0) return 0; \ - if (LEN < -1) { *(ERROR) = U_ILLEGAL_ARGUMENT_ERROR; return 0; } \ - if (LEN == -1) LEN = u_strlen(STR); \ - } +#define CHECK_LEN(STR, LEN, ERROR) UPRV_BLOCK_MACRO_BEGIN { \ + if (LEN == 0) return 0; \ + if (LEN < -1) { *(ERROR) = U_ILLEGAL_ARGUMENT_ERROR; return 0; } \ + if (LEN == -1) LEN = u_strlen(STR); \ +} UPRV_BLOCK_MACRO_END #define MAX_ACTIONS 7 diff --git a/deps/icu-small/source/common/ucase.cpp b/deps/icu-small/source/common/ucase.cpp index 50c8d20c1fce73..57a40327905c00 100644 --- a/deps/icu-small/source/common/ucase.cpp +++ b/deps/icu-small/source/common/ucase.cpp @@ -116,7 +116,7 @@ static const uint8_t flagsOffset[256]={ * moved to the last uint16_t of the value, use +1 for beginning of next slot * @param value (out) int32_t or uint32_t output if hasSlot, otherwise not modified */ -#define GET_SLOT_VALUE(excWord, idx, pExc16, value) \ +#define GET_SLOT_VALUE(excWord, idx, pExc16, value) UPRV_BLOCK_MACRO_BEGIN { \ if(((excWord)&UCASE_EXC_DOUBLE_SLOTS)==0) { \ (pExc16)+=SLOT_OFFSET(excWord, idx); \ (value)=*pExc16; \ @@ -124,7 +124,8 @@ static const uint8_t flagsOffset[256]={ (pExc16)+=2*SLOT_OFFSET(excWord, idx); \ (value)=*pExc16++; \ (value)=((value)<<16)|*pExc16; \ - } + } \ +} UPRV_BLOCK_MACRO_END /* simple case mappings ----------------------------------------------------- */ diff --git a/deps/icu-small/source/common/uchar.cpp b/deps/icu-small/source/common/uchar.cpp index 60fe75c78dec03..12365fd6976e5b 100644 --- a/deps/icu-small/source/common/uchar.cpp +++ b/deps/icu-small/source/common/uchar.cpp @@ -40,7 +40,7 @@ /* constants and macros for access to the data ------------------------------ */ /* getting a uint32_t properties word from the data */ -#define GET_PROPS(c, result) ((result)=UTRIE2_GET16(&propsTrie, c)); +#define GET_PROPS(c, result) ((result)=UTRIE2_GET16(&propsTrie, c)) /* API functions ------------------------------------------------------------ */ diff --git a/deps/icu-small/source/common/uchriter.cpp b/deps/icu-small/source/common/uchriter.cpp index 822168f5c8e600..bedbabc74c2351 100644 --- a/deps/icu-small/source/common/uchriter.cpp +++ b/deps/icu-small/source/common/uchriter.cpp @@ -89,7 +89,7 @@ UCharCharacterIterator::hashCode() const { return ustr_hashUCharsN(text, textLength) ^ pos ^ begin ^ end; } -CharacterIterator* +UCharCharacterIterator* UCharCharacterIterator::clone() const { return new UCharCharacterIterator(*this); } diff --git a/deps/icu-small/source/common/ucln_cmn.cpp b/deps/icu-small/source/common/ucln_cmn.cpp index d78491df419fb0..ab9d3adbd25958 100644 --- a/deps/icu-small/source/common/ucln_cmn.cpp +++ b/deps/icu-small/source/common/ucln_cmn.cpp @@ -65,9 +65,20 @@ U_CFUNC void ucln_common_registerCleanup(ECleanupCommonType type, cleanupFunc *func) { + // Thread safety messiness: From ticket 10295, calls to registerCleanup() may occur + // concurrently. Although such cases should be storing the same value, they raise errors + // from the thread sanity checker. Doing the store within a mutex avoids those. + // BUT that can trigger a recursive entry into std::call_once() in umutex.cpp when this code, + // running from the call_once function, tries to grab the ICU global mutex, which + // re-enters the mutex init path. So, work-around by special casing UCLN_COMMON_MUTEX, not + // using the ICU global mutex for it. + // + // No other point in ICU uses std::call_once(). + U_ASSERT(UCLN_COMMON_START < type && type < UCLN_COMMON_COUNT); - if (UCLN_COMMON_START < type && type < UCLN_COMMON_COUNT) - { + if (type == UCLN_COMMON_MUTEX) { + gCommonCleanupFunctions[type] = func; + } else if (UCLN_COMMON_START < type && type < UCLN_COMMON_COUNT) { icu::Mutex m; // See ticket 10295 for discussion. gCommonCleanupFunctions[type] = func; } diff --git a/deps/icu-small/source/common/ucln_cmn.h b/deps/icu-small/source/common/ucln_cmn.h index 0ca911b47d9875..b837fb946296a1 100644 --- a/deps/icu-small/source/common/ucln_cmn.h +++ b/deps/icu-small/source/common/ucln_cmn.h @@ -22,8 +22,6 @@ /* These are the cleanup functions for various APIs. */ /* @return true if cleanup complete successfully.*/ -U_CFUNC UBool umtx_cleanup(void); - U_CFUNC UBool utrace_cleanup(void); U_CFUNC UBool ucln_lib_cleanup(void); @@ -41,6 +39,8 @@ typedef enum ECleanupCommonType { UCLN_COMMON_LOCALE_KEY_TYPE, UCLN_COMMON_LOCALE, UCLN_COMMON_LOCALE_AVAILABLE, + UCLN_COMMON_LIKELY_SUBTAGS, + UCLN_COMMON_LOCALE_DISTANCE, UCLN_COMMON_ULOC, UCLN_COMMON_CURRENCY, UCLN_COMMON_LOADED_NORMALIZER2, @@ -62,6 +62,7 @@ typedef enum ECleanupCommonType { */ UCLN_COMMON_UNIFIED_CACHE, UCLN_COMMON_URES, + UCLN_COMMON_MUTEX, // Mutexes should be the last to be cleaned up. UCLN_COMMON_COUNT /* This must be last */ } ECleanupCommonType; diff --git a/deps/icu-small/source/common/ucnv.cpp b/deps/icu-small/source/common/ucnv.cpp index abf302eaddb7a8..e2e0c5b9f7f42f 100644 --- a/deps/icu-small/source/common/ucnv.cpp +++ b/deps/icu-small/source/common/ucnv.cpp @@ -25,6 +25,8 @@ #if !UCONFIG_NO_CONVERSION +#include + #include "unicode/ustring.h" #include "unicode/ucnv.h" #include "unicode/ucnv_err.h" @@ -158,7 +160,6 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U UConverter *localConverter, *allocatedConverter; int32_t stackBufferSize; int32_t bufferSizeNeeded; - char *stackBufferChars = (char *)stackBuffer; UErrorCode cbErr; UConverterToUnicodeArgs toUArgs = { sizeof(UConverterToUnicodeArgs), @@ -224,23 +225,22 @@ ucnv_safeClone(const UConverter* cnv, void *stackBuffer, int32_t *pBufferSize, U } } - - /* Pointers on 64-bit platforms need to be aligned - * on a 64-bit boundary in memory. + /* Adjust (if necessary) the stackBuffer pointer to be aligned correctly for a UConverter. + * TODO(Jira ICU-20736) Redo this using std::align() once g++4.9 compatibility is no longer needed. */ - if (U_ALIGNMENT_OFFSET(stackBuffer) != 0) { - int32_t offsetUp = (int32_t)U_ALIGNMENT_OFFSET_UP(stackBufferChars); - if(stackBufferSize > offsetUp) { - stackBufferSize -= offsetUp; - stackBufferChars += offsetUp; + if (stackBuffer) { + uintptr_t p = reinterpret_cast(stackBuffer); + uintptr_t aligned_p = (p + alignof(UConverter) - 1) & ~(alignof(UConverter) - 1); + ptrdiff_t pointerAdjustment = aligned_p - p; + if (bufferSizeNeeded + pointerAdjustment <= stackBufferSize) { + stackBuffer = reinterpret_cast(aligned_p); + stackBufferSize -= pointerAdjustment; } else { /* prevent using the stack buffer but keep the size > 0 so that we do not just preflight */ stackBufferSize = 1; } } - stackBuffer = (void *)stackBufferChars; - /* Now, see if we must allocate any memory */ if (stackBufferSize < bufferSizeNeeded || stackBuffer == NULL) { @@ -475,7 +475,7 @@ ucnv_setSubstString(UConverter *cnv, const UChar *s, int32_t length, UErrorCode *err) { - UAlignedMemory cloneBuffer[U_CNV_SAFECLONE_BUFFERSIZE / sizeof(UAlignedMemory) + 1]; + alignas(UConverter) char cloneBuffer[U_CNV_SAFECLONE_BUFFERSIZE]; char chars[UCNV_ERROR_BUFFER_LENGTH]; UConverter *clone; diff --git a/deps/icu-small/source/common/ucnv2022.cpp b/deps/icu-small/source/common/ucnv2022.cpp index 4a35ff85e10fa0..6cd9a3d12e40fc 100644 --- a/deps/icu-small/source/common/ucnv2022.cpp +++ b/deps/icu-small/source/common/ucnv2022.cpp @@ -3571,20 +3571,11 @@ _ISO_2022_WriteSub(UConverterFromUnicodeArgs *args, int32_t offsetIndex, UErrorC /* * Structure for cloning an ISO 2022 converter into a single memory block. - * ucnv_safeClone() of the converter will align the entire cloneStruct, - * and then ucnv_safeClone() of the sub-converter may additionally align - * currentConverter inside the cloneStruct, for which we need the deadSpace - * after currentConverter. - * This is because UAlignedMemory may be larger than the actually - * necessary alignment size for the platform. - * The other cloneStruct fields will not be moved around, - * and are aligned properly with cloneStruct's alignment. */ struct cloneStruct { UConverter cnv; UConverter currentConverter; - UAlignedMemory deadSpace; UConverterDataISO2022 mydata; }; @@ -3602,6 +3593,10 @@ _ISO_2022_SafeClone( UConverterDataISO2022 *cnvData; int32_t i, size; + if (U_FAILURE(*status)){ + return nullptr; + } + if (*pBufferSize == 0) { /* 'preflighting' request - set needed size into *pBufferSize */ *pBufferSize = (int32_t)sizeof(struct cloneStruct); return NULL; @@ -3619,7 +3614,7 @@ _ISO_2022_SafeClone( /* share the subconverters */ if(cnvData->currentConverter != NULL) { - size = (int32_t)(sizeof(UConverter) + sizeof(UAlignedMemory)); /* include size of padding */ + size = (int32_t)sizeof(UConverter); localClone->mydata.currentConverter = ucnv_safeClone(cnvData->currentConverter, &localClone->currentConverter, diff --git a/deps/icu-small/source/common/ucnv_bld.cpp b/deps/icu-small/source/common/ucnv_bld.cpp index e6ef833f4e4317..1c2363ea89981f 100644 --- a/deps/icu-small/source/common/ucnv_bld.cpp +++ b/deps/icu-small/source/common/ucnv_bld.cpp @@ -194,10 +194,7 @@ static struct { /*initializes some global variables */ static UHashtable *SHARED_DATA_HASHTABLE = NULL; -static icu::UMutex *cnvCacheMutex() { /* Mutex for synchronizing cnv cache access. */ - static icu::UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static icu::UMutex cnvCacheMutex; /* Note: the global mutex is used for */ /* reference count updates. */ @@ -602,9 +599,9 @@ U_CFUNC void ucnv_unloadSharedDataIfReady(UConverterSharedData *sharedData) { if(sharedData != NULL && sharedData->isReferenceCounted) { - umtx_lock(cnvCacheMutex()); + umtx_lock(&cnvCacheMutex); ucnv_unload(sharedData); - umtx_unlock(cnvCacheMutex()); + umtx_unlock(&cnvCacheMutex); } } @@ -612,9 +609,9 @@ U_CFUNC void ucnv_incrementRefCount(UConverterSharedData *sharedData) { if(sharedData != NULL && sharedData->isReferenceCounted) { - umtx_lock(cnvCacheMutex()); + umtx_lock(&cnvCacheMutex); sharedData->referenceCounter++; - umtx_unlock(cnvCacheMutex()); + umtx_unlock(&cnvCacheMutex); } } @@ -815,9 +812,9 @@ ucnv_loadSharedData(const char *converterName, pArgs->nestedLoads=1; pArgs->pkg=NULL; - umtx_lock(cnvCacheMutex()); + umtx_lock(&cnvCacheMutex); mySharedConverterData = ucnv_load(pArgs, err); - umtx_unlock(cnvCacheMutex()); + umtx_unlock(&cnvCacheMutex); if (U_FAILURE (*err) || (mySharedConverterData == NULL)) { return NULL; @@ -1064,7 +1061,7 @@ ucnv_flushCache () * because the sequence of looking up in the cache + incrementing * is protected by cnvCacheMutex. */ - umtx_lock(cnvCacheMutex()); + umtx_lock(&cnvCacheMutex); /* * double loop: A delta/extension-only converter has a pointer to its base table's * shared data; the first iteration of the outer loop may see the delta converter @@ -1093,7 +1090,7 @@ ucnv_flushCache () } } } while(++i == 1 && remaining > 0); - umtx_unlock(cnvCacheMutex()); + umtx_unlock(&cnvCacheMutex); UTRACE_DATA1(UTRACE_INFO, "ucnv_flushCache() exits with %d converters remaining", remaining); @@ -1199,7 +1196,7 @@ internalSetName(const char *name, UErrorCode *status) { } algorithmicSharedData = getAlgorithmicTypeFromName(stackArgs.name); - umtx_lock(cnvCacheMutex()); + umtx_lock(&cnvCacheMutex); gDefaultAlgorithmicSharedData = algorithmicSharedData; gDefaultConverterContainsOption = containsOption; @@ -1215,7 +1212,7 @@ internalSetName(const char *name, UErrorCode *status) { ucnv_enableCleanup(); - umtx_unlock(cnvCacheMutex()); + umtx_unlock(&cnvCacheMutex); } #endif @@ -1240,7 +1237,7 @@ ucnv_getDefaultName() { but ucnv_setDefaultName is not thread safe. */ { - icu::Mutex lock(cnvCacheMutex()); + icu::Mutex lock(&cnvCacheMutex); name = gDefaultConverterName; } if(name==NULL) { diff --git a/deps/icu-small/source/common/ucnv_lmb.cpp b/deps/icu-small/source/common/ucnv_lmb.cpp index 6dd8e83428a0af..5e7cfde353d7e3 100644 --- a/deps/icu-small/source/common/ucnv_lmb.cpp +++ b/deps/icu-small/source/common/ucnv_lmb.cpp @@ -1107,11 +1107,13 @@ GetUniFromLMBCSUni(char const ** ppLMBCSin) /* Called with LMBCS-style Unicode all input as required by ICU converter semantics. */ -#define CHECK_SOURCE_LIMIT(index) \ - if (args->source+index > args->sourceLimit){\ - *err = U_TRUNCATED_CHAR_FOUND;\ - args->source = args->sourceLimit;\ - return 0xffff;} +#define CHECK_SOURCE_LIMIT(index) UPRV_BLOCK_MACRO_BEGIN { \ + if (args->source+index > args->sourceLimit) { \ + *err = U_TRUNCATED_CHAR_FOUND; \ + args->source = args->sourceLimit; \ + return 0xffff; \ + } \ +} UPRV_BLOCK_MACRO_END /* Return the Unicode representation for the current LMBCS character */ diff --git a/deps/icu-small/source/common/ucnvbocu.cpp b/deps/icu-small/source/common/ucnvbocu.cpp index 5b66c5059a55ba..7c2aab56558c8c 100644 --- a/deps/icu-small/source/common/ucnvbocu.cpp +++ b/deps/icu-small/source/common/ucnvbocu.cpp @@ -202,14 +202,14 @@ bocu1TrailToByte[BOCU1_TRAIL_CONTROLS_COUNT]={ * @param d Divisor. * @param m Output variable for the rest (modulo result). */ -#define NEGDIVMOD(n, d, m) { \ +#define NEGDIVMOD(n, d, m) UPRV_BLOCK_MACRO_BEGIN { \ (m)=(n)%(d); \ (n)/=(d); \ if((m)<0) { \ --(n); \ (m)+=(d); \ } \ -} +} UPRV_BLOCK_MACRO_END /* Faster versions of packDiff() for single-byte-encoded diff values. */ diff --git a/deps/icu-small/source/common/ucnvhz.cpp b/deps/icu-small/source/common/ucnvhz.cpp index 31595374696d8c..b26cf78289dcab 100644 --- a/deps/icu-small/source/common/ucnvhz.cpp +++ b/deps/icu-small/source/common/ucnvhz.cpp @@ -38,7 +38,7 @@ #define ESC_LEN 2 -#define CONCAT_ESCAPE_MACRO( args, targetIndex,targetLength,strToAppend, err, len,sourceIndex){ \ +#define CONCAT_ESCAPE_MACRO(args, targetIndex,targetLength,strToAppend, err, len,sourceIndex) UPRV_BLOCK_MACRO_BEGIN { \ while(len-->0){ \ if(targetIndex < targetLength){ \ args->target[targetIndex] = (unsigned char) *strToAppend; \ @@ -53,7 +53,7 @@ } \ strToAppend++; \ } \ -} +} UPRV_BLOCK_MACRO_END typedef struct{ @@ -518,19 +518,11 @@ _HZ_WriteSub(UConverterFromUnicodeArgs *args, int32_t offsetIndex, UErrorCode *e /* * Structure for cloning an HZ converter into a single memory block. - * ucnv_safeClone() of the HZ converter will align the entire cloneHZStruct, - * and then ucnv_safeClone() of the sub-converter may additionally align - * subCnv inside the cloneHZStruct, for which we need the deadSpace after - * subCnv. This is because UAlignedMemory may be larger than the actually - * necessary alignment size for the platform. - * The other cloneHZStruct fields will not be moved around, - * and are aligned properly with cloneHZStruct's alignment. */ struct cloneHZStruct { UConverter cnv; UConverter subCnv; - UAlignedMemory deadSpace; UConverterDataHZ mydata; }; @@ -545,12 +537,12 @@ _HZ_SafeClone(const UConverter *cnv, int32_t size, bufferSizeNeeded = sizeof(struct cloneHZStruct); if (U_FAILURE(*status)){ - return 0; + return nullptr; } if (*pBufferSize == 0){ /* 'preflighting' request - set needed size into *pBufferSize */ *pBufferSize = bufferSizeNeeded; - return 0; + return nullptr; } localClone = (struct cloneHZStruct *)stackBuffer; @@ -561,7 +553,7 @@ _HZ_SafeClone(const UConverter *cnv, localClone->cnv.isExtraLocal = TRUE; /* deep-clone the sub-converter */ - size = (int32_t)(sizeof(UConverter) + sizeof(UAlignedMemory)); /* include size of padding */ + size = (int32_t)sizeof(UConverter); ((UConverterDataHZ*)localClone->cnv.extraInfo)->gbConverter = ucnv_safeClone(((UConverterDataHZ*)cnv->extraInfo)->gbConverter, &localClone->subCnv, &size, status); diff --git a/deps/icu-small/source/common/ucnvisci.cpp b/deps/icu-small/source/common/ucnvisci.cpp index d0c07f2b27fae9..c1ab06e137ee22 100644 --- a/deps/icu-small/source/common/ucnvisci.cpp +++ b/deps/icu-small/source/common/ucnvisci.cpp @@ -831,7 +831,7 @@ static const uint16_t nuktaSpecialCases[][2]={ }; -#define WRITE_TO_TARGET_FROM_U(args,offsets,source,target,targetLimit,targetByteUnit,err){ \ +#define WRITE_TO_TARGET_FROM_U(args,offsets,source,target,targetLimit,targetByteUnit,err) UPRV_BLOCK_MACRO_BEGIN { \ int32_t offset = (int32_t)(source - args->source-1); \ /* write the targetUniChar to target */ \ if(target < targetLimit){ \ @@ -884,7 +884,7 @@ static const uint16_t nuktaSpecialCases[][2]={ (uint8_t) (targetByteUnit); \ *err = U_BUFFER_OVERFLOW_ERROR; \ } \ -} +} UPRV_BLOCK_MACRO_END /* Rules: * Explicit Halant : @@ -1119,7 +1119,7 @@ static const uint16_t lookupTable[][2]={ { GURMUKHI, PNJ_MASK } }; -#define WRITE_TO_TARGET_TO_U(args,source,target,offsets,offset,targetUniChar,delta, err){\ +#define WRITE_TO_TARGET_TO_U(args,source,target,offsets,offset,targetUniChar,delta, err) UPRV_BLOCK_MACRO_BEGIN { \ /* add offset to current Indic Block */ \ if(targetUniChar>ASCII_END && \ targetUniChar != ZWJ && \ @@ -1140,9 +1140,9 @@ static const uint16_t lookupTable[][2]={ (UChar)targetUniChar; \ *err = U_BUFFER_OVERFLOW_ERROR; \ } \ -} +} UPRV_BLOCK_MACRO_END -#define GET_MAPPING(sourceChar,targetUniChar,data){ \ +#define GET_MAPPING(sourceChar,targetUniChar,data) UPRV_BLOCK_MACRO_BEGIN { \ targetUniChar = toUnicodeTable[(sourceChar)] ; \ /* is the code point valid in current script? */ \ if(sourceChar> ASCII_END && \ @@ -1153,7 +1153,7 @@ static const uint16_t lookupTable[][2]={ targetUniChar=missingCharMarker; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /*********** * Rules for ISCII to Unicode converter diff --git a/deps/icu-small/source/common/ucnvsel.cpp b/deps/icu-small/source/common/ucnvsel.cpp index 6ccee1ae61fd70..07b55022c346e8 100644 --- a/deps/icu-small/source/common/ucnvsel.cpp +++ b/deps/icu-small/source/common/ucnvsel.cpp @@ -691,36 +691,36 @@ static int16_t countOnes(uint32_t* mask, int32_t len) { /* internal function! */ static UEnumeration *selectForMask(const UConverterSelector* sel, - uint32_t *mask, UErrorCode *status) { + uint32_t *theMask, UErrorCode *status) { + LocalMemory mask(theMask); // this is the context we will use. Store a table of indices to which // encodings are legit. - struct Enumerator* result = (Enumerator*)uprv_malloc(sizeof(Enumerator)); - if (result == NULL) { - uprv_free(mask); + LocalMemory result(static_cast(uprv_malloc(sizeof(Enumerator)))); + if (result.isNull()) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - result->index = NULL; // this will be allocated later! + result->index = nullptr; // this will be allocated later! result->length = result->cur = 0; result->sel = sel; - UEnumeration *en = (UEnumeration *)uprv_malloc(sizeof(UEnumeration)); - if (en == NULL) { + LocalMemory en(static_cast(uprv_malloc(sizeof(UEnumeration)))); + if (en.isNull()) { // TODO(markus): Combine Enumerator and UEnumeration into one struct. - uprv_free(mask); - uprv_free(result); *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - memcpy(en, &defaultEncodings, sizeof(UEnumeration)); - en->context = result; + memcpy(en.getAlias(), &defaultEncodings, sizeof(UEnumeration)); int32_t columns = (sel->encodingsCount+31)/32; - int16_t numOnes = countOnes(mask, columns); + int16_t numOnes = countOnes(mask.getAlias(), columns); // now, we know the exact space we need for index if (numOnes > 0) { - result->index = (int16_t*) uprv_malloc(numOnes * sizeof(int16_t)); - + result->index = static_cast(uprv_malloc(numOnes * sizeof(int16_t))); + if (result->index == nullptr) { + *status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } int32_t i, j; int16_t k = 0; for (j = 0 ; j < columns; j++) { @@ -734,8 +734,8 @@ static UEnumeration *selectForMask(const UConverterSelector* sel, } } //otherwise, index will remain NULL (and will never be touched by //the enumerator code anyway) - uprv_free(mask); - return en; + en->context = result.orphan(); + return en.orphan(); } /* check a string against the selector - UTF16 version */ diff --git a/deps/icu-small/source/common/ucptrie.cpp b/deps/icu-small/source/common/ucptrie.cpp index b72e318387a186..0004160a238b0e 100644 --- a/deps/icu-small/source/common/ucptrie.cpp +++ b/deps/icu-small/source/common/ucptrie.cpp @@ -280,7 +280,7 @@ UChar32 getRange(const void *t, UChar32 start, int32_t prevI3Block = -1; int32_t prevBlock = -1; UChar32 c = start; - uint32_t trieValue, value; + uint32_t trieValue, value = nullValue; bool haveValue = false; do { int32_t i3Block; diff --git a/deps/icu-small/source/common/ucurr.cpp b/deps/icu-small/source/common/ucurr.cpp index dba3247fef2c98..d42c2f10b1d4c6 100644 --- a/deps/icu-small/source/common/ucurr.cpp +++ b/deps/icu-small/source/common/ucurr.cpp @@ -365,10 +365,7 @@ U_CDECL_END #if !UCONFIG_NO_SERVICE struct CReg; -static UMutex *gCRegLock() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gCRegLock; static CReg* gCRegHead = 0; struct CReg : public icu::UMemory { @@ -394,14 +391,14 @@ struct CReg : public icu::UMemory { if (status && U_SUCCESS(*status) && _iso && _id) { CReg* n = new CReg(_iso, _id); if (n) { - umtx_lock(gCRegLock()); + umtx_lock(&gCRegLock); if (!gCRegHead) { /* register for the first time */ ucln_common_registerCleanup(UCLN_COMMON_CURRENCY, currency_cleanup); } n->next = gCRegHead; gCRegHead = n; - umtx_unlock(gCRegLock()); + umtx_unlock(&gCRegLock); return n; } *status = U_MEMORY_ALLOCATION_ERROR; @@ -411,7 +408,7 @@ struct CReg : public icu::UMemory { static UBool unreg(UCurrRegistryKey key) { UBool found = FALSE; - umtx_lock(gCRegLock()); + umtx_lock(&gCRegLock); CReg** p = &gCRegHead; while (*p) { @@ -424,13 +421,13 @@ struct CReg : public icu::UMemory { p = &((*p)->next); } - umtx_unlock(gCRegLock()); + umtx_unlock(&gCRegLock); return found; } static const UChar* get(const char* id) { const UChar* result = NULL; - umtx_lock(gCRegLock()); + umtx_lock(&gCRegLock); CReg* p = gCRegHead; /* register cleanup of the mutex */ @@ -442,7 +439,7 @@ struct CReg : public icu::UMemory { } p = p->next; } - umtx_unlock(gCRegLock()); + umtx_unlock(&gCRegLock); return result; } @@ -716,7 +713,9 @@ ucurr_getName(const UChar* currency, // We no longer support choice format data in names. Data should not contain // choice patterns. - *isChoiceFormat = FALSE; + if (isChoiceFormat != NULL) { + *isChoiceFormat = FALSE; + } if (U_SUCCESS(ec2)) { U_ASSERT(s != NULL); return s; @@ -1356,10 +1355,7 @@ static CurrencyNameCacheEntry* currCache[CURRENCY_NAME_CACHE_NUM] = {NULL}; // It is a simple round-robin replacement strategy. static int8_t currentCacheEntryIndex = 0; -static UMutex *gCurrencyCacheMutex() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gCurrencyCacheMutex; // Cache deletion static void @@ -1408,7 +1404,7 @@ getCacheEntry(const char* locale, UErrorCode& ec) { CurrencyNameStruct* currencySymbols = NULL; CurrencyNameCacheEntry* cacheEntry = NULL; - umtx_lock(gCurrencyCacheMutex()); + umtx_lock(&gCurrencyCacheMutex); // in order to handle racing correctly, // not putting 'search' in a separate function. int8_t found = -1; @@ -1423,13 +1419,13 @@ getCacheEntry(const char* locale, UErrorCode& ec) { cacheEntry = currCache[found]; ++(cacheEntry->refCount); } - umtx_unlock(gCurrencyCacheMutex()); + umtx_unlock(&gCurrencyCacheMutex); if (found == -1) { collectCurrencyNames(locale, ¤cyNames, &total_currency_name_count, ¤cySymbols, &total_currency_symbol_count, ec); if (U_FAILURE(ec)) { return NULL; } - umtx_lock(gCurrencyCacheMutex()); + umtx_lock(&gCurrencyCacheMutex); // check again. for (int8_t i = 0; i < CURRENCY_NAME_CACHE_NUM; ++i) { if (currCache[i]!= NULL && @@ -1468,19 +1464,19 @@ getCacheEntry(const char* locale, UErrorCode& ec) { cacheEntry = currCache[found]; ++(cacheEntry->refCount); } - umtx_unlock(gCurrencyCacheMutex()); + umtx_unlock(&gCurrencyCacheMutex); } return cacheEntry; } static void releaseCacheEntry(CurrencyNameCacheEntry* cacheEntry) { - umtx_lock(gCurrencyCacheMutex()); + umtx_lock(&gCurrencyCacheMutex); --(cacheEntry->refCount); if (cacheEntry->refCount == 0) { // remove deleteCacheEntry(cacheEntry); } - umtx_unlock(gCurrencyCacheMutex()); + umtx_unlock(&gCurrencyCacheMutex); } U_CAPI void @@ -1601,10 +1597,9 @@ uprv_getStaticCurrencyName(const UChar* iso, const char* loc, { U_NAMESPACE_USE - UBool isChoiceFormat; int32_t len; const UChar* currname = ucurr_getName(iso, loc, UCURR_SYMBOL_NAME, - &isChoiceFormat, &len, &ec); + nullptr /* isChoiceFormat */, &len, &ec); if (U_SUCCESS(ec)) { result.setTo(currname, len); } diff --git a/deps/icu-small/source/common/udata.cpp b/deps/icu-small/source/common/udata.cpp index 99efbc97eed737..f2faa82777a233 100644 --- a/deps/icu-small/source/common/udata.cpp +++ b/deps/icu-small/source/common/udata.cpp @@ -33,6 +33,7 @@ might have to #include some other header #include "cstring.h" #include "mutex.h" #include "putilimp.h" +#include "restrace.h" #include "uassert.h" #include "ucln_cmn.h" #include "ucmndata.h" @@ -110,11 +111,12 @@ static u_atomic_int32_t gHaveTriedToLoadCommonData = ATOMIC_INT32_T_INITIALIZER( static UHashtable *gCommonDataCache = NULL; /* Global hash table of opened ICU data files. */ static icu::UInitOnce gCommonDataCacheInitOnce = U_INITONCE_INITIALIZER; -#if U_PLATFORM_HAS_WINUWP_API == 0 +#if !defined(ICU_DATA_DIR_WINDOWS) static UDataFileAccess gDataFileAccess = UDATA_DEFAULT_ACCESS; // Access not synchronized. // Modifying is documented as thread-unsafe. #else -static UDataFileAccess gDataFileAccess = UDATA_NO_FILES; // Windows UWP looks in one spot explicitly +// If we are using the Windows data directory, then look in one spot only. +static UDataFileAccess gDataFileAccess = UDATA_NO_FILES; #endif static UBool U_CALLCONV @@ -206,7 +208,7 @@ setCommonICUData(UDataMemory *pData, /* The new common data. Belongs to ca return didUpdate; } -#if U_PLATFORM_HAS_WINUWP_API == 0 +#if !defined(ICU_DATA_DIR_WINDOWS) static UBool setCommonICUDataPointer(const void *pData, UBool /*warn*/, UErrorCode *pErrorCode) { @@ -320,7 +322,7 @@ static UDataMemory *udata_findCachedData(const char *path, UErrorCode &err) retVal = el->item; } #ifdef UDATA_DEBUG - fprintf(stderr, "Cache: [%s] -> %p\n", baseName, retVal); + fprintf(stderr, "Cache: [%s] -> %p\n", baseName, (void*) retVal); #endif return retVal; } @@ -383,7 +385,7 @@ static UDataMemory *udata_cacheDataItem(const char *path, UDataMemory *item, UEr #ifdef UDATA_DEBUG fprintf(stderr, "Cache: [%s] <<< %p : %s. vFunc=%p\n", newElement->name, - newElement->item, u_errorName(subErr), newElement->item->vFuncs); + (void*) newElement->item, u_errorName(subErr), (void*) newElement->item->vFuncs); #endif if (subErr == U_USING_DEFAULT_WARNING || U_FAILURE(subErr)) { @@ -477,7 +479,7 @@ UDataPathIterator::UDataPathIterator(const char *inPath, const char *pkg, nextPath = itemPath.data(); } #ifdef UDATA_DEBUG - fprintf(stderr, "SUFFIX=%s [%p]\n", inSuffix, inSuffix); + fprintf(stderr, "SUFFIX=%s [%p]\n", inSuffix, (void*) inSuffix); #endif /** Suffix **/ @@ -492,12 +494,11 @@ UDataPathIterator::UDataPathIterator(const char *inPath, const char *pkg, /* pathBuffer will hold the output path strings returned by this iterator */ #ifdef UDATA_DEBUG - fprintf(stderr, "%p: init %s -> [path=%s], [base=%s], [suff=%s], [itempath=%s], [nextpath=%s], [checklast4=%s]\n", - iter, + fprintf(stderr, "0: init %s -> [path=%s], [base=%s], [suff=%s], [itempath=%s], [nextpath=%s], [checklast4=%s]\n", item, path, basename, - suffix, + suffix.data(), itemPath.data(), nextPath, checkLastFour?"TRUE":"false"); @@ -553,7 +554,7 @@ const char *UDataPathIterator::next(UErrorCode *pErrorCode) fprintf(stderr, "rest of path (IDD) = %s\n", currentPath); fprintf(stderr, " "); { - uint32_t qqq; + int32_t qqq; for(qqq=0;qqqpHeader == &U_ICUDATA_ENTRY_POINT) { @@ -714,7 +717,8 @@ openCommonData(const char *path, /* Path from OpenChoice? */ setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode); } */ -#if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP Platform does not support dll icu data at this time +#if !defined(ICU_DATA_DIR_WINDOWS) +// When using the Windows system data, we expect only a single data file. setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode); { Mutex lock; @@ -831,7 +835,7 @@ static UBool extendICUData(UErrorCode *pErr) * Use a specific mutex to avoid nested locks of the global mutex. */ #if MAP_IMPLEMENTATION==MAP_STDIO - static UMutex extendICUDataMutex = U_MUTEX_INITIALIZER; + static UMutex extendICUDataMutex; umtx_lock(&extendICUDataMutex); #endif if(!umtx_loadAcquire(gHaveTriedToLoadCommonData)) { @@ -1070,13 +1074,13 @@ static UDataMemory *doLoadFromCommonData(UBool isICUData, const char * /*pkgName /* look up the data piece in the common data */ pHeader=pCommonData->vFuncs->Lookup(pCommonData, tocEntryName, &length, subErrorCode); #ifdef UDATA_DEBUG - fprintf(stderr, "%s: pHeader=%p - %s\n", tocEntryName, pHeader, u_errorName(*subErrorCode)); + fprintf(stderr, "%s: pHeader=%p - %s\n", tocEntryName, (void*) pHeader, u_errorName(*subErrorCode)); #endif if(pHeader!=NULL) { pEntryData = checkDataItem(pHeader, isAcceptable, context, type, name, subErrorCode, pErrorCode); #ifdef UDATA_DEBUG - fprintf(stderr, "pEntryData=%p\n", pEntryData); + fprintf(stderr, "pEntryData=%p\n", (void*) pEntryData); #endif if (U_FAILURE(*pErrorCode)) { return NULL; @@ -1168,6 +1172,9 @@ doOpenChoice(const char *path, const char *type, const char *name, UBool isICUData = FALSE; + FileTracer::traceOpen(path, type, name); + + /* Is this path ICU data? */ if(path == NULL || !strcmp(path, U_ICUDATA_ALIAS) || /* "ICUDATA" */ @@ -1276,12 +1283,12 @@ doOpenChoice(const char *path, const char *type, const char *name, fprintf(stderr, " tocEntryPath = %s\n", tocEntryName.data()); #endif -#if U_PLATFORM_HAS_WINUWP_API == 0 // Windows UWP Platform does not support dll icu data at this time +#if !defined(ICU_DATA_DIR_WINDOWS) if(path == NULL) { path = COMMON_DATA_NAME; /* "icudt26e" */ } #else - // Windows UWP expects only a single data file. + // When using the Windows system data, we expects only a single data file. path = COMMON_DATA_NAME; /* "icudt26e" */ #endif diff --git a/deps/icu-small/source/common/uhash.cpp b/deps/icu-small/source/common/uhash.cpp index 79241a282913ed..86311ceb0b25d1 100644 --- a/deps/icu-small/source/common/uhash.cpp +++ b/deps/icu-small/source/common/uhash.cpp @@ -119,13 +119,14 @@ static const float RESIZE_POLICY_RATIO_TABLE[6] = { /* This macro expects a UHashTok.pointer as its keypointer and valuepointer parameters */ -#define HASH_DELETE_KEY_VALUE(hash, keypointer, valuepointer) \ - if (hash->keyDeleter != NULL && keypointer != NULL) { \ - (*hash->keyDeleter)(keypointer); \ - } \ - if (hash->valueDeleter != NULL && valuepointer != NULL) { \ - (*hash->valueDeleter)(valuepointer); \ - } +#define HASH_DELETE_KEY_VALUE(hash, keypointer, valuepointer) UPRV_BLOCK_MACRO_BEGIN { \ + if (hash->keyDeleter != NULL && keypointer != NULL) { \ + (*hash->keyDeleter)(keypointer); \ + } \ + if (hash->valueDeleter != NULL && valuepointer != NULL) { \ + (*hash->valueDeleter)(valuepointer); \ + } \ +} UPRV_BLOCK_MACRO_END /* * Constants for hinting whether a key or value is an integer diff --git a/deps/icu-small/source/common/uidna.cpp b/deps/icu-small/source/common/uidna.cpp index 6d56fcb8f517af..09347efd6d3c39 100644 --- a/deps/icu-small/source/common/uidna.cpp +++ b/deps/icu-small/source/common/uidna.cpp @@ -57,18 +57,16 @@ toASCIILower(UChar ch){ inline static UBool startsWithPrefix(const UChar* src , int32_t srcLength){ - UBool startsWithPrefix = TRUE; - if(srcLength < ACE_PREFIX_LENGTH){ return FALSE; } for(int8_t i=0; i< ACE_PREFIX_LENGTH; i++){ if(toASCIILower(src[i]) != ACE_PREFIX[i]){ - startsWithPrefix = FALSE; + return FALSE; } } - return startsWithPrefix; + return TRUE; } @@ -441,6 +439,7 @@ _internal_toUnicode(const UChar* src, int32_t srcLength, for(int32_t j=0; j 0x7f){ srcIsASCII = FALSE; + break; }/*else if(isLDHChar(src[j])==FALSE){ // here we do not assemble surrogates // since we know that LDH code points diff --git a/deps/icu-small/source/common/uinvchar.cpp b/deps/icu-small/source/common/uinvchar.cpp index 2e0f42d9274d2a..ac9716066f22b7 100644 --- a/deps/icu-small/source/common/uinvchar.cpp +++ b/deps/icu-small/source/common/uinvchar.cpp @@ -207,7 +207,8 @@ u_UCharsToChars(const UChar *us, char *cs, int32_t length) { while(length>0) { u=*us++; if(!UCHAR_IS_INVARIANT(u)) { - UPRV_UNREACHABLE; /* Variant characters were used. These are not portable in ICU. */ + U_ASSERT(FALSE); /* Variant characters were used. These are not portable in ICU. */ + u=0; } *cs++=(char)UCHAR_TO_CHAR(u); --length; @@ -445,6 +446,13 @@ uprv_copyEbcdic(const UDataSwapper *ds, return length; } +U_CFUNC UBool +uprv_isEbcdicAtSign(char c) { + static const uint8_t ebcdicAtSigns[] = { + 0x7C, 0x44, 0x66, 0x80, 0xAC, 0xAE, 0xAF, 0xB5, 0xEC, 0xEF, 0x00 }; + return c != 0 && uprv_strchr((const char *)ebcdicAtSigns, c) != nullptr; +} + /* compare invariant strings; variant characters compare less than others and unlike each other */ U_CFUNC int32_t uprv_compareInvAscii(const UDataSwapper *ds, @@ -561,6 +569,11 @@ uprv_compareInvEbcdicAsAscii(const char *s1, const char *s2) { } } +U_CAPI char U_EXPORT2 +uprv_ebcdicToAscii(char c) { + return (char)asciiFromEbcdic[(uint8_t)c]; +} + U_CAPI char U_EXPORT2 uprv_ebcdicToLowercaseAscii(char c) { return (char)lowercaseAsciiFromEbcdic[(uint8_t)c]; diff --git a/deps/icu-small/source/common/uinvchar.h b/deps/icu-small/source/common/uinvchar.h index 56dddfa8fde9bb..a43cfcd98286fe 100644 --- a/deps/icu-small/source/common/uinvchar.h +++ b/deps/icu-small/source/common/uinvchar.h @@ -68,6 +68,75 @@ uprv_isInvariantUString(const UChar *s, int32_t length); # error Unknown charset family! #endif +#ifdef __cplusplus + +U_NAMESPACE_BEGIN + +/** + * Like U_UPPER_ORDINAL(x) but with validation. + * Returns 0..25 for A..Z else a value outside 0..25. + */ +inline int32_t uprv_upperOrdinal(int32_t c) { +#if U_CHARSET_FAMILY==U_ASCII_FAMILY + return c - 'A'; +#elif U_CHARSET_FAMILY==U_EBCDIC_FAMILY + // EBCDIC: A-Z (26 letters) is split into three ranges A-I (9 letters), J-R (9), S-Z (8). + // https://en.wikipedia.org/wiki/EBCDIC_037#Codepage_layout + if (c <= 'I') { return c - 'A'; } // A-I --> 0-8 + if (c < 'J') { return -1; } + if (c <= 'R') { return c - 'J' + 9; } // J-R --> 9..17 + if (c < 'S') { return -1; } + return c - 'S' + 18; // S-Z --> 18..25 +#else +# error Unknown charset family! +#endif +} + +// Like U_UPPER_ORDINAL(x) but for lowercase and with validation. +// Returns 0..25 for a..z else a value outside 0..25. +inline int32_t uprv_lowerOrdinal(int32_t c) { +#if U_CHARSET_FAMILY==U_ASCII_FAMILY + return c - 'a'; +#elif U_CHARSET_FAMILY==U_EBCDIC_FAMILY + // EBCDIC: a-z (26 letters) is split into three ranges a-i (9 letters), j-r (9), s-z (8). + // https://en.wikipedia.org/wiki/EBCDIC_037#Codepage_layout + if (c <= 'i') { return c - 'a'; } // a-i --> 0-8 + if (c < 'j') { return -1; } + if (c <= 'r') { return c - 'j' + 9; } // j-r --> 9..17 + if (c < 's') { return -1; } + return c - 's' + 18; // s-z --> 18..25 +#else +# error Unknown charset family! +#endif +} + +U_NAMESPACE_END + +#endif + +/** + * Returns true if c == '@' is possible. + * The @ sign is variant, and the @ sign used on one + * EBCDIC machine won't be compiled the same way on other EBCDIC based machines. + * @internal + */ +U_CFUNC UBool +uprv_isEbcdicAtSign(char c); + +/** + * \def uprv_isAtSign + * Returns true if c == '@' is possible. + * For ASCII, checks for exactly '@'. For EBCDIC, calls uprv_isEbcdicAtSign(). + * @internal + */ +#if U_CHARSET_FAMILY==U_ASCII_FAMILY +# define uprv_isAtSign(c) ((c)=='@') +#elif U_CHARSET_FAMILY==U_EBCDIC_FAMILY +# define uprv_isAtSign(c) uprv_isEbcdicAtSign(c) +#else +# error Unknown charset family! +#endif + /** * Compare two EBCDIC invariant-character strings in ASCII order. * @internal @@ -88,6 +157,26 @@ uprv_compareInvEbcdicAsAscii(const char *s1, const char *s2); # error Unknown charset family! #endif +/** + * Converts an EBCDIC invariant character to ASCII. + * @internal + */ +U_INTERNAL char U_EXPORT2 +uprv_ebcdicToAscii(char c); + +/** + * \def uprv_invCharToAscii + * Converts an invariant character to ASCII. + * @internal + */ +#if U_CHARSET_FAMILY==U_ASCII_FAMILY +# define uprv_invCharToAscii(c) (c) +#elif U_CHARSET_FAMILY==U_EBCDIC_FAMILY +# define uprv_invCharToAscii(c) uprv_ebcdicToAscii(c) +#else +# error Unknown charset family! +#endif + /** * Converts an EBCDIC invariant character to lowercase ASCII. * @internal diff --git a/deps/icu-small/source/common/uloc.cpp b/deps/icu-small/source/common/uloc.cpp index 73b43204b814b9..6a9bfcfbff5999 100644 --- a/deps/icu-small/source/common/uloc.cpp +++ b/deps/icu-small/source/common/uloc.cpp @@ -148,7 +148,8 @@ static const char * const LANGUAGES[] = { "mad", "maf", "mag", "mai", "mak", "man", "mas", "mde", "mdf", "mdh", "mdr", "men", "mer", "mfe", "mg", "mga", "mgh", "mgo", "mh", "mi", "mic", "min", "mis", "mk", - "ml", "mn", "mnc", "mni", "moh", "mos", "mr", "mrj", + "ml", "mn", "mnc", "mni", "mo", + "moh", "mos", "mr", "mrj", "ms", "mt", "mua", "mul", "mus", "mwl", "mwr", "mwv", "my", "mye", "myv", "mzn", "na", "nan", "nap", "naq", "nb", "nd", "nds", "ne", @@ -264,7 +265,8 @@ static const char * const LANGUAGES_3[] = { "mad", "maf", "mag", "mai", "mak", "man", "mas", "mde", "mdf", "mdh", "mdr", "men", "mer", "mfe", "mlg", "mga", "mgh", "mgo", "mah", "mri", "mic", "min", "mis", "mkd", - "mal", "mon", "mnc", "mni", "moh", "mos", "mar", "mrj", + "mal", "mon", "mnc", "mni", "mol", + "moh", "mos", "mar", "mrj", "msa", "mlt", "mua", "mul", "mus", "mwl", "mwr", "mwv", "mya", "mye", "myv", "mzn", "nau", "nan", "nap", "naq", "nob", "nde", "nds", "nep", @@ -480,14 +482,15 @@ static const CanonicalizationMap CANONICALIZE_MAP[] = { /* Test if the locale id has BCP47 u extension and does not have '@' */ #define _hasBCP47Extension(id) (id && uprv_strstr(id, "@") == NULL && getShortestSubtagLength(localeID) == 1) /* Converts the BCP47 id to Unicode id. Does nothing to id if conversion fails */ -#define _ConvertBCP47(finalID, id, buffer, length,err) \ - if (uloc_forLanguageTag(id, buffer, length, NULL, err) <= 0 || \ - U_FAILURE(*err) || *err == U_STRING_NOT_TERMINATED_WARNING) { \ - finalID=id; \ - if (*err == U_STRING_NOT_TERMINATED_WARNING) { *err = U_BUFFER_OVERFLOW_ERROR; } \ - } else { \ - finalID=buffer; \ - } +#define _ConvertBCP47(finalID, id, buffer, length,err) UPRV_BLOCK_MACRO_BEGIN { \ + if (uloc_forLanguageTag(id, buffer, length, NULL, err) <= 0 || \ + U_FAILURE(*err) || *err == U_STRING_NOT_TERMINATED_WARNING) { \ + finalID=id; \ + if (*err == U_STRING_NOT_TERMINATED_WARNING) { *err = U_BUFFER_OVERFLOW_ERROR; } \ + } else { \ + finalID=buffer; \ + } \ +} UPRV_BLOCK_MACRO_END /* Gets the size of the shortest subtag in the given localeID. */ static int32_t getShortestSubtagLength(const char *localeID) { int32_t localeIDLength = static_cast(uprv_strlen(localeID)); @@ -1454,31 +1457,29 @@ static const UEnumeration gKeywordsEnum = { U_CAPI UEnumeration* U_EXPORT2 uloc_openKeywordList(const char *keywordList, int32_t keywordListSize, UErrorCode* status) { - UKeywordsContext *myContext = NULL; - UEnumeration *result = NULL; + LocalMemory myContext; + LocalMemory result; - if(U_FAILURE(*status)) { - return NULL; + if (U_FAILURE(*status)) { + return nullptr; } - result = (UEnumeration *)uprv_malloc(sizeof(UEnumeration)); - /* Null pointer test */ - if (result == NULL) { + myContext.adoptInstead(static_cast(uprv_malloc(sizeof(UKeywordsContext)))); + result.adoptInstead(static_cast(uprv_malloc(sizeof(UEnumeration)))); + if (myContext.isNull() || result.isNull()) { *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + return nullptr; } - uprv_memcpy(result, &gKeywordsEnum, sizeof(UEnumeration)); - myContext = static_cast(uprv_malloc(sizeof(UKeywordsContext))); - if (myContext == NULL) { + uprv_memcpy(result.getAlias(), &gKeywordsEnum, sizeof(UEnumeration)); + myContext->keywords = static_cast(uprv_malloc(keywordListSize+1)); + if (myContext->keywords == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - uprv_free(result); - return NULL; + return nullptr; } - myContext->keywords = (char *)uprv_malloc(keywordListSize+1); uprv_memcpy(myContext->keywords, keywordList, keywordListSize); myContext->keywords[keywordListSize] = 0; myContext->current = myContext->keywords; - result->context = myContext; - return result; + result->context = myContext.orphan(); + return result.orphan(); } U_CAPI UEnumeration* U_EXPORT2 diff --git a/deps/icu-small/source/common/uloc_tag.cpp b/deps/icu-small/source/common/uloc_tag.cpp index c732170cb62b9c..8f673541a76504 100644 --- a/deps/icu-small/source/common/uloc_tag.cpp +++ b/deps/icu-small/source/common/uloc_tag.cpp @@ -1558,10 +1558,8 @@ _appendLDMLExtensionAsKeywords(const char* ldmlext, ExtensionListEntry** appendT return; } - if (!_addAttributeToList(&attrFirst, attr)) { - *status = U_ILLEGAL_ARGUMENT_ERROR; - return; - } + // duplicate attribute is ignored, causes no error. + _addAttributeToList(&attrFirst, attr); /* next tag */ pTag += len; diff --git a/deps/icu-small/source/common/umutex.cpp b/deps/icu-small/source/common/umutex.cpp index 20b03d6cd3e416..ccbee9960a39e7 100644 --- a/deps/icu-small/source/common/umutex.cpp +++ b/deps/icu-small/source/common/umutex.cpp @@ -24,6 +24,7 @@ #include "unicode/utypes.h" #include "uassert.h" +#include "ucln_cmn.h" #include "cmemory.h" U_NAMESPACE_BEGIN @@ -35,60 +36,94 @@ U_NAMESPACE_BEGIN #error U_USER_MUTEX_CPP not supported #endif + /************************************************************************************************* * * ICU Mutex wrappers. * *************************************************************************************************/ -// The ICU global mutex. Used when ICU implementation code passes NULL for the mutex pointer. -static UMutex *globalMutex() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +namespace { +std::mutex *initMutex; +std::condition_variable *initCondition; -U_CAPI void U_EXPORT2 -umtx_lock(UMutex *mutex) { - if (mutex == nullptr) { - mutex = globalMutex(); - } - mutex->fMutex.lock(); -} +// The ICU global mutex. +// Used when ICU implementation code passes nullptr for the mutex pointer. +UMutex globalMutex; +std::once_flag initFlag; +std::once_flag *pInitFlag = &initFlag; -U_CAPI void U_EXPORT2 -umtx_unlock(UMutex* mutex) -{ - if (mutex == nullptr) { - mutex = globalMutex(); - } - mutex->fMutex.unlock(); -} +} // Anonymous namespace -UConditionVar::UConditionVar() : fCV() { +U_CDECL_BEGIN +static UBool U_CALLCONV umtx_cleanup() { + initMutex->~mutex(); + initCondition->~condition_variable(); + UMutex::cleanup(); + + // Reset the once_flag, by destructing it and creating a fresh one in its place. + // Do not use this trick anywhere else in ICU; use umtx_initOnce, not std::call_once(). + pInitFlag->~once_flag(); + pInitFlag = new(&initFlag) std::once_flag(); + return true; } -UConditionVar::~UConditionVar() { +static void U_CALLCONV umtx_init() { + initMutex = STATIC_NEW(std::mutex); + initCondition = STATIC_NEW(std::condition_variable); + ucln_common_registerCleanup(UCLN_COMMON_MUTEX, umtx_cleanup); +} +U_CDECL_END + + +std::mutex *UMutex::getMutex() { + std::mutex *retPtr = fMutex.load(std::memory_order_acquire); + if (retPtr == nullptr) { + std::call_once(*pInitFlag, umtx_init); + std::lock_guard guard(*initMutex); + retPtr = fMutex.load(std::memory_order_acquire); + if (retPtr == nullptr) { + fMutex = new(fStorage) std::mutex(); + retPtr = fMutex; + fListLink = gListHead; + gListHead = this; + } + } + U_ASSERT(retPtr != nullptr); + return retPtr; } -U_CAPI void U_EXPORT2 -umtx_condWait(UConditionVar *cond, UMutex *mutex) { - if (mutex == nullptr) { - mutex = globalMutex(); +UMutex *UMutex::gListHead = nullptr; + +void UMutex::cleanup() { + UMutex *next = nullptr; + for (UMutex *m = gListHead; m != nullptr; m = next) { + (*m->fMutex).~mutex(); + m->fMutex = nullptr; + next = m->fListLink; + m->fListLink = nullptr; } - cond->fCV.wait(mutex->fMutex); + gListHead = nullptr; } -U_CAPI void U_EXPORT2 -umtx_condBroadcast(UConditionVar *cond) { - cond->fCV.notify_all(); +U_CAPI void U_EXPORT2 +umtx_lock(UMutex *mutex) { + if (mutex == nullptr) { + mutex = &globalMutex; + } + mutex->lock(); } -U_CAPI void U_EXPORT2 -umtx_condSignal(UConditionVar *cond) { - cond->fCV.notify_one(); +U_CAPI void U_EXPORT2 +umtx_unlock(UMutex* mutex) +{ + if (mutex == nullptr) { + mutex = &globalMutex; + } + mutex->unlock(); } @@ -98,17 +133,6 @@ umtx_condSignal(UConditionVar *cond) { * *************************************************************************************************/ -static std::mutex &initMutex() { - static std::mutex m; - return m; -} - -static std::condition_variable &initCondition() { - static std::condition_variable cv; - return cv; -} - - // This function is called when a test of a UInitOnce::fState reveals that // initialization has not completed, that we either need to call the init // function on this thread, or wait for some other thread to complete. @@ -119,8 +143,8 @@ static std::condition_variable &initCondition() { // U_COMMON_API UBool U_EXPORT2 umtx_initImplPreInit(UInitOnce &uio) { - std::unique_lock lock(initMutex()); - + std::call_once(*pInitFlag, umtx_init); + std::unique_lock lock(*initMutex); if (umtx_loadAcquire(uio.fState) == 0) { umtx_storeRelease(uio.fState, 1); return true; // Caller will next call the init function. @@ -128,7 +152,7 @@ umtx_initImplPreInit(UInitOnce &uio) { while (umtx_loadAcquire(uio.fState) == 1) { // Another thread is currently running the initialization. // Wait until it completes. - initCondition().wait(lock); + initCondition->wait(lock); } U_ASSERT(uio.fState == 2); return false; @@ -145,10 +169,10 @@ umtx_initImplPreInit(UInitOnce &uio) { U_COMMON_API void U_EXPORT2 umtx_initImplPostInit(UInitOnce &uio) { { - std::unique_lock lock(initMutex()); + std::unique_lock lock(*initMutex); umtx_storeRelease(uio.fState, 2); } - initCondition().notify_all(); + initCondition->notify_all(); } U_NAMESPACE_END diff --git a/deps/icu-small/source/common/umutex.h b/deps/icu-small/source/common/umutex.h index 1674d00bb2d59b..7588bcc5d9aed6 100755 --- a/deps/icu-small/source/common/umutex.h +++ b/deps/icu-small/source/common/umutex.h @@ -23,6 +23,7 @@ #include #include #include +#include #include "unicode/utypes.h" #include "unicode/uclean.h" @@ -36,10 +37,11 @@ #error U_USER_ATOMICS and U_USER_MUTEX_H are not supported #endif - // Export an explicit template instantiation of std::atomic. // When building DLLs for Windows this is required as it is used as a data member of the exported SharedObject class. // See digitlst.h, pluralaffix.h, datefmt.h, and others for similar examples. +// +// Similar story for std::atomic, and the exported UMutex class. #if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN) #if defined(__clang__) || defined(_MSC_VER) #if defined(__clang__) @@ -48,12 +50,14 @@ #pragma clang diagnostic ignored "-Winstantiation-after-specialization" #endif template struct U_COMMON_API std::atomic; +template struct U_COMMON_API std::atomic; #if defined(__clang__) #pragma clang diagnostic pop #endif #elif defined(__GNUC__) // For GCC this class is already exported/visible, so no need for U_COMMON_API. template struct std::atomic; +template struct std::atomic; #endif #endif @@ -180,49 +184,78 @@ template void umtx_initOnce(UInitOnce &uio, void (U_CALLCONV *fp)(T, UE } } +// UMutex should be constexpr-constructible, so that no initialization code +// is run during startup. +// This works on all C++ libraries except MS VS before VS2019. +#if (defined(_CPPLIB_VER) && !defined(_MSVC_STL_VERSION)) || \ + (defined(_MSVC_STL_VERSION) && _MSVC_STL_VERSION < 142) + // (VS std lib older than VS2017) || (VS std lib version < VS2019) +# define UMUTEX_CONSTEXPR +#else +# define UMUTEX_CONSTEXPR constexpr +#endif -/************************************************************************************************* +/** + * UMutex - ICU Mutex class. * - * ICU Mutex wrappers. Originally wrapped operating system mutexes, giving the rest of ICU a - * platform independent set of mutex operations. Now vestigial, wrapping std::mutex only. - * For internal ICU use only. + * This is the preferred Mutex class for use within ICU implementation code. + * It is a thin wrapper over C++ std::mutex, with these additions: + * - Static instances are safe, not triggering static construction or destruction, + * and the associated order of construction or destruction issues. + * - Plumbed into u_cleanup() for destructing the underlying std::mutex, + * which frees any OS level resources they may be holding. * - *************************************************************************************************/ + * Limitations: + * - Static or global instances only. Cannot be heap allocated. Cannot appear as a + * member of another class. + * - No condition variables or other advanced features. If needed, you will need to use + * std::mutex and std::condition_variable directly. For an example, see unifiedcache.cpp + * + * Typical Usage: + * static UMutex myMutex; + * + * { + * Mutex lock(myMutex); + * ... // Do stuff that is protected by myMutex; + * } // myMutex is released when lock goes out of scope. + */ -struct UMutex : public icu::UMemory { - UMutex() = default; +class U_COMMON_API UMutex { +public: + UMUTEX_CONSTEXPR UMutex() {} ~UMutex() = default; + UMutex(const UMutex &other) = delete; UMutex &operator =(const UMutex &other) = delete; + void *operator new(size_t) = delete; - std::mutex fMutex = {}; // Note: struct - pubic members - because most access is from - // // plain C style functions (umtx_lock(), etc.) -}; + // requirements for C++ BasicLockable, allows UMutex to work with std::lock_guard + void lock() { + std::mutex *m = fMutex.load(std::memory_order_acquire); + if (m == nullptr) { m = getMutex(); } + m->lock(); + } + void unlock() { fMutex.load(std::memory_order_relaxed)->unlock(); } + static void cleanup(); -struct UConditionVar : public icu::UMemory { - U_COMMON_API UConditionVar(); - U_COMMON_API ~UConditionVar(); - UConditionVar(const UConditionVar &other) = delete; - UConditionVar &operator =(const UConditionVar &other) = delete; +private: + alignas(std::mutex) char fStorage[sizeof(std::mutex)] {}; + std::atomic fMutex { nullptr }; - std::condition_variable_any fCV; -}; + /** All initialized UMutexes are kept in a linked list, so that they can be found, + * and the underlying std::mutex destructed, by u_cleanup(). + */ + UMutex *fListLink { nullptr }; + static UMutex *gListHead; -#define U_MUTEX_INITIALIZER {} -#define U_CONDITION_INITIALIZER {} + /** Out-of-line function to lazily initialize a UMutex on first use. + * Initial fast check is inline, in lock(). The returned value may never + * be nullptr. + */ + std::mutex *getMutex(); +}; -// Implementation notes for UConditionVar: -// -// Use an out-of-line constructor to reduce problems with the ICU dependency checker. -// On Linux, the default constructor of std::condition_variable_any -// produces an in-line reference to global operator new(), which the -// dependency checker flags for any file that declares a UConditionVar. With -// an out-of-line constructor, the dependency is constrained to umutex.o -// -// Do not export (U_COMMON_API) the entire class, but only the constructor -// and destructor, to avoid Windows build problems with attempting to export the -// std::condition_variable_any. /* Lock a mutex. * @param mutex The given mutex to be locked. Pass NULL to specify @@ -237,30 +270,6 @@ U_INTERNAL void U_EXPORT2 umtx_lock(UMutex* mutex); */ U_INTERNAL void U_EXPORT2 umtx_unlock (UMutex* mutex); -/* - * Wait on a condition variable. - * The calling thread will unlock the mutex and wait on the condition variable. - * The mutex must be locked by the calling thread when invoking this function. - * - * @param cond the condition variable to wait on. - * @param mutex the associated mutex. - */ - -U_INTERNAL void U_EXPORT2 umtx_condWait(UConditionVar *cond, UMutex *mutex); - - -/* - * Broadcast wakeup of all threads waiting on a Condition. - * - * @param cond the condition variable. - */ -U_INTERNAL void U_EXPORT2 umtx_condBroadcast(UConditionVar *cond); - -/* - * Signal a condition variable, waking up one waiting thread. - */ -U_INTERNAL void U_EXPORT2 umtx_condSignal(UConditionVar *cond); - U_NAMESPACE_END diff --git a/deps/icu-small/source/common/unames.cpp b/deps/icu-small/source/common/unames.cpp index 038743004ea589..a28b6ee6036b96 100644 --- a/deps/icu-small/source/common/unames.cpp +++ b/deps/icu-small/source/common/unames.cpp @@ -212,13 +212,13 @@ isDataLoaded(UErrorCode *pErrorCode) { return U_SUCCESS(*pErrorCode); } -#define WRITE_CHAR(buffer, bufferLength, bufferPos, c) { \ +#define WRITE_CHAR(buffer, bufferLength, bufferPos, c) UPRV_BLOCK_MACRO_BEGIN { \ if((bufferLength)>0) { \ *(buffer)++=c; \ --(bufferLength); \ } \ ++(bufferPos); \ -} +} UPRV_BLOCK_MACRO_END #define U_ISO_COMMENT U_CHAR_NAME_CHOICE_COUNT diff --git a/deps/icu-small/source/common/unicode/appendable.h b/deps/icu-small/source/common/unicode/appendable.h index 8512c2f30311b8..4beacaf6583620 100644 --- a/deps/icu-small/source/common/unicode/appendable.h +++ b/deps/icu-small/source/common/unicode/appendable.h @@ -23,6 +23,9 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" U_NAMESPACE_BEGIN @@ -231,4 +234,6 @@ class U_COMMON_API UnicodeStringAppendable : public Appendable { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __APPENDABLE_H__ diff --git a/deps/icu-small/source/common/unicode/brkiter.h b/deps/icu-small/source/common/unicode/brkiter.h index ac1bf1df29f214..b944497345479b 100644 --- a/deps/icu-small/source/common/unicode/brkiter.h +++ b/deps/icu-small/source/common/unicode/brkiter.h @@ -29,6 +29,10 @@ * \brief C++ API: Break Iterator. */ +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #if UCONFIG_NO_BREAK_ITERATION U_NAMESPACE_BEGIN @@ -135,7 +139,7 @@ class U_COMMON_API BreakIterator : public UObject { * method which subclasses implement. * @stable ICU 2.0 */ - virtual BreakIterator* clone(void) const = 0; + virtual BreakIterator* clone() const = 0; /** * Return a polymorphic class ID for this object. Different subclasses @@ -493,6 +497,7 @@ class U_COMMON_API BreakIterator : public UObject { static UnicodeString& U_EXPORT2 getDisplayName(const Locale& objectLocale, UnicodeString& name); +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Deprecated functionality. Use clone() instead. * @@ -515,6 +520,7 @@ class U_COMMON_API BreakIterator : public UObject { virtual BreakIterator * createBufferClone(void *stackBuffer, int32_t &BufferSize, UErrorCode &status) = 0; +#endif // U_FORCE_HIDE_DEPRECATED_API #ifndef U_HIDE_DEPRECATED_API @@ -658,5 +664,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_BREAK_ITERATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // BRKITER_H //eof diff --git a/deps/icu-small/source/common/unicode/bytestream.h b/deps/icu-small/source/common/unicode/bytestream.h index 61d1e8aca651d7..2c71c248e3dfa0 100644 --- a/deps/icu-small/source/common/unicode/bytestream.h +++ b/deps/icu-small/source/common/unicode/bytestream.h @@ -38,6 +38,9 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" #include "unicode/std_string.h" @@ -267,4 +270,6 @@ class StringByteSink : public ByteSink { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __BYTESTREAM_H__ diff --git a/deps/icu-small/source/common/unicode/bytestrie.h b/deps/icu-small/source/common/unicode/bytestrie.h index c57b8ccfeb5960..51405f64a10e64 100644 --- a/deps/icu-small/source/common/unicode/bytestrie.h +++ b/deps/icu-small/source/common/unicode/bytestrie.h @@ -23,6 +23,9 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/stringpiece.h" #include "unicode/uobject.h" #include "unicode/ustringtrie.h" @@ -94,6 +97,41 @@ class U_COMMON_API BytesTrie : public UMemory { return *this; } +#ifndef U_HIDE_DRAFT_API + /** + * Returns the state of this trie as a 64-bit integer. + * The state value is never 0. + * + * @return opaque state value + * @see resetToState64 + * @draft ICU 65 + */ + uint64_t getState64() const { + return (static_cast(remainingMatchLength_ + 2) << kState64RemainingShift) | + (uint64_t)(pos_ - bytes_); + } + + /** + * Resets this trie to the saved state. + * Unlike resetToState(State), the 64-bit state value + * must be from getState64() from the same trie object or + * from one initialized the exact same way. + * Because of no validation, this method is faster. + * + * @param state The opaque trie state value from getState64(). + * @return *this + * @see getState64 + * @see resetToState + * @see reset + * @draft ICU 65 + */ + BytesTrie &resetToState64(uint64_t state) { + remainingMatchLength_ = static_cast(state >> kState64RemainingShift) - 2; + pos_ = bytes_ + (state & kState64PosMask); + return *this; + } +#endif /* U_HIDE_DRAFT_API */ + /** * BytesTrie state object, for saving a trie's current state * and resetting the trie back to this state later. @@ -502,6 +540,13 @@ class U_COMMON_API BytesTrie : public UMemory { static const int32_t kMaxTwoByteDelta=((kMinThreeByteDeltaLead-kMinTwoByteDeltaLead)<<8)-1; // 0x2fff static const int32_t kMaxThreeByteDelta=((kFourByteDeltaLead-kMinThreeByteDeltaLead)<<16)-1; // 0xdffff + // For getState64(): + // The remainingMatchLength_ is -1..14=(kMaxLinearMatchLength=0x10)-2 + // so we need at least 5 bits for that. + // We add 2 to store it as a positive value 1..16=kMaxLinearMatchLength. + static constexpr int32_t kState64RemainingShift = 59; + static constexpr uint64_t kState64PosMask = (UINT64_C(1) << kState64RemainingShift) - 1; + uint8_t *ownedArray_; // Fixed value referencing the BytesTrie bytes. @@ -517,4 +562,6 @@ class U_COMMON_API BytesTrie : public UMemory { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __BYTESTRIE_H__ diff --git a/deps/icu-small/source/common/unicode/bytestriebuilder.h b/deps/icu-small/source/common/unicode/bytestriebuilder.h index b164e3bbd685f7..e58f18755ef959 100644 --- a/deps/icu-small/source/common/unicode/bytestriebuilder.h +++ b/deps/icu-small/source/common/unicode/bytestriebuilder.h @@ -23,6 +23,9 @@ #define __BYTESTRIEBUILDER_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/bytestrie.h" #include "unicode/stringpiece.h" #include "unicode/stringtriebuilder.h" @@ -179,4 +182,6 @@ class U_COMMON_API BytesTrieBuilder : public StringTrieBuilder { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __BYTESTRIEBUILDER_H__ diff --git a/deps/icu-small/source/common/unicode/caniter.h b/deps/icu-small/source/common/unicode/caniter.h index b47e35da07bb7f..87c946c2b4db56 100644 --- a/deps/icu-small/source/common/unicode/caniter.h +++ b/deps/icu-small/source/common/unicode/caniter.h @@ -12,6 +12,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_NORMALIZATION #include "unicode/uobject.h" @@ -207,4 +209,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_NORMALIZATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/casemap.h b/deps/icu-small/source/common/unicode/casemap.h index 477eb484d136b6..53af84fa74d65f 100644 --- a/deps/icu-small/source/common/unicode/casemap.h +++ b/deps/icu-small/source/common/unicode/casemap.h @@ -8,6 +8,9 @@ #define __CASEMAP_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/stringpiece.h" #include "unicode/uobject.h" @@ -489,4 +492,6 @@ class U_COMMON_API CaseMap U_FINAL : public UMemory { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __CASEMAP_H__ diff --git a/deps/icu-small/source/common/unicode/char16ptr.h b/deps/icu-small/source/common/unicode/char16ptr.h index a7c5f1a0c5ed56..c8a9ae6c35d646 100644 --- a/deps/icu-small/source/common/unicode/char16ptr.h +++ b/deps/icu-small/source/common/unicode/char16ptr.h @@ -7,9 +7,12 @@ #ifndef __CHAR16PTR_H__ #define __CHAR16PTR_H__ -#include #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + +#include + /** * \file * \brief C++ API: char16_t pointer wrappers with @@ -305,4 +308,6 @@ inline OldUChar *toOldUCharPtr(char16_t *p) { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __CHAR16PTR_H__ diff --git a/deps/icu-small/source/common/unicode/chariter.h b/deps/icu-small/source/common/unicode/chariter.h index 292794f6d65832..7e4f446bb0f8a8 100644 --- a/deps/icu-small/source/common/unicode/chariter.h +++ b/deps/icu-small/source/common/unicode/chariter.h @@ -13,6 +13,9 @@ #define CHARITER_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" #include "unicode/unistr.h" /** @@ -377,7 +380,7 @@ class U_COMMON_API CharacterIterator : public ForwardCharacterIterator { * @return a pointer to a new CharacterIterator * @stable ICU 2.0 */ - virtual CharacterIterator* clone(void) const = 0; + virtual CharacterIterator* clone() const = 0; /** * Sets the iterator to refer to the first code unit in its @@ -725,4 +728,7 @@ CharacterIterator::getLength(void) const { } U_NAMESPACE_END + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/dbbi.h b/deps/icu-small/source/common/unicode/dbbi.h index 62509c5227b9da..9031c0b96b1b40 100644 --- a/deps/icu-small/source/common/unicode/dbbi.h +++ b/deps/icu-small/source/common/unicode/dbbi.h @@ -13,6 +13,10 @@ #ifndef DBBI_H #define DBBI_H +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/rbbi.h" #if !UCONFIG_NO_BREAK_ITERATION @@ -39,4 +43,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_BREAK_ITERATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/docmain.h b/deps/icu-small/source/common/unicode/docmain.h index 89906799877622..2b38692997dd9a 100644 --- a/deps/icu-small/source/common/unicode/docmain.h +++ b/deps/icu-small/source/common/unicode/docmain.h @@ -99,7 +99,7 @@ * * * Codepage Conversion - * ucnv.h, ucnvsel.hb + * ucnv.h, ucnvsel.h * C API * * @@ -115,7 +115,7 @@ * * Locales * uloc.h - * icu::Locale, icu::LocaleBuilder + * icu::Locale, icu::LocaleBuilder, icu::LocaleMatcher * * * Resource Bundles diff --git a/deps/icu-small/source/common/unicode/dtintrv.h b/deps/icu-small/source/common/unicode/dtintrv.h index 625456f0c868e9..325faa3ccb92cb 100644 --- a/deps/icu-small/source/common/unicode/dtintrv.h +++ b/deps/icu-small/source/common/unicode/dtintrv.h @@ -15,6 +15,9 @@ #define __DTINTRV_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" /** @@ -22,7 +25,6 @@ * \brief C++ API: Date Interval data type */ - U_NAMESPACE_BEGIN @@ -157,4 +159,6 @@ DateInterval::operator!=(const DateInterval& other) const { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/edits.h b/deps/icu-small/source/common/unicode/edits.h index 79e98b0cc27ac6..c3ceaccb3b3802 100644 --- a/deps/icu-small/source/common/unicode/edits.h +++ b/deps/icu-small/source/common/unicode/edits.h @@ -8,6 +8,9 @@ #define __EDITS_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" /** @@ -159,7 +162,7 @@ class U_COMMON_API Edits U_FINAL : public UMemory { * @return TRUE if U_FAILURE(outErrorCode) * @stable ICU 59 */ - UBool copyErrorTo(UErrorCode &outErrorCode); + UBool copyErrorTo(UErrorCode &outErrorCode) const; /** * How much longer is the new text compared with the old text? @@ -523,4 +526,6 @@ class U_COMMON_API Edits U_FINAL : public UMemory { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __EDITS_H__ diff --git a/deps/icu-small/source/common/unicode/errorcode.h b/deps/icu-small/source/common/unicode/errorcode.h index 1e5df8f03e88fe..75cdbb6a98f194 100644 --- a/deps/icu-small/source/common/unicode/errorcode.h +++ b/deps/icu-small/source/common/unicode/errorcode.h @@ -26,6 +26,9 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" U_NAMESPACE_BEGIN @@ -136,4 +139,6 @@ class U_COMMON_API ErrorCode: public UMemory { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __ERRORCODE_H__ diff --git a/deps/icu-small/source/common/unicode/filteredbrk.h b/deps/icu-small/source/common/unicode/filteredbrk.h index 2444114e9a14bf..42936763259e2d 100644 --- a/deps/icu-small/source/common/unicode/filteredbrk.h +++ b/deps/icu-small/source/common/unicode/filteredbrk.h @@ -11,6 +11,9 @@ #define FILTEREDBRK_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/brkiter.h" #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION @@ -101,6 +104,7 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { */ virtual UBool unsuppressBreakAfter(const UnicodeString& string, UErrorCode& status) = 0; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * This function has been deprecated in favor of wrapIteratorWithFilter() * The behavior is identical. @@ -111,6 +115,7 @@ class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { * @see wrapBreakIteratorWithFilter() */ virtual BreakIterator *build(BreakIterator* adoptBreakIterator, UErrorCode& status) = 0; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Wrap (adopt) an existing break iterator in a new filtered instance. @@ -142,4 +147,6 @@ U_NAMESPACE_END #endif // #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // #ifndef FILTEREDBRK_H diff --git a/deps/icu-small/source/common/unicode/idna.h b/deps/icu-small/source/common/unicode/idna.h index f08658e502e200..6dfcfe48db28f1 100644 --- a/deps/icu-small/source/common/unicode/idna.h +++ b/deps/icu-small/source/common/unicode/idna.h @@ -24,6 +24,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_IDNA #include "unicode/bytestream.h" @@ -322,4 +324,7 @@ class U_COMMON_API IDNAInfo : public UMemory { U_NAMESPACE_END #endif // UCONFIG_NO_IDNA + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __IDNA_H__ diff --git a/deps/icu-small/source/common/unicode/localebuilder.h b/deps/icu-small/source/common/unicode/localebuilder.h index 960e5980c03c2e..19e10f1c070924 100644 --- a/deps/icu-small/source/common/unicode/localebuilder.h +++ b/deps/icu-small/source/common/unicode/localebuilder.h @@ -3,11 +3,14 @@ #ifndef __LOCALEBUILDER_H__ #define __LOCALEBUILDER_H__ +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/locid.h" +#include "unicode/localematcher.h" #include "unicode/stringpiece.h" #include "unicode/uobject.h" -#include "unicode/utypes.h" - #ifndef U_HIDE_DRAFT_API /** @@ -276,7 +279,24 @@ class U_COMMON_API LocaleBuilder : public UObject { */ Locale build(UErrorCode& status); +#ifndef U_HIDE_DRAFT_API + /** + * Sets the UErrorCode if an error occurred while recording sets. + * Preserves older error codes in the outErrorCode. + * @param outErrorCode Set to an error code that occurred while setting subtags. + * Unchanged if there is no such error or if outErrorCode + * already contained an error. + * @return TRUE if U_FAILURE(outErrorCode) + * @draft ICU 65 + */ + UBool copyErrorTo(UErrorCode &outErrorCode) const; +#endif /* U_HIDE_DRAFT_API */ + private: + friend class LocaleMatcher::Result; + + void copyExtensionsFrom(const Locale& src, UErrorCode& errorCode); + UErrorCode status_; char language_[9]; char script_[5]; @@ -289,4 +309,7 @@ class U_COMMON_API LocaleBuilder : public UObject { U_NAMESPACE_END #endif // U_HIDE_DRAFT_API + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __LOCALEBUILDER_H__ diff --git a/deps/icu-small/source/common/unicode/localematcher.h b/deps/icu-small/source/common/unicode/localematcher.h new file mode 100644 index 00000000000000..701123f750b222 --- /dev/null +++ b/deps/icu-small/source/common/unicode/localematcher.h @@ -0,0 +1,605 @@ +// © 2019 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License + +// localematcher.h +// created: 2019may08 Markus W. Scherer + +#ifndef __LOCALEMATCHER_H__ +#define __LOCALEMATCHER_H__ + +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + +#include "unicode/locid.h" +#include "unicode/stringpiece.h" +#include "unicode/uobject.h" + +/** + * \file + * \brief C++ API: Locale matcher: User's desired locales vs. application's supported locales. + */ + +#ifndef U_HIDE_DRAFT_API + +/** + * Builder option for whether the language subtag or the script subtag is most important. + * + * @see Builder#setFavorSubtag(FavorSubtag) + * @draft ICU 65 + */ +enum ULocMatchFavorSubtag { + /** + * Language differences are most important, then script differences, then region differences. + * (This is the default behavior.) + * + * @draft ICU 65 + */ + ULOCMATCH_FAVOR_LANGUAGE, + /** + * Makes script differences matter relatively more than language differences. + * + * @draft ICU 65 + */ + ULOCMATCH_FAVOR_SCRIPT +}; +#ifndef U_IN_DOXYGEN +typedef enum ULocMatchFavorSubtag ULocMatchFavorSubtag; +#endif + +/** + * Builder option for whether all desired locales are treated equally or + * earlier ones are preferred. + * + * @see Builder#setDemotionPerDesiredLocale(Demotion) + * @draft ICU 65 + */ +enum ULocMatchDemotion { + /** + * All desired locales are treated equally. + * + * @draft ICU 65 + */ + ULOCMATCH_DEMOTION_NONE, + /** + * Earlier desired locales are preferred. + * + *

From each desired locale to the next, + * the distance to any supported locale is increased by an additional amount + * which is at least as large as most region mismatches. + * A later desired locale has to have a better match with some supported locale + * due to more than merely having the same region subtag. + * + *

For example: Supported={en, sv} desired=[en-GB, sv] + * yields Result(en-GB, en) because + * with the demotion of sv its perfect match is no better than + * the region distance between the earlier desired locale en-GB and en=en-US. + * + *

Notes: + *

    + *
  • In some cases, language and/or script differences can be as small as + * the typical region difference. (Example: sr-Latn vs. sr-Cyrl) + *
  • It is possible for certain region differences to be larger than usual, + * and larger than the demotion. + * (As of CLDR 35 there is no such case, but + * this is possible in future versions of the data.) + *
+ * + * @draft ICU 65 + */ + ULOCMATCH_DEMOTION_REGION +}; +#ifndef U_IN_DOXYGEN +typedef enum ULocMatchDemotion ULocMatchDemotion; +#endif + +struct UHashtable; + +U_NAMESPACE_BEGIN + +struct LSR; + +class LocaleDistance; +class LocaleLsrIterator; +class UVector; +class XLikelySubtags; + +/** + * Immutable class that picks the best match between a user's desired locales and + * an application's supported locales. + * Movable but not copyable. + * + *

Example: + *

+ * UErrorCode errorCode = U_ZERO_ERROR;
+ * LocaleMatcher matcher = LocaleMatcher::Builder().setSupportedLocales("fr, en-GB, en").build(errorCode);
+ * Locale *bestSupported = matcher.getBestLocale(Locale.US, errorCode);  // "en"
+ * 
+ * + *

A matcher takes into account when languages are close to one another, + * such as Danish and Norwegian, + * and when regional variants are close, like en-GB and en-AU as opposed to en-US. + * + *

If there are multiple supported locales with the same (language, script, region) + * likely subtags, then the current implementation returns the first of those locales. + * It ignores variant subtags (except for pseudolocale variants) and extensions. + * This may change in future versions. + * + *

For example, the current implementation does not distinguish between + * de, de-DE, de-Latn, de-1901, de-u-co-phonebk. + * + *

If you prefer one equivalent locale over another, then provide only the preferred one, + * or place it earlier in the list of supported locales. + * + *

Otherwise, the order of supported locales may have no effect on the best-match results. + * The current implementation compares each desired locale with supported locales + * in the following order: + * 1. Default locale, if supported; + * 2. CLDR "paradigm locales" like en-GB and es-419; + * 3. other supported locales. + * This may change in future versions. + * + *

Often a product will just need one matcher instance, built with the languages + * that it supports. However, it may want multiple instances with different + * default languages based on additional information, such as the domain. + * + *

This class is not intended for public subclassing. + * + * @draft ICU 65 + */ +class U_COMMON_API LocaleMatcher : public UMemory { +public: + /** + * Data for the best-matching pair of a desired and a supported locale. + * Movable but not copyable. + * + * @draft ICU 65 + */ + class U_COMMON_API Result : public UMemory { + public: + /** + * Move constructor; might modify the source. + * This object will have the same contents that the source object had. + * + * @param src Result to move contents from. + * @draft ICU 65 + */ + Result(Result &&src) U_NOEXCEPT; + + /** + * Destructor. + * + * @draft ICU 65 + */ + ~Result(); + + /** + * Move assignment; might modify the source. + * This object will have the same contents that the source object had. + * + * @param src Result to move contents from. + * @draft ICU 65 + */ + Result &operator=(Result &&src) U_NOEXCEPT; + + /** + * Returns the best-matching desired locale. + * nullptr if the list of desired locales is empty or if none matched well enough. + * + * @return the best-matching desired locale, or nullptr. + * @draft ICU 65 + */ + inline const Locale *getDesiredLocale() const { return desiredLocale; } + + /** + * Returns the best-matching supported locale. + * If none matched well enough, this is the default locale. + * The default locale is nullptr if the list of supported locales is empty and + * no explicit default locale is set. + * + * @return the best-matching supported locale, or nullptr. + * @draft ICU 65 + */ + inline const Locale *getSupportedLocale() const { return supportedLocale; } + + /** + * Returns the index of the best-matching desired locale in the input Iterable order. + * -1 if the list of desired locales is empty or if none matched well enough. + * + * @return the index of the best-matching desired locale, or -1. + * @draft ICU 65 + */ + inline int32_t getDesiredIndex() const { return desiredIndex; } + + /** + * Returns the index of the best-matching supported locale in the + * constructor’s or builder’s input order (“set” Collection plus “added” locales). + * If the matcher was built from a locale list string, then the iteration order is that + * of a LocalePriorityList built from the same string. + * -1 if the list of supported locales is empty or if none matched well enough. + * + * @return the index of the best-matching supported locale, or -1. + * @draft ICU 65 + */ + inline int32_t getSupportedIndex() const { return supportedIndex; } + + /** + * Takes the best-matching supported locale and adds relevant fields of the + * best-matching desired locale, such as the -t- and -u- extensions. + * May replace some fields of the supported locale. + * The result is the locale that should be used for date and number formatting, collation, etc. + * Returns the root locale if getSupportedLocale() returns nullptr. + * + *

Example: desired=ar-SA-u-nu-latn, supported=ar-EG, resolved locale=ar-SA-u-nu-latn + * + * @return a locale combining the best-matching desired and supported locales. + * @draft ICU 65 + */ + Locale makeResolvedLocale(UErrorCode &errorCode) const; + + private: + Result(const Locale *desired, const Locale *supported, + int32_t desIndex, int32_t suppIndex, UBool owned) : + desiredLocale(desired), supportedLocale(supported), + desiredIndex(desIndex), supportedIndex(suppIndex), + desiredIsOwned(owned) {} + + Result(const Result &other) = delete; + Result &operator=(const Result &other) = delete; + + const Locale *desiredLocale; + const Locale *supportedLocale; + int32_t desiredIndex; + int32_t supportedIndex; + UBool desiredIsOwned; + + friend class LocaleMatcher; + }; + + /** + * LocaleMatcher builder. + * Movable but not copyable. + * + * @see LocaleMatcher#builder() + * @draft ICU 65 + */ + class U_COMMON_API Builder : public UMemory { + public: + /** + * Constructs a builder used in chaining parameters for building a LocaleMatcher. + * + * @return a new Builder object + * @draft ICU 65 + */ + Builder() {} + + /** + * Move constructor; might modify the source. + * This builder will have the same contents that the source builder had. + * + * @param src Builder to move contents from. + * @draft ICU 65 + */ + Builder(Builder &&src) U_NOEXCEPT; + + /** + * Destructor. + * + * @draft ICU 65 + */ + ~Builder(); + + /** + * Move assignment; might modify the source. + * This builder will have the same contents that the source builder had. + * + * @param src Builder to move contents from. + * @draft ICU 65 + */ + Builder &operator=(Builder &&src) U_NOEXCEPT; + + /** + * Parses an Accept-Language string + * (RFC 2616 Section 14.4), + * such as "af, en, fr;q=0.9", and sets the supported locales accordingly. + * Allows whitespace in more places but does not allow "*". + * Clears any previously set/added supported locales first. + * + * @param locales the Accept-Language string of locales to set + * @return this Builder object + * @draft ICU 65 + */ + Builder &setSupportedLocalesFromListString(StringPiece locales); + + /** + * Copies the supported locales, preserving iteration order. + * Clears any previously set/added supported locales first. + * Duplicates are allowed, and are not removed. + * + * @param locales the list of locale + * @return this Builder object + * @draft ICU 65 + */ + Builder &setSupportedLocales(Locale::Iterator &locales); + + /** + * Copies the supported locales from the begin/end range, preserving iteration order. + * Clears any previously set/added supported locales first. + * Duplicates are allowed, and are not removed. + * + * Each of the iterator parameter values must be an + * input iterator whose value is convertible to const Locale &. + * + * @param begin Start of range. + * @param end Exclusive end of range. + * @return this Builder object + * @draft ICU 65 + */ + template + Builder &setSupportedLocales(Iter begin, Iter end) { + if (U_FAILURE(errorCode_)) { return *this; } + clearSupportedLocales(); + while (begin != end) { + addSupportedLocale(*begin++); + } + return *this; + } + + /** + * Copies the supported locales from the begin/end range, preserving iteration order. + * Calls the converter to convert each *begin to a Locale or const Locale &. + * Clears any previously set/added supported locales first. + * Duplicates are allowed, and are not removed. + * + * Each of the iterator parameter values must be an + * input iterator whose value is convertible to const Locale &. + * + * @param begin Start of range. + * @param end Exclusive end of range. + * @param converter Converter from *begin to const Locale & or compatible. + * @return this Builder object + * @draft ICU 65 + */ + template + Builder &setSupportedLocalesViaConverter(Iter begin, Iter end, Conv converter) { + if (U_FAILURE(errorCode_)) { return *this; } + clearSupportedLocales(); + while (begin != end) { + addSupportedLocale(converter(*begin++)); + } + return *this; + } + + /** + * Adds another supported locale. + * Duplicates are allowed, and are not removed. + * + * @param locale another locale + * @return this Builder object + * @draft ICU 65 + */ + Builder &addSupportedLocale(const Locale &locale); + + /** + * Sets the default locale; if nullptr, or if it is not set explicitly, + * then the first supported locale is used as the default locale. + * + * @param defaultLocale the default locale (will be copied) + * @return this Builder object + * @draft ICU 65 + */ + Builder &setDefaultLocale(const Locale *defaultLocale); + + /** + * If ULOCMATCH_FAVOR_SCRIPT, then the language differences are smaller than script + * differences. + * This is used in situations (such as maps) where + * it is better to fall back to the same script than a similar language. + * + * @param subtag the subtag to favor + * @return this Builder object + * @draft ICU 65 + */ + Builder &setFavorSubtag(ULocMatchFavorSubtag subtag); + + /** + * Option for whether all desired locales are treated equally or + * earlier ones are preferred (this is the default). + * + * @param demotion the demotion per desired locale to set. + * @return this Builder object + * @draft ICU 65 + */ + Builder &setDemotionPerDesiredLocale(ULocMatchDemotion demotion); + + /** + * Sets the UErrorCode if an error occurred while setting parameters. + * Preserves older error codes in the outErrorCode. + * + * @param outErrorCode Set to an error code if it does not contain one already + * and an error occurred while setting parameters. + * Otherwise unchanged. + * @return TRUE if U_FAILURE(outErrorCode) + * @draft ICU 65 + */ + UBool copyErrorTo(UErrorCode &outErrorCode) const; + + /** + * Builds and returns a new locale matcher. + * This builder can continue to be used. + * + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return new LocaleMatcher. + * @draft ICU 65 + */ + LocaleMatcher build(UErrorCode &errorCode) const; + + private: + friend class LocaleMatcher; + + Builder(const Builder &other) = delete; + Builder &operator=(const Builder &other) = delete; + + void clearSupportedLocales(); + bool ensureSupportedLocaleVector(); + + UErrorCode errorCode_ = U_ZERO_ERROR; + UVector *supportedLocales_ = nullptr; + int32_t thresholdDistance_ = -1; + ULocMatchDemotion demotion_ = ULOCMATCH_DEMOTION_REGION; + Locale *defaultLocale_ = nullptr; + ULocMatchFavorSubtag favor_ = ULOCMATCH_FAVOR_LANGUAGE; + }; + + // FYI No public LocaleMatcher constructors in C++; use the Builder. + + /** + * Move copy constructor; might modify the source. + * This matcher will have the same settings that the source matcher had. + * @param src source matcher + * @draft ICU 65 + */ + LocaleMatcher(LocaleMatcher &&src) U_NOEXCEPT; + + /** + * Destructor. + * @draft ICU 65 + */ + ~LocaleMatcher(); + + /** + * Move assignment operator; might modify the source. + * This matcher will have the same settings that the source matcher had. + * The behavior is undefined if *this and src are the same object. + * @param src source matcher + * @return *this + * @draft ICU 65 + */ + LocaleMatcher &operator=(LocaleMatcher &&src) U_NOEXCEPT; + + /** + * Returns the supported locale which best matches the desired locale. + * + * @param desiredLocale Typically a user's language. + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return the best-matching supported locale. + * @draft ICU 65 + */ + const Locale *getBestMatch(const Locale &desiredLocale, UErrorCode &errorCode) const; + + /** + * Returns the supported locale which best matches one of the desired locales. + * + * @param desiredLocales Typically a user's languages, in order of preference (descending). + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return the best-matching supported locale. + * @draft ICU 65 + */ + const Locale *getBestMatch(Locale::Iterator &desiredLocales, UErrorCode &errorCode) const; + + /** + * Parses an Accept-Language string + * (RFC 2616 Section 14.4), + * such as "af, en, fr;q=0.9", + * and returns the supported locale which best matches one of the desired locales. + * Allows whitespace in more places but does not allow "*". + * + * @param desiredLocaleList Typically a user's languages, as an Accept-Language string. + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return the best-matching supported locale. + * @draft ICU 65 + */ + const Locale *getBestMatchForListString(StringPiece desiredLocaleList, UErrorCode &errorCode) const; + + /** + * Returns the best match between the desired locale and the supported locales. + * If the result's desired locale is not nullptr, then it is the address of the input locale. + * It has not been cloned. + * + * @param desiredLocale Typically a user's language. + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return the best-matching pair of the desired and a supported locale. + * @draft ICU 65 + */ + Result getBestMatchResult(const Locale &desiredLocale, UErrorCode &errorCode) const; + + /** + * Returns the best match between the desired and supported locales. + * If the result's desired locale is not nullptr, then it is a clone of + * the best-matching desired locale. The Result object owns the clone. + * + * @param desiredLocales Typically a user's languages, in order of preference (descending). + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return the best-matching pair of a desired and a supported locale. + * @draft ICU 65 + */ + Result getBestMatchResult(Locale::Iterator &desiredLocales, UErrorCode &errorCode) const; + +#ifndef U_HIDE_INTERNAL_API + /** + * Returns a fraction between 0 and 1, where 1 means that the languages are a + * perfect match, and 0 means that they are completely different. + * + *

This is mostly an implementation detail, and the precise values may change over time. + * The implementation may use either the maximized forms or the others ones, or both. + * The implementation may or may not rely on the forms to be consistent with each other. + * + *

Callers should construct and use a matcher rather than match pairs of locales directly. + * + * @param desired Desired locale. + * @param supported Supported locale. + * @param errorCode ICU error code. Its input value must pass the U_SUCCESS() test, + * or else the function returns immediately. Check for U_FAILURE() + * on output or use with function chaining. (See User Guide for details.) + * @return value between 0 and 1, inclusive. + * @internal (has a known user) + */ + double internalMatch(const Locale &desired, const Locale &supported, UErrorCode &errorCode) const; +#endif // U_HIDE_INTERNAL_API + +private: + LocaleMatcher(const Builder &builder, UErrorCode &errorCode); + LocaleMatcher(const LocaleMatcher &other) = delete; + LocaleMatcher &operator=(const LocaleMatcher &other) = delete; + + int32_t getBestSuppIndex(LSR desiredLSR, LocaleLsrIterator *remainingIter, UErrorCode &errorCode) const; + + const XLikelySubtags &likelySubtags; + const LocaleDistance &localeDistance; + int32_t thresholdDistance; + int32_t demotionPerDesiredLocale; + ULocMatchFavorSubtag favorSubtag; + + // These are in input order. + const Locale ** supportedLocales; + LSR *lsrs; + int32_t supportedLocalesLength; + // These are in preference order: 1. Default locale 2. paradigm locales 3. others. + UHashtable *supportedLsrToIndex; // Map stores index+1 because 0 is "not found" + // Array versions of the supportedLsrToIndex keys and values. + // The distance lookup loops over the supportedLSRs and returns the index of the best match. + const LSR **supportedLSRs; + int32_t *supportedIndexes; + int32_t supportedLSRsLength; + Locale *ownedDefaultLocale; + const Locale *defaultLocale; + int32_t defaultLocaleIndex; +}; + +U_NAMESPACE_END + +#endif // U_HIDE_DRAFT_API +#endif // U_SHOW_CPLUSPLUS_API +#endif // __LOCALEMATCHER_H__ diff --git a/deps/icu-small/source/common/unicode/locdspnm.h b/deps/icu-small/source/common/unicode/locdspnm.h index f6e778356feced..4f06f857044c6e 100644 --- a/deps/icu-small/source/common/unicode/locdspnm.h +++ b/deps/icu-small/source/common/unicode/locdspnm.h @@ -12,6 +12,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Provides display names of Locale and its components. @@ -204,4 +206,6 @@ U_NAMESPACE_END #endif +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/locid.h b/deps/icu-small/source/common/unicode/locid.h index 7350e381ffa540..6fb0897fc05d95 100644 --- a/deps/icu-small/source/common/unicode/locid.h +++ b/deps/icu-small/source/common/unicode/locid.h @@ -31,11 +31,14 @@ #ifndef LOCID_H #define LOCID_H +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/bytestream.h" #include "unicode/localpointer.h" #include "unicode/strenum.h" #include "unicode/stringpiece.h" -#include "unicode/utypes.h" #include "unicode/uobject.h" #include "unicode/putil.h" #include "unicode/uloc.h" @@ -284,16 +287,14 @@ class U_COMMON_API Locale : public UObject { */ Locale(const Locale& other); -#ifndef U_HIDE_DRAFT_API /** * Move constructor; might leave source in bogus state. * This locale will have the same contents that the source locale had. * * @param other The Locale object being moved in. - * @draft ICU 63 + * @stable ICU 63 */ Locale(Locale&& other) U_NOEXCEPT; -#endif // U_HIDE_DRAFT_API /** * Destructor @@ -310,7 +311,6 @@ class U_COMMON_API Locale : public UObject { */ Locale& operator=(const Locale& other); -#ifndef U_HIDE_DRAFT_API /** * Move assignment operator; might leave source in bogus state. * This locale will have the same contents that the source locale had. @@ -318,10 +318,9 @@ class U_COMMON_API Locale : public UObject { * * @param other The Locale object being moved in. * @return *this - * @draft ICU 63 + * @stable ICU 63 */ Locale& operator=(Locale&& other) U_NOEXCEPT; -#endif // U_HIDE_DRAFT_API /** * Checks if two locale keys are the same. @@ -389,7 +388,6 @@ class U_COMMON_API Locale : public UObject { UErrorCode& success); #endif /* U_HIDE_SYSTEM_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns a Locale for the specified BCP47 language tag string. * If the specified language tag contains any ill-formed subtags, @@ -405,7 +403,7 @@ class U_COMMON_API Locale : public UObject { * @param tag the input BCP47 language tag. * @param status error information if creating the Locale failed. * @return the Locale for the specified BCP47 language tag. - * @draft ICU 63 + * @stable ICU 63 */ static Locale U_EXPORT2 forLanguageTag(StringPiece tag, UErrorCode& status); @@ -420,7 +418,7 @@ class U_COMMON_API Locale : public UObject { * @param sink the output sink receiving the BCP47 language * tag for this Locale. * @param status error information if creating the language tag failed. - * @draft ICU 63 + * @stable ICU 63 */ void toLanguageTag(ByteSink& sink, UErrorCode& status) const; @@ -432,11 +430,10 @@ class U_COMMON_API Locale : public UObject { * * @param status error information if creating the language tag failed. * @return the BCP47 language tag for this Locale. - * @draft ICU 63 + * @stable ICU 63 */ template inline StringClass toLanguageTag(UErrorCode& status) const; -#endif // U_HIDE_DRAFT_API /** * Creates a locale which has had minimal canonicalization @@ -508,7 +505,6 @@ class U_COMMON_API Locale : public UObject { */ const char * getBaseName() const; -#ifndef U_HIDE_DRAFT_API /** * Add the likely subtags for this Locale, per the algorithm described * in the following CLDR technical report: @@ -536,7 +532,7 @@ class U_COMMON_API Locale : public UObject { * @param status error information if maximizing this Locale failed. * If this Locale is not well-formed, the error code is * U_ILLEGAL_ARGUMENT_ERROR. - * @draft ICU 63 + * @stable ICU 63 */ void addLikelySubtags(UErrorCode& status); @@ -567,10 +563,9 @@ class U_COMMON_API Locale : public UObject { * @param status error information if maximizing this Locale failed. * If this Locale is not well-formed, the error code is * U_ILLEGAL_ARGUMENT_ERROR. - * @draft ICU 63 + * @stable ICU 63 */ void minimizeSubtags(UErrorCode& status); -#endif // U_HIDE_DRAFT_API /** * Gets the list of keywords for the specified locale. @@ -583,8 +578,6 @@ class U_COMMON_API Locale : public UObject { */ StringEnumeration * createKeywords(UErrorCode &status) const; -#ifndef U_HIDE_DRAFT_API - /** * Gets the list of Unicode keywords for the specified locale. * @@ -592,7 +585,7 @@ class U_COMMON_API Locale : public UObject { * @return pointer to StringEnumeration class, or NULL if there are no keywords. * Client must dispose of it by calling delete. * @see getUnicodeKeywords - * @draft ICU 63 + * @stable ICU 63 */ StringEnumeration * createUnicodeKeywords(UErrorCode &status) const; @@ -605,7 +598,7 @@ class U_COMMON_API Locale : public UObject { * * @param iterator an STL style output iterator to write the keywords to. * @param status error information if creating set of keywords failed. - * @draft ICU 63 + * @stable ICU 63 */ template inline void getKeywords(OutputIterator iterator, UErrorCode& status) const; @@ -619,13 +612,11 @@ class U_COMMON_API Locale : public UObject { * * @param iterator an STL style output iterator to write the keywords to. * @param status error information if creating set of keywords failed. - * @draft ICU 63 + * @stable ICU 63 */ template inline void getUnicodeKeywords(OutputIterator iterator, UErrorCode& status) const; -#endif // U_HIDE_DRAFT_API - /** * Gets the value for a keyword. * @@ -644,7 +635,6 @@ class U_COMMON_API Locale : public UObject { */ int32_t getKeywordValue(const char* keywordName, char *buffer, int32_t bufferCapacity, UErrorCode &status) const; -#ifndef U_HIDE_DRAFT_API /** * Gets the value for a keyword. * @@ -656,7 +646,7 @@ class U_COMMON_API Locale : public UObject { * @param keywordName name of the keyword for which we want the value. * @param sink the sink to receive the keyword value. * @param status error information if getting the value failed. - * @draft ICU 63 + * @stable ICU 63 */ void getKeywordValue(StringPiece keywordName, ByteSink& sink, UErrorCode& status) const; @@ -671,7 +661,7 @@ class U_COMMON_API Locale : public UObject { * @param keywordName name of the keyword for which we want the value. * @param status error information if getting the value failed. * @return the keyword value. - * @draft ICU 63 + * @stable ICU 63 */ template inline StringClass getKeywordValue(StringPiece keywordName, UErrorCode& status) const; @@ -687,7 +677,7 @@ class U_COMMON_API Locale : public UObject { * @param keywordName name of the keyword for which we want the value. * @param sink the sink to receive the keyword value. * @param status error information if getting the value failed. - * @draft ICU 63 + * @stable ICU 63 */ void getUnicodeKeywordValue(StringPiece keywordName, ByteSink& sink, UErrorCode& status) const; @@ -702,11 +692,10 @@ class U_COMMON_API Locale : public UObject { * @param keywordName name of the keyword for which we want the value. * @param status error information if getting the value failed. * @return the keyword value. - * @draft ICU 63 + * @stable ICU 63 */ template inline StringClass getUnicodeKeywordValue(StringPiece keywordName, UErrorCode& status) const; -#endif // U_HIDE_DRAFT_API /** * Sets or removes the value for a keyword. @@ -729,7 +718,6 @@ class U_COMMON_API Locale : public UObject { */ void setKeywordValue(const char* keywordName, const char* keywordValue, UErrorCode &status); -#ifndef U_HIDE_DRAFT_API /** * Sets or removes the value for a keyword. * @@ -746,7 +734,7 @@ class U_COMMON_API Locale : public UObject { * NULL, will result in the keyword being removed. No error is given if * that keyword does not exist. * @param status Returns any error information while performing this operation. - * @draft ICU 63 + * @stable ICU 63 */ void setKeywordValue(StringPiece keywordName, StringPiece keywordValue, UErrorCode& status); @@ -766,10 +754,9 @@ class U_COMMON_API Locale : public UObject { * NULL, will result in the keyword being removed. No error is given if * that keyword does not exist. * @param status Returns any error information while performing this operation. - * @draft ICU 63 + * @stable ICU 63 */ void setUnicodeKeywordValue(StringPiece keywordName, StringPiece keywordValue, UErrorCode& status); -#endif // U_HIDE_DRAFT_API /** * returns the locale's three-letter language code, as specified @@ -1008,6 +995,104 @@ class U_COMMON_API Locale : public UObject { */ virtual UClassID getDynamicClassID() const; +#ifndef U_HIDE_DRAFT_API + /** + * A Locale iterator interface similar to a Java Iterator. + * @draft ICU 65 + */ + class U_COMMON_API Iterator /* not : public UObject because this is an interface/mixin class */ { + public: + /** @draft ICU 65 */ + virtual ~Iterator(); + + /** + * @return TRUE if next() can be called again. + * @draft ICU 65 + */ + virtual UBool hasNext() const = 0; + + /** + * @return the next locale. + * @draft ICU 65 + */ + virtual const Locale &next() = 0; + }; + + /** + * A generic Locale iterator implementation over Locale input iterators. + * @draft ICU 65 + */ + template + class RangeIterator : public Iterator, public UMemory { + public: + /** + * Constructs an iterator from a begin/end range. + * Each of the iterator parameter values must be an + * input iterator whose value is convertible to const Locale &. + * + * @param begin Start of range. + * @param end Exclusive end of range. + * @draft ICU 65 + */ + RangeIterator(Iter begin, Iter end) : it_(begin), end_(end) {} + + /** + * @return TRUE if next() can be called again. + * @draft ICU 65 + */ + UBool hasNext() const override { return it_ != end_; } + + /** + * @return the next locale. + * @draft ICU 65 + */ + const Locale &next() override { return *it_++; } + + private: + Iter it_; + const Iter end_; + }; + + /** + * A generic Locale iterator implementation over Locale input iterators. + * Calls the converter to convert each *begin to a const Locale &. + * @draft ICU 65 + */ + template + class ConvertingIterator : public Iterator, public UMemory { + public: + /** + * Constructs an iterator from a begin/end range. + * Each of the iterator parameter values must be an + * input iterator whose value the converter converts to const Locale &. + * + * @param begin Start of range. + * @param end Exclusive end of range. + * @param converter Converter from *begin to const Locale & or compatible. + * @draft ICU 65 + */ + ConvertingIterator(Iter begin, Iter end, Conv converter) : + it_(begin), end_(end), converter_(converter) {} + + /** + * @return TRUE if next() can be called again. + * @draft ICU 65 + */ + UBool hasNext() const override { return it_ != end_; } + + /** + * @return the next locale. + * @draft ICU 65 + */ + const Locale &next() override { return converter_(*it_++); } + + private: + Iter it_; + const Iter end_; + Conv converter_; + }; +#endif // U_HIDE_DRAFT_API + protected: /* only protected for testing purposes. DO NOT USE. */ #ifndef U_HIDE_INTERNAL_API /** @@ -1074,7 +1159,6 @@ Locale::operator!=(const Locale& other) const return !operator==(other); } -#ifndef U_HIDE_DRAFT_API template inline StringClass Locale::toLanguageTag(UErrorCode& status) const { @@ -1083,7 +1167,6 @@ Locale::toLanguageTag(UErrorCode& status) const toLanguageTag(sink, status); return result; } -#endif // U_HIDE_DRAFT_API inline const char * Locale::getCountry() const @@ -1115,13 +1198,11 @@ Locale::getName() const return fullName; } -#ifndef U_HIDE_DRAFT_API - template inline void Locale::getKeywords(OutputIterator iterator, UErrorCode& status) const { LocalPointer keys(createKeywords(status)); - if (U_FAILURE(status)) { + if (U_FAILURE(status) || keys.isNull()) { return; } for (;;) { @@ -1138,7 +1219,7 @@ template inline void Locale::getUnicodeKeywords(OutputIterator iterator, UErrorCode& status) const { LocalPointer keys(createUnicodeKeywords(status)); - if (U_FAILURE(status)) { + if (U_FAILURE(status) || keys.isNull()) { return; } for (;;) { @@ -1169,8 +1250,6 @@ Locale::getUnicodeKeywordValue(StringPiece keywordName, UErrorCode& status) cons return result; } -#endif // U_HIDE_DRAFT_API - inline UBool Locale::isBogus(void) const { return fIsBogus; @@ -1178,4 +1257,6 @@ Locale::isBogus(void) const { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/messagepattern.h b/deps/icu-small/source/common/unicode/messagepattern.h index 9f2a86551ca417..04f00a8757d783 100644 --- a/deps/icu-small/source/common/unicode/messagepattern.h +++ b/deps/icu-small/source/common/unicode/messagepattern.h @@ -24,6 +24,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/parseerr.h" @@ -942,4 +944,6 @@ U_NAMESPACE_END #endif // !UCONFIG_NO_FORMATTING +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __MESSAGEPATTERN_H__ diff --git a/deps/icu-small/source/common/unicode/normalizer2.h b/deps/icu-small/source/common/unicode/normalizer2.h index 4caa0e31034b2d..4aeb3bb3d82921 100644 --- a/deps/icu-small/source/common/unicode/normalizer2.h +++ b/deps/icu-small/source/common/unicode/normalizer2.h @@ -26,6 +26,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_NORMALIZATION #include "unicode/stringpiece.h" @@ -771,4 +773,7 @@ class U_COMMON_API FilteredNormalizer2 : public Normalizer2 { U_NAMESPACE_END #endif // !UCONFIG_NO_NORMALIZATION + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __NORMALIZER2_H__ diff --git a/deps/icu-small/source/common/unicode/normlzr.h b/deps/icu-small/source/common/unicode/normlzr.h index 82335ae6d7d19b..00dd820474f734 100644 --- a/deps/icu-small/source/common/unicode/normlzr.h +++ b/deps/icu-small/source/common/unicode/normlzr.h @@ -13,6 +13,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Unicode Normalization @@ -183,6 +185,7 @@ class U_COMMON_API Normalizer : public UObject { Normalizer(const CharacterIterator& iter, UNormalizationMode mode); #endif /* U_HIDE_DEPRECATED_API */ +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Copy constructor. * @param copy The object to be copied. @@ -195,7 +198,7 @@ class U_COMMON_API Normalizer : public UObject { * @deprecated ICU 56 Use Normalizer2 instead. */ virtual ~Normalizer(); - +#endif // U_FORCE_HIDE_DEPRECATED_API //------------------------------------------------------------------------- // Static utility methods @@ -599,7 +602,7 @@ class U_COMMON_API Normalizer : public UObject { * @return a pointer to a new Normalizer * @deprecated ICU 56 Use Normalizer2 instead. */ - Normalizer* clone(void) const; + Normalizer* clone() const; /** * Generates a hash code for this iterator. @@ -723,12 +726,14 @@ class U_COMMON_API Normalizer : public UObject { static UClassID U_EXPORT2 getStaticClassID(); #endif /* U_HIDE_DEPRECATED_API */ +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * @return a UClassID for the actual class. * @deprecated ICU 56 Use Normalizer2 instead. */ virtual UClassID getDynamicClassID() const; +#endif // U_FORCE_HIDE_DEPRECATED_API private: //------------------------------------------------------------------------- @@ -807,3 +812,5 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_NORMALIZATION */ #endif // NORMLZR_H + +#endif /* U_SHOW_CPLUSPLUS_API */ diff --git a/deps/icu-small/source/common/unicode/parsepos.h b/deps/icu-small/source/common/unicode/parsepos.h index c02c8169565738..ae5754b8d75132 100644 --- a/deps/icu-small/source/common/unicode/parsepos.h +++ b/deps/icu-small/source/common/unicode/parsepos.h @@ -19,6 +19,9 @@ #define PARSEPOS_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" @@ -229,4 +232,6 @@ ParsePosition::setErrorIndex(int32_t ei) } U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/platform.h b/deps/icu-small/source/common/unicode/platform.h index ee0d8b7a000303..74689d790cf79a 100644 --- a/deps/icu-small/source/common/unicode/platform.h +++ b/deps/icu-small/source/common/unicode/platform.h @@ -135,6 +135,14 @@ /** Fuchsia is a POSIX-ish platform. @internal */ #define U_PF_FUCHSIA 4100 /* Maximum value for Linux-based platform is 4499 */ +/** + * Emscripten is a C++ transpiler for the Web that can target asm.js or + * WebAssembly. It provides some POSIX-compatible wrappers and stubs and + * some Linux-like functionality, but is not fully compatible with + * either. + * @internal + */ +#define U_PF_EMSCRIPTEN 5010 /** z/OS is the successor to OS/390 which was the successor to MVS. @internal */ #define U_PF_OS390 9000 /** "IBM i" is the current name of what used to be i5/OS and earlier OS/400. @internal */ @@ -192,6 +200,8 @@ # define U_PLATFORM U_PF_OS390 #elif defined(__OS400__) || defined(__TOS_OS400__) # define U_PLATFORM U_PF_OS400 +#elif defined(__EMSCRIPTEN__) +# define U_PLATFORM U_PF_EMSCRIPTEN #else # define U_PLATFORM U_PF_UNKNOWN #endif @@ -414,26 +424,40 @@ #endif /* Compatibility with compilers other than clang: http://clang.llvm.org/docs/LanguageExtensions.html */ -#ifndef __has_attribute -# define __has_attribute(x) 0 +#ifdef __has_attribute +# define UPRV_HAS_ATTRIBUTE(x) __has_attribute(x) +#else +# define UPRV_HAS_ATTRIBUTE(x) 0 #endif -#ifndef __has_cpp_attribute -# define __has_cpp_attribute(x) 0 +#ifdef __has_cpp_attribute +# define UPRV_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) +#else +# define UPRV_HAS_CPP_ATTRIBUTE(x) 0 #endif -#ifndef __has_declspec_attribute -# define __has_declspec_attribute(x) 0 +#ifdef __has_declspec_attribute +# define UPRV_HAS_DECLSPEC_ATTRIBUTE(x) __has_declspec_attribute(x) +#else +# define UPRV_HAS_DECLSPEC_ATTRIBUTE(x) 0 #endif -#ifndef __has_builtin -# define __has_builtin(x) 0 +#ifdef __has_builtin +# define UPRV_HAS_BUILTIN(x) __has_builtin(x) +#else +# define UPRV_HAS_BUILTIN(x) 0 #endif -#ifndef __has_feature -# define __has_feature(x) 0 +#ifdef __has_feature +# define UPRV_HAS_FEATURE(x) __has_feature(x) +#else +# define UPRV_HAS_FEATURE(x) 0 #endif -#ifndef __has_extension -# define __has_extension(x) 0 +#ifdef __has_extension +# define UPRV_HAS_EXTENSION(x) __has_extension(x) +#else +# define UPRV_HAS_EXTENSION(x) 0 #endif -#ifndef __has_warning -# define __has_warning(x) 0 +#ifdef __has_warning +# define UPRV_HAS_WARNING(x) __has_warning(x) +#else +# define UPRV_HAS_WARNING(x) 0 #endif /** @@ -452,7 +476,9 @@ * Attribute to specify the size of the allocated buffer for malloc-like functions * @internal */ -#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || __has_attribute(alloc_size) +#if (defined(__GNUC__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || \ + UPRV_HAS_ATTRIBUTE(alloc_size) # define U_ALLOC_SIZE_ATTR(X) __attribute__ ((alloc_size(X))) # define U_ALLOC_SIZE_ATTR2(X,Y) __attribute__ ((alloc_size(X,Y))) #else @@ -516,8 +542,9 @@ namespace std { #elif defined(__clang__) // Test for compiler vs. feature separately. // Other compilers might choke on the feature test. -# if __has_cpp_attribute(clang::fallthrough) || \ - (__has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")) +# if UPRV_HAS_CPP_ATTRIBUTE(clang::fallthrough) || \ + (UPRV_HAS_FEATURE(cxx_attributes) && \ + UPRV_HAS_WARNING("-Wimplicit-fallthrough")) # define U_FALLTHROUGH [[clang::fallthrough]] # endif #elif defined(__GNUC__) && (__GNUC__ >= 7) @@ -620,7 +647,8 @@ namespace std { */ #ifdef U_CHARSET_IS_UTF8 /* Use the predefined value. */ -#elif U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED +#elif U_PLATFORM_IS_LINUX_BASED || U_PLATFORM_IS_DARWIN_BASED || \ + U_PLATFORM == U_PF_EMSCRIPTEN # define U_CHARSET_IS_UTF8 1 #else # define U_CHARSET_IS_UTF8 0 @@ -707,7 +735,7 @@ namespace std { * narrow-character strings are in EBCDIC. */ # define U_SIZEOF_WCHAR_T 2 -#else +# else /* * LOCALETYPE(*CLD) or LOCALETYPE(*LOCALE) is specified. * Wide-character strings are in 16-bit EBCDIC, @@ -786,7 +814,8 @@ namespace std { /* Use the predefined value. */ #elif defined(U_STATIC_IMPLEMENTATION) # define U_EXPORT -#elif defined(_MSC_VER) || (__has_declspec_attribute(dllexport) && __has_declspec_attribute(dllimport)) +#elif defined(_MSC_VER) || (UPRV_HAS_DECLSPEC_ATTRIBUTE(dllexport) && \ + UPRV_HAS_DECLSPEC_ATTRIBUTE(dllimport)) # define U_EXPORT __declspec(dllexport) #elif defined(__GNUC__) # define U_EXPORT __attribute__((visibility("default"))) @@ -810,7 +839,8 @@ namespace std { #ifdef U_IMPORT /* Use the predefined value. */ -#elif defined(_MSC_VER) || (__has_declspec_attribute(dllexport) && __has_declspec_attribute(dllimport)) +#elif defined(_MSC_VER) || (UPRV_HAS_DECLSPEC_ATTRIBUTE(dllexport) && \ + UPRV_HAS_DECLSPEC_ATTRIBUTE(dllimport)) /* Windows needs to export/import data. */ # define U_IMPORT __declspec(dllimport) #else @@ -852,4 +882,4 @@ namespace std { #endif /* @} */ -#endif +#endif // _PLATFORM_H diff --git a/deps/icu-small/source/common/unicode/rbbi.h b/deps/icu-small/source/common/unicode/rbbi.h index 365ae2d3d2ac75..7825f603a51c1b 100644 --- a/deps/icu-small/source/common/unicode/rbbi.h +++ b/deps/icu-small/source/common/unicode/rbbi.h @@ -18,6 +18,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Rule Based Break Iterator @@ -272,7 +274,7 @@ class U_COMMON_API RuleBasedBreakIterator /*U_FINAL*/ : public BreakIterator { * @return a newly-constructed RuleBasedBreakIterator * @stable ICU 2.0 */ - virtual BreakIterator* clone() const; + virtual RuleBasedBreakIterator* clone() const; /** * Compute a hash code for this BreakIterator @@ -536,6 +538,7 @@ class U_COMMON_API RuleBasedBreakIterator /*U_FINAL*/ : public BreakIterator { */ static UClassID U_EXPORT2 getStaticClassID(void); +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Deprecated functionality. Use clone() instead. * @@ -562,10 +565,10 @@ class U_COMMON_API RuleBasedBreakIterator /*U_FINAL*/ : public BreakIterator { * or if the stackBuffer was too small to hold the clone. * @deprecated ICU 52. Use clone() instead. */ - virtual BreakIterator * createBufferClone(void *stackBuffer, - int32_t &BufferSize, - UErrorCode &status); - + virtual RuleBasedBreakIterator *createBufferClone(void *stackBuffer, + int32_t &BufferSize, + UErrorCode &status); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Return the binary form of compiled break rules, @@ -696,4 +699,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_BREAK_ITERATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/rep.h b/deps/icu-small/source/common/unicode/rep.h index b1023a37a2daf1..f66c2ac060e4a8 100644 --- a/deps/icu-small/source/common/unicode/rep.h +++ b/deps/icu-small/source/common/unicode/rep.h @@ -16,6 +16,10 @@ #ifndef REP_H #define REP_H +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" /** @@ -189,9 +193,6 @@ class U_COMMON_API Replaceable : public UObject { * Clones can be used concurrently in multiple threads. * If a subclass does not implement clone(), or if an error occurs, * then NULL is returned. - * The clone functions in all subclasses return a pointer to a Replaceable - * because some compilers do not support covariant (same-as-this) - * return types; cast to the appropriate subclass if necessary. * The caller must delete the clone. * * @return a clone of this object @@ -260,4 +261,6 @@ Replaceable::char32At(int32_t offset) const { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/resbund.h b/deps/icu-small/source/common/unicode/resbund.h index ab0b60bbb28fcc..708a3423d2ae2b 100644 --- a/deps/icu-small/source/common/unicode/resbund.h +++ b/deps/icu-small/source/common/unicode/resbund.h @@ -49,6 +49,9 @@ #define RESBUND_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" #include "unicode/ures.h" #include "unicode/unistr.h" @@ -489,4 +492,7 @@ class U_COMMON_API ResourceBundle : public UObject { }; U_NAMESPACE_END + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/schriter.h b/deps/icu-small/source/common/unicode/schriter.h index 1a12769e8df106..4925ecfe444280 100644 --- a/deps/icu-small/source/common/unicode/schriter.h +++ b/deps/icu-small/source/common/unicode/schriter.h @@ -21,6 +21,9 @@ #define SCHRITER_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/chariter.h" #include "unicode/uchriter.h" @@ -130,7 +133,7 @@ class U_COMMON_API StringCharacterIterator : public UCharCharacterIterator { * @return the newly cloned object. * @stable ICU 2.0 */ - virtual CharacterIterator* clone(void) const; + virtual StringCharacterIterator* clone() const; /** * Sets the iterator to iterate over the provided string. @@ -186,4 +189,7 @@ class U_COMMON_API StringCharacterIterator : public UCharCharacterIterator { }; U_NAMESPACE_END + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/simpleformatter.h b/deps/icu-small/source/common/unicode/simpleformatter.h index 3f7d93dc094a18..9414bca3085ad4 100644 --- a/deps/icu-small/source/common/unicode/simpleformatter.h +++ b/deps/icu-small/source/common/unicode/simpleformatter.h @@ -17,6 +17,9 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/unistr.h" U_NAMESPACE_BEGIN @@ -333,4 +336,6 @@ class U_COMMON_API SimpleFormatter U_FINAL : public UMemory { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __SIMPLEFORMATTER_H__ diff --git a/deps/icu-small/source/common/unicode/std_string.h b/deps/icu-small/source/common/unicode/std_string.h index 729c56399506eb..bf87230167ecf2 100644 --- a/deps/icu-small/source/common/unicode/std_string.h +++ b/deps/icu-small/source/common/unicode/std_string.h @@ -27,6 +27,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + // Workaround for a libstdc++ bug before libstdc++4.6 (2011). // https://bugs.llvm.org/show_bug.cgi?id=13364 #if defined(__GLIBCXX__) @@ -34,4 +36,6 @@ namespace std { class type_info; } #endif #include +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __STD_STRING_H__ diff --git a/deps/icu-small/source/common/unicode/strenum.h b/deps/icu-small/source/common/unicode/strenum.h index fa525d4f5227da..e813cd84b3413a 100644 --- a/deps/icu-small/source/common/unicode/strenum.h +++ b/deps/icu-small/source/common/unicode/strenum.h @@ -12,6 +12,10 @@ #ifndef STRENUM_H #define STRENUM_H +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" #include "unicode/unistr.h" @@ -67,9 +71,6 @@ class U_COMMON_API StringEnumeration : public UObject { * Clones can be used concurrently in multiple threads. * If a subclass does not implement clone(), or if an error occurs, * then NULL is returned. - * The clone functions in all subclasses return a base class pointer - * because some compilers do not support covariant (same-as-this) - * return types; cast to the appropriate subclass if necessary. * The caller must delete the clone. * * @return a clone of this object @@ -274,5 +275,7 @@ class U_COMMON_API StringEnumeration : public UObject { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + /* STRENUM_H */ #endif diff --git a/deps/icu-small/source/common/unicode/stringpiece.h b/deps/icu-small/source/common/unicode/stringpiece.h index 640fbac5a827d0..15cebb0f202fe7 100644 --- a/deps/icu-small/source/common/unicode/stringpiece.h +++ b/deps/icu-small/source/common/unicode/stringpiece.h @@ -28,6 +28,12 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + +#include +#include + #include "unicode/uobject.h" #include "unicode/std_string.h" @@ -74,6 +80,33 @@ class U_COMMON_API StringPiece : public UMemory { */ StringPiece(const std::string& str) : ptr_(str.data()), length_(static_cast(str.size())) { } +#ifndef U_HIDE_DRAFT_API + /** + * Constructs from some other implementation of a string piece class, from any + * C++ record type that has these two methods: + * + * \code{.cpp} + * + * struct OtherStringPieceClass { + * const char* data(); + * size_t size(); + * }; + * + * \endcode + * + * The other string piece class will typically be std::string_view from C++17 + * or absl::string_view from Abseil. + * + * @param str the other string piece + * @draft ICU 65 + */ + template ::value && + std::is_same::value>::type> + StringPiece(T str) + : ptr_(str.data()), length_(static_cast(str.size())) {} +#endif // U_HIDE_DRAFT_API /** * Constructs from a const char * pointer and a specified length. * @param offset a const char * pointer (need not be terminated) @@ -221,4 +254,6 @@ inline UBool operator!=(const StringPiece& x, const StringPiece& y) { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __STRINGPIECE_H__ diff --git a/deps/icu-small/source/common/unicode/stringtriebuilder.h b/deps/icu-small/source/common/unicode/stringtriebuilder.h index c27fbd67960d70..2860cbf5513b8e 100644 --- a/deps/icu-small/source/common/unicode/stringtriebuilder.h +++ b/deps/icu-small/source/common/unicode/stringtriebuilder.h @@ -18,6 +18,9 @@ #define __STRINGTRIEBUILDER_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" /** @@ -418,4 +421,6 @@ class U_COMMON_API StringTrieBuilder : public UObject { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __STRINGTRIEBUILDER_H__ diff --git a/deps/icu-small/source/common/unicode/symtable.h b/deps/icu-small/source/common/unicode/symtable.h index c2dc95a61bc020..f5a77b01eced80 100644 --- a/deps/icu-small/source/common/unicode/symtable.h +++ b/deps/icu-small/source/common/unicode/symtable.h @@ -13,6 +13,9 @@ #define SYMTABLE_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" /** @@ -111,4 +114,6 @@ class U_COMMON_API SymbolTable /* not : public UObject because this is an interf }; U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/uchar.h b/deps/icu-small/source/common/unicode/uchar.h index d70c964e38e5b8..1b7ee099be7ca2 100644 --- a/deps/icu-small/source/common/unicode/uchar.h +++ b/deps/icu-small/source/common/unicode/uchar.h @@ -2578,8 +2578,6 @@ typedef enum UVerticalOrientation { U_STABLE UBool U_EXPORT2 u_hasBinaryProperty(UChar32 c, UProperty which); -#ifndef U_HIDE_DRAFT_API - /** * Returns a frozen USet for a binary property. * The library retains ownership over the returned object. @@ -2593,13 +2591,11 @@ u_hasBinaryProperty(UChar32 c, UProperty which); * @see UProperty * @see u_hasBinaryProperty * @see Unicode::fromUSet - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI const USet * U_EXPORT2 u_getBinaryPropertySet(UProperty property, UErrorCode *pErrorCode); -#endif // U_HIDE_DRAFT_API - /** * Check if a code point has the Alphabetic Unicode property. * Same as u_hasBinaryProperty(c, UCHAR_ALPHABETIC). @@ -2757,8 +2753,6 @@ u_getIntPropertyMinValue(UProperty which); U_STABLE int32_t U_EXPORT2 u_getIntPropertyMaxValue(UProperty which); -#ifndef U_HIDE_DRAFT_API - /** * Returns an immutable UCPMap for an enumerated/catalog/int-valued property. * The library retains ownership over the returned object. @@ -2772,13 +2766,11 @@ u_getIntPropertyMaxValue(UProperty which); * @return the property as a map * @see UProperty * @see u_getIntPropertyValue - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI const UCPMap * U_EXPORT2 u_getIntPropertyMap(UProperty property, UErrorCode *pErrorCode); -#endif // U_HIDE_DRAFT_API - /** * Get the numeric value for a Unicode code point as defined in the * Unicode Character Database. @@ -3197,15 +3189,14 @@ U_STABLE UBool U_EXPORT2 u_isprint(UChar32 c); /** - * Determines whether the specified code point is a base character. + * Non-standard: Determines whether the specified code point is a base character. * True for general categories "L" (letters), "N" (numbers), * "Mc" (spacing combining marks), and "Me" (enclosing marks). * - * Note that this is different from the Unicode definition in - * chapter 3.5, conformance clause D13, - * which defines base characters to be all characters (not Cn) - * that do not graphically combine with preceding characters (M) - * and that are neither control (Cc) or format (Cf) characters. + * Note that this is different from the Unicode Standard definition in + * chapter 3.6, conformance clause D51 “Base character”, + * which defines base characters as the code points with general categories + * Letter (L), Number (N), Punctuation (P), Symbol (S), or Space Separator (Zs). * * @param c the code point to be tested * @return TRUE if the code point is a base character according to this function diff --git a/deps/icu-small/source/common/unicode/ucharstrie.h b/deps/icu-small/source/common/unicode/ucharstrie.h index dfc93f6d0bae8a..d5729d944ee3a2 100644 --- a/deps/icu-small/source/common/unicode/ucharstrie.h +++ b/deps/icu-small/source/common/unicode/ucharstrie.h @@ -24,6 +24,9 @@ */ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/unistr.h" #include "unicode/uobject.h" #include "unicode/ustringtrie.h" @@ -94,6 +97,41 @@ class U_COMMON_API UCharsTrie : public UMemory { return *this; } +#ifndef U_HIDE_DRAFT_API + /** + * Returns the state of this trie as a 64-bit integer. + * The state value is never 0. + * + * @return opaque state value + * @see resetToState64 + * @draft ICU 65 + */ + uint64_t getState64() const { + return (static_cast(remainingMatchLength_ + 2) << kState64RemainingShift) | + (uint64_t)(pos_ - uchars_); + } + + /** + * Resets this trie to the saved state. + * Unlike resetToState(State), the 64-bit state value + * must be from getState64() from the same trie object or + * from one initialized the exact same way. + * Because of no validation, this method is faster. + * + * @param state The opaque trie state value from getState64(). + * @return *this + * @see getState64 + * @see resetToState + * @see reset + * @draft ICU 65 + */ + UCharsTrie &resetToState64(uint64_t state) { + remainingMatchLength_ = static_cast(state >> kState64RemainingShift) - 2; + pos_ = uchars_ + (state & kState64PosMask); + return *this; + } +#endif /* U_HIDE_DRAFT_API */ + /** * UCharsTrie state object, for saving a trie's current state * and resetting the trie back to this state later. @@ -560,6 +598,13 @@ class U_COMMON_API UCharsTrie : public UMemory { static const int32_t kMaxTwoUnitDelta=((kThreeUnitDeltaLead-kMinTwoUnitDeltaLead)<<16)-1; // 0x03feffff + // For getState64(): + // The remainingMatchLength_ is -1..14=(kMaxLinearMatchLength=0x10)-2 + // so we need at least 5 bits for that. + // We add 2 to store it as a positive value 1..16=kMaxLinearMatchLength. + static constexpr int32_t kState64RemainingShift = 59; + static constexpr uint64_t kState64PosMask = (UINT64_C(1) << kState64RemainingShift) - 1; + char16_t *ownedArray_; // Fixed value referencing the UCharsTrie words. @@ -575,4 +620,6 @@ class U_COMMON_API UCharsTrie : public UMemory { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __UCHARSTRIE_H__ diff --git a/deps/icu-small/source/common/unicode/ucharstriebuilder.h b/deps/icu-small/source/common/unicode/ucharstriebuilder.h index 2aa4757e52cb07..540dcc047fd563 100644 --- a/deps/icu-small/source/common/unicode/ucharstriebuilder.h +++ b/deps/icu-small/source/common/unicode/ucharstriebuilder.h @@ -18,6 +18,9 @@ #define __UCHARSTRIEBUILDER_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/stringtriebuilder.h" #include "unicode/ucharstrie.h" #include "unicode/unistr.h" @@ -184,4 +187,6 @@ class U_COMMON_API UCharsTrieBuilder : public StringTrieBuilder { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __UCHARSTRIEBUILDER_H__ diff --git a/deps/icu-small/source/common/unicode/uchriter.h b/deps/icu-small/source/common/unicode/uchriter.h index 38f67c5b454cba..bee842cc259f07 100644 --- a/deps/icu-small/source/common/unicode/uchriter.h +++ b/deps/icu-small/source/common/unicode/uchriter.h @@ -11,6 +11,9 @@ #define UCHRITER_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/chariter.h" /** @@ -132,7 +135,7 @@ class U_COMMON_API UCharCharacterIterator : public CharacterIterator { * @return the CharacterIterator newly created * @stable ICU 2.0 */ - virtual CharacterIterator* clone(void) const; + virtual UCharCharacterIterator* clone() const; /** * Sets the iterator to refer to the first code unit in its @@ -384,4 +387,7 @@ class U_COMMON_API UCharCharacterIterator : public CharacterIterator { }; U_NAMESPACE_END + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/uconfig.h b/deps/icu-small/source/common/unicode/uconfig.h index 9c82d828125603..c0157efe6d4ede 100644 --- a/deps/icu-small/source/common/unicode/uconfig.h +++ b/deps/icu-small/source/common/unicode/uconfig.h @@ -453,4 +453,4 @@ # define UCONFIG_NO_FILTERED_BREAK_ITERATION 0 #endif -#endif +#endif // __UCONFIG_H__ diff --git a/deps/icu-small/source/common/unicode/ucpmap.h b/deps/icu-small/source/common/unicode/ucpmap.h index f2c42b6b7f4bee..31e1365cac850a 100644 --- a/deps/icu-small/source/common/unicode/ucpmap.h +++ b/deps/icu-small/source/common/unicode/ucpmap.h @@ -9,8 +9,6 @@ #include "unicode/utypes.h" -#ifndef U_HIDE_DRAFT_API - U_CDECL_BEGIN /** @@ -28,7 +26,7 @@ U_CDECL_BEGIN * * @see UCPTrie * @see UMutableCPTrie - * @draft ICU 63 + * @stable ICU 63 */ typedef struct UCPMap UCPMap; @@ -39,13 +37,13 @@ typedef struct UCPMap UCPMap; * @see ucpmap_getRange * @see ucptrie_getRange * @see umutablecptrie_getRange - * @draft ICU 63 + * @stable ICU 63 */ enum UCPMapRangeOption { /** * ucpmap_getRange() enumerates all same-value ranges as stored in the map. * Most users should use this option. - * @draft ICU 63 + * @stable ICU 63 */ UCPMAP_RANGE_NORMAL, /** @@ -61,7 +59,7 @@ enum UCPMapRangeOption { * special values optimized for UTF-16 string processing * or for special error behavior for unpaired surrogates, * but those values are not to be associated with the lead surrogate code *points*. - * @draft ICU 63 + * @stable ICU 63 */ UCPMAP_RANGE_FIXED_LEAD_SURROGATES, /** @@ -77,7 +75,7 @@ enum UCPMapRangeOption { * special values optimized for UTF-16 string processing * or for special error behavior for unpaired surrogates, * but those values are not to be associated with the lead surrogate code *points*. - * @draft ICU 63 + * @stable ICU 63 */ UCPMAP_RANGE_FIXED_ALL_SURROGATES }; @@ -93,7 +91,7 @@ typedef enum UCPMapRangeOption UCPMapRangeOption; * @param c the code point * @return the map value, * or an implementation-defined error value if the code point is not in the range 0..U+10FFFF - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI uint32_t U_EXPORT2 ucpmap_get(const UCPMap *map, UChar32 c); @@ -110,7 +108,7 @@ ucpmap_get(const UCPMap *map, UChar32 c); * @param context an opaque pointer, as passed into the getRange function * @param value a value from the map * @return the modified value - * @draft ICU 63 + * @stable ICU 63 */ typedef uint32_t U_CALLCONV UCPMapValueFilter(const void *context, uint32_t value); @@ -149,7 +147,7 @@ UCPMapValueFilter(const void *context, uint32_t value); * may have been modified by filter(context, map value) * if that function pointer is not NULL * @return the range end code point, or -1 if start is not a valid code point - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UChar32 U_EXPORT2 ucpmap_getRange(const UCPMap *map, UChar32 start, @@ -158,5 +156,4 @@ ucpmap_getRange(const UCPMap *map, UChar32 start, U_CDECL_END -#endif // U_HIDE_DRAFT_API #endif diff --git a/deps/icu-small/source/common/unicode/ucptrie.h b/deps/icu-small/source/common/unicode/ucptrie.h index 2718c984e43197..be06a227928286 100644 --- a/deps/icu-small/source/common/unicode/ucptrie.h +++ b/deps/icu-small/source/common/unicode/ucptrie.h @@ -9,8 +9,6 @@ #include "unicode/utypes.h" -#ifndef U_HIDE_DRAFT_API - #include "unicode/localpointer.h" #include "unicode/ucpmap.h" #include "unicode/utf8.h" @@ -55,7 +53,7 @@ typedef union UCPTrieData { * The macros will return bogus values, or may crash, if used on the wrong type or value width. * * @see UMutableCPTrie - * @draft ICU 63 + * @stable ICU 63 */ struct UCPTrie { #ifndef U_IN_DOXYGEN @@ -115,23 +113,23 @@ typedef struct UCPTrie UCPTrie; * @see umutablecptrie_buildImmutable * @see ucptrie_openFromBinary * @see ucptrie_getType - * @draft ICU 63 + * @stable ICU 63 */ enum UCPTrieType { /** * For ucptrie_openFromBinary() to accept any type. * ucptrie_getType() will return the actual type. - * @draft ICU 63 + * @stable ICU 63 */ UCPTRIE_TYPE_ANY = -1, /** * Fast/simple/larger BMP data structure. Use functions and "fast" macros. - * @draft ICU 63 + * @stable ICU 63 */ UCPTRIE_TYPE_FAST, /** * Small/slower BMP data structure. Use functions and "small" macros. - * @draft ICU 63 + * @stable ICU 63 */ UCPTRIE_TYPE_SMALL }; @@ -145,30 +143,30 @@ typedef enum UCPTrieType UCPTrieType; * @see umutablecptrie_buildImmutable * @see ucptrie_openFromBinary * @see ucptrie_getValueWidth - * @draft ICU 63 + * @stable ICU 63 */ enum UCPTrieValueWidth { /** * For ucptrie_openFromBinary() to accept any data value width. * ucptrie_getValueWidth() will return the actual data value width. - * @draft ICU 63 + * @stable ICU 63 */ UCPTRIE_VALUE_BITS_ANY = -1, /** * The trie stores 16 bits per data value. * It returns them as unsigned values 0..0xffff=65535. - * @draft ICU 63 + * @stable ICU 63 */ UCPTRIE_VALUE_BITS_16, /** * The trie stores 32 bits per data value. - * @draft ICU 63 + * @stable ICU 63 */ UCPTRIE_VALUE_BITS_32, /** * The trie stores 8 bits per data value. * It returns them as unsigned values 0..0xff=255. - * @draft ICU 63 + * @stable ICU 63 */ UCPTRIE_VALUE_BITS_8 }; @@ -200,7 +198,7 @@ typedef enum UCPTrieValueWidth UCPTrieValueWidth; * @see umutablecptrie_open * @see umutablecptrie_buildImmutable * @see ucptrie_toBinary - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UCPTrie * U_EXPORT2 ucptrie_openFromBinary(UCPTrieType type, UCPTrieValueWidth valueWidth, @@ -211,30 +209,11 @@ ucptrie_openFromBinary(UCPTrieType type, UCPTrieValueWidth valueWidth, * Closes a trie and releases associated memory. * * @param trie the trie - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI void U_EXPORT2 ucptrie_close(UCPTrie *trie); -#if U_SHOW_CPLUSPLUS_API - -U_NAMESPACE_BEGIN - -/** - * \class LocalUCPTriePointer - * "Smart pointer" class, closes a UCPTrie via ucptrie_close(). - * For most methods see the LocalPointerBase base class. - * - * @see LocalPointerBase - * @see LocalPointer - * @draft ICU 63 - */ -U_DEFINE_LOCAL_OPEN_POINTER(LocalUCPTriePointer, UCPTrie, ucptrie_close); - -U_NAMESPACE_END - -#endif - /** * Returns the trie type. * @@ -242,7 +221,7 @@ U_NAMESPACE_END * @return the trie type * @see ucptrie_openFromBinary * @see UCPTRIE_TYPE_ANY - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UCPTrieType U_EXPORT2 ucptrie_getType(const UCPTrie *trie); @@ -254,7 +233,7 @@ ucptrie_getType(const UCPTrie *trie); * @return the number of bits in a trie data value * @see ucptrie_openFromBinary * @see UCPTRIE_VALUE_BITS_ANY - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UCPTrieValueWidth U_EXPORT2 ucptrie_getValueWidth(const UCPTrie *trie); @@ -271,7 +250,7 @@ ucptrie_getValueWidth(const UCPTrie *trie); * @param c the code point * @return the trie value, * or the trie error value if the code point is not in the range 0..U+10FFFF - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI uint32_t U_EXPORT2 ucptrie_get(const UCPTrie *trie, UChar32 c); @@ -310,7 +289,7 @@ ucptrie_get(const UCPTrie *trie, UChar32 c); * may have been modified by filter(context, trie value) * if that function pointer is not NULL * @return the range end code point, or -1 if start is not a valid code point - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UChar32 U_EXPORT2 ucptrie_getRange(const UCPTrie *trie, UChar32 start, @@ -330,7 +309,7 @@ ucptrie_getRange(const UCPTrie *trie, UChar32 start, * @return the number of bytes written or (if buffer overflow) needed for the trie * * @see ucptrie_openFromBinary() - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI int32_t U_EXPORT2 ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode *pErrorCode); @@ -341,7 +320,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * Do not use this macro in any other way. * * @see UCPTRIE_VALUE_BITS_16 - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_16(trie, i) ((trie)->data.ptr16[i]) @@ -351,7 +330,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * Do not use this macro in any other way. * * @see UCPTRIE_VALUE_BITS_32 - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_32(trie, i) ((trie)->data.ptr32[i]) @@ -361,7 +340,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * Do not use this macro in any other way. * * @see UCPTRIE_VALUE_BITS_8 - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_8(trie, i) ((trie)->data.ptr8[i]) @@ -373,7 +352,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param dataAccess UCPTRIE_16, UCPTRIE_32, or UCPTRIE_8 according to the trie’s value width * @param c (UChar32, in) the input code point * @return The code point's trie value. - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_FAST_GET(trie, dataAccess, c) dataAccess(trie, _UCPTRIE_CP_INDEX(trie, 0xffff, c)) @@ -385,7 +364,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param dataAccess UCPTRIE_16, UCPTRIE_32, or UCPTRIE_8 according to the trie’s value width * @param c (UChar32, in) the input code point * @return The code point's trie value. - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_SMALL_GET(trie, dataAccess, c) \ dataAccess(trie, _UCPTRIE_CP_INDEX(trie, UCPTRIE_SMALL_MAX, c)) @@ -401,9 +380,9 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param limit (const UChar *, in) the limit pointer for the text, or NULL if NUL-terminated * @param c (UChar32, out) variable for the code point * @param result (out) variable for the trie lookup result - * @draft ICU 63 + * @stable ICU 63 */ -#define UCPTRIE_FAST_U16_NEXT(trie, dataAccess, src, limit, c, result) { \ +#define UCPTRIE_FAST_U16_NEXT(trie, dataAccess, src, limit, c, result) UPRV_BLOCK_MACRO_BEGIN { \ (c) = *(src)++; \ int32_t __index; \ if (!U16_IS_SURROGATE(c)) { \ @@ -419,7 +398,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * } \ } \ (result) = dataAccess(trie, __index); \ -} +} UPRV_BLOCK_MACRO_END /** * UTF-16: Reads the previous code point (UChar32 c, out), pre-decrements src, @@ -432,9 +411,9 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param src (const UChar *, in/out) the source text pointer * @param c (UChar32, out) variable for the code point * @param result (out) variable for the trie lookup result - * @draft ICU 63 + * @stable ICU 63 */ -#define UCPTRIE_FAST_U16_PREV(trie, dataAccess, start, src, c, result) { \ +#define UCPTRIE_FAST_U16_PREV(trie, dataAccess, start, src, c, result) UPRV_BLOCK_MACRO_BEGIN { \ (c) = *--(src); \ int32_t __index; \ if (!U16_IS_SURROGATE(c)) { \ @@ -450,7 +429,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * } \ } \ (result) = dataAccess(trie, __index); \ -} +} UPRV_BLOCK_MACRO_END /** * UTF-8: Post-increments src and gets a value from the trie. @@ -466,9 +445,9 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param src (const char *, in/out) the source text pointer * @param limit (const char *, in) the limit pointer for the text (must not be NULL) * @param result (out) variable for the trie lookup result - * @draft ICU 63 + * @stable ICU 63 */ -#define UCPTRIE_FAST_U8_NEXT(trie, dataAccess, src, limit, result) { \ +#define UCPTRIE_FAST_U8_NEXT(trie, dataAccess, src, limit, result) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __lead = (uint8_t)*(src)++; \ if (!U8_IS_SINGLE(__lead)) { \ uint8_t __t1, __t2, __t3; \ @@ -496,7 +475,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * } \ } \ (result) = dataAccess(trie, __lead); \ -} +} UPRV_BLOCK_MACRO_END /** * UTF-8: Pre-decrements src and gets a value from the trie. @@ -512,9 +491,9 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param start (const char *, in) the start pointer for the text * @param src (const char *, in/out) the source text pointer * @param result (out) variable for the trie lookup result - * @draft ICU 63 + * @stable ICU 63 */ -#define UCPTRIE_FAST_U8_PREV(trie, dataAccess, start, src, result) { \ +#define UCPTRIE_FAST_U8_PREV(trie, dataAccess, start, src, result) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __index = (uint8_t)*--(src); \ if (!U8_IS_SINGLE(__index)) { \ __index = ucptrie_internalU8PrevIndex((trie), __index, (const uint8_t *)(start), \ @@ -523,7 +502,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * __index >>= 3; \ } \ (result) = dataAccess(trie, __index); \ -} +} UPRV_BLOCK_MACRO_END /** * Returns a trie value for an ASCII code point, without range checking. @@ -532,7 +511,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param dataAccess UCPTRIE_16, UCPTRIE_32, or UCPTRIE_8 according to the trie’s value width * @param c (UChar32, in) the input code point; must be U+0000..U+007F * @return The ASCII code point's trie value. - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_ASCII_GET(trie, dataAccess, c) dataAccess(trie, c) @@ -545,7 +524,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param dataAccess UCPTRIE_16, UCPTRIE_32, or UCPTRIE_8 according to the trie’s value width * @param c (UChar32, in) the input code point, must be U+0000..U+FFFF * @return The BMP code point's trie value. - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_FAST_BMP_GET(trie, dataAccess, c) dataAccess(trie, _UCPTRIE_FAST_INDEX(trie, c)) @@ -557,7 +536,7 @@ ucptrie_toBinary(const UCPTrie *trie, void *data, int32_t capacity, UErrorCode * * @param dataAccess UCPTRIE_16, UCPTRIE_32, or UCPTRIE_8 according to the trie’s value width * @param c (UChar32, in) the input code point, must be U+10000..U+10FFFF * @return The supplementary code point's trie value. - * @draft ICU 63 + * @stable ICU 63 */ #define UCPTRIE_FAST_SUPP_GET(trie, dataAccess, c) dataAccess(trie, _UCPTRIE_SMALL_INDEX(trie, c)) @@ -642,5 +621,24 @@ ucptrie_internalU8PrevIndex(const UCPTrie *trie, UChar32 c, U_CDECL_END #endif // U_IN_DOXYGEN -#endif // U_HIDE_DRAFT_API + +#if U_SHOW_CPLUSPLUS_API + +U_NAMESPACE_BEGIN + +/** + * \class LocalUCPTriePointer + * "Smart pointer" class, closes a UCPTrie via ucptrie_close(). + * For most methods see the LocalPointerBase base class. + * + * @see LocalPointerBase + * @see LocalPointer + * @stable ICU 63 + */ +U_DEFINE_LOCAL_OPEN_POINTER(LocalUCPTriePointer, UCPTrie, ucptrie_close); + +U_NAMESPACE_END + +#endif // U_SHOW_CPLUSPLUS_API + #endif diff --git a/deps/icu-small/source/common/unicode/ucurr.h b/deps/icu-small/source/common/unicode/ucurr.h index a1c6de80b772f7..7149e7adf13067 100644 --- a/deps/icu-small/source/common/unicode/ucurr.h +++ b/deps/icu-small/source/common/unicode/ucurr.h @@ -159,14 +159,14 @@ ucurr_unregister(UCurrRegistryKey key, UErrorCode* status); * @param currency null-terminated 3-letter ISO 4217 code * @param locale locale in which to display currency * @param nameStyle selector for which kind of name to return - * @param isChoiceFormat fill-in set to TRUE if the returned value - * is a ChoiceFormat pattern; otherwise it is a static string + * @param isChoiceFormat always set to FALSE, or can be NULL; + * display names are static strings; + * since ICU 4.4, ChoiceFormat patterns are no longer supported * @param len fill-in parameter to receive length of result * @param ec error code * @return pointer to display string of 'len' UChars. If the resource * data contains no entry for 'currency', then 'currency' itself is - * returned. If *isChoiceFormat is TRUE, then the result is a - * ChoiceFormat pattern. Otherwise it is a static string. + * returned. * @stable ICU 2.6 */ U_STABLE const UChar* U_EXPORT2 @@ -183,8 +183,9 @@ ucurr_getName(const UChar* currency, * currency object in the en_US locale is "US dollar" or "US dollars". * @param currency null-terminated 3-letter ISO 4217 code * @param locale locale in which to display currency - * @param isChoiceFormat fill-in set to TRUE if the returned value - * is a ChoiceFormat pattern; otherwise it is a static string + * @param isChoiceFormat always set to FALSE, or can be NULL; + * display names are static strings; + * since ICU 4.4, ChoiceFormat patterns are no longer supported * @param pluralCount plural count * @param len fill-in parameter to receive length of result * @param ec error code @@ -320,7 +321,7 @@ typedef enum UCurrCurrencyType { * Provides a UEnumeration object for listing ISO-4217 codes. * @param currType You can use one of several UCurrCurrencyType values for this * variable. You can also | (or) them together to get a specific list of - * currencies. Most people will want to use the (UCURR_CURRENCY|UCURR_NON_DEPRECATED) value to + * currencies. Most people will want to use the (UCURR_COMMON|UCURR_NON_DEPRECATED) value to * get a list of current currencies. * @param pErrorCode Error code * @stable ICU 3.2 diff --git a/deps/icu-small/source/common/unicode/udata.h b/deps/icu-small/source/common/unicode/udata.h index 6419c359f606af..8236877b443d3d 100644 --- a/deps/icu-small/source/common/unicode/udata.h +++ b/deps/icu-small/source/common/unicode/udata.h @@ -264,25 +264,6 @@ udata_openChoice(const char *path, const char *type, const char *name, U_STABLE void U_EXPORT2 udata_close(UDataMemory *pData); -#if U_SHOW_CPLUSPLUS_API - -U_NAMESPACE_BEGIN - -/** - * \class LocalUDataMemoryPointer - * "Smart pointer" class, closes a UDataMemory via udata_close(). - * For most methods see the LocalPointerBase base class. - * - * @see LocalPointerBase - * @see LocalPointer - * @stable ICU 4.4 - */ -U_DEFINE_LOCAL_OPEN_POINTER(LocalUDataMemoryPointer, UDataMemory, udata_close); - -U_NAMESPACE_END - -#endif - /** * Get the pointer to the actual data inside the data memory. * The data is read-only. @@ -434,4 +415,23 @@ udata_setFileAccess(UDataFileAccess access, UErrorCode *status); U_CDECL_END +#if U_SHOW_CPLUSPLUS_API + +U_NAMESPACE_BEGIN + +/** + * \class LocalUDataMemoryPointer + * "Smart pointer" class, closes a UDataMemory via udata_close(). + * For most methods see the LocalPointerBase base class. + * + * @see LocalPointerBase + * @see LocalPointer + * @stable ICU 4.4 + */ +U_DEFINE_LOCAL_OPEN_POINTER(LocalUDataMemoryPointer, UDataMemory, udata_close); + +U_NAMESPACE_END + +#endif // U_SHOW_CPLUSPLUS_API + #endif diff --git a/deps/icu-small/source/common/unicode/uloc.h b/deps/icu-small/source/common/unicode/uloc.h index 5531070841187d..882f79bedca62c 100644 --- a/deps/icu-small/source/common/unicode/uloc.h +++ b/deps/icu-small/source/common/unicode/uloc.h @@ -742,12 +742,18 @@ uloc_getDisplayName(const char* localeID, /** - * Gets the specified locale from a list of all available locales. - * The return value is a pointer to an item of - * a locale name array. Both this array and the pointers - * it contains are owned by ICU and should not be deleted or written through - * by the caller. The locale name is terminated by a null pointer. - * @param n the specific locale name index of the available locale list + * Gets the specified locale from a list of available locales. + * + * This method corresponds to uloc_openAvailableByType called with the + * ULOC_AVAILABLE_DEFAULT type argument. + * + * The return value is a pointer to an item of a locale name array. Both this + * array and the pointers it contains are owned by ICU and should not be + * deleted or written through by the caller. The locale name is terminated by + * a null pointer. + * + * @param n the specific locale name index of the available locale list; + * should not exceed the number returned by uloc_countAvailable. * @return a specified locale name of all available locales * @stable ICU 2.0 */ @@ -762,6 +768,72 @@ uloc_getAvailable(int32_t n); */ U_STABLE int32_t U_EXPORT2 uloc_countAvailable(void); +#ifndef U_HIDE_DRAFT_API + +/** + * Types for uloc_getAvailableByType and uloc_countAvailableByType. + * + * @draft ICU 65 + */ +typedef enum ULocAvailableType { + /** + * Locales that return data when passed to ICU APIs, + * but not including legacy or alias locales. + * + * @draft ICU 65 + */ + ULOC_AVAILABLE_DEFAULT, + + /** + * Legacy or alias locales that return data when passed to ICU APIs. + * Examples of supported legacy or alias locales: + * + * - iw (alias to he) + * - mo (alias to ro) + * - zh_CN (alias to zh_Hans_CN) + * - sr_BA (alias to sr_Cyrl_BA) + * - ars (alias to ar_SA) + * + * The locales in this set are disjoint from the ones in + * ULOC_AVAILABLE_DEFAULT. To get both sets at the same time, use + * ULOC_AVAILABLE_WITH_LEGACY_ALIASES. + * + * @draft ICU 65 + */ + ULOC_AVAILABLE_ONLY_LEGACY_ALIASES, + + /** + * The union of the locales in ULOC_AVAILABLE_DEFAULT and + * ULOC_AVAILABLE_ONLY_LEGACY_ALIAS. + * + * @draft ICU 65 + */ + ULOC_AVAILABLE_WITH_LEGACY_ALIASES, + +#ifndef U_HIDE_INTERNAL_API + /** + * @internal + */ + ULOC_AVAILABLE_COUNT +#endif +} ULocAvailableType; + +/** + * Gets a list of available locales according to the type argument, allowing + * the user to access different sets of supported locales in ICU. + * + * The returned UEnumeration must be closed by the caller. + * + * @param type Type choice from ULocAvailableType. + * @param status Set if an error occurred. + * @return a UEnumeration owned by the caller, or nullptr on failure. + * @draft ICU 65 + */ +U_DRAFT UEnumeration* U_EXPORT2 +uloc_openAvailableByType(ULocAvailableType type, UErrorCode* status); + +#endif // U_HIDE_DRAFT_API + /** * * Gets a list of all available 2-letter language codes defined in ISO 639, diff --git a/deps/icu-small/source/common/unicode/umachine.h b/deps/icu-small/source/common/unicode/umachine.h index 6d932cfcfb2ae4..5cb95e58f37295 100644 --- a/deps/icu-small/source/common/unicode/umachine.h +++ b/deps/icu-small/source/common/unicode/umachine.h @@ -140,6 +140,42 @@ #define U_FINAL final #endif +// Before ICU 65, function-like, multi-statement ICU macros were just defined as +// series of statements wrapped in { } blocks and the caller could choose to +// either treat them as if they were actual functions and end the invocation +// with a trailing ; creating an empty statement after the block or else omit +// this trailing ; using the knowledge that the macro would expand to { }. +// +// But doing so doesn't work well with macros that look like functions and +// compiler warnings about empty statements (ICU-20601) and ICU 65 therefore +// switches to the standard solution of wrapping such macros in do { } while. +// +// This will however break existing code that depends on being able to invoke +// these macros without a trailing ; so to be able to remain compatible with +// such code the wrapper is itself defined as macros so that it's possible to +// build ICU 65 and later with the old macro behaviour, like this: +// +// export CPPFLAGS='-DUPRV_BLOCK_MACRO_BEGIN="" -DUPRV_BLOCK_MACRO_END=""' +// runConfigureICU ... +// + +/** + * \def UPRV_BLOCK_MACRO_BEGIN + * Defined as the "do" keyword by default. + * @internal + */ +#ifndef UPRV_BLOCK_MACRO_BEGIN +#define UPRV_BLOCK_MACRO_BEGIN do +#endif + +/** + * \def UPRV_BLOCK_MACRO_END + * Defined as "while (FALSE)" by default. + * @internal + */ +#ifndef UPRV_BLOCK_MACRO_END +#define UPRV_BLOCK_MACRO_END while (FALSE) +#endif /*==========================================================================*/ /* limits for int32_t etc., like in POSIX inttypes.h */ diff --git a/deps/icu-small/source/common/unicode/umutablecptrie.h b/deps/icu-small/source/common/unicode/umutablecptrie.h index e75191a4495209..13e71ef25e8c87 100644 --- a/deps/icu-small/source/common/unicode/umutablecptrie.h +++ b/deps/icu-small/source/common/unicode/umutablecptrie.h @@ -9,8 +9,6 @@ #include "unicode/utypes.h" -#ifndef U_HIDE_DRAFT_API - #include "unicode/localpointer.h" #include "unicode/ucpmap.h" #include "unicode/ucptrie.h" @@ -44,7 +42,7 @@ U_CDECL_BEGIN * * @see UCPTrie * @see umutablecptrie_buildImmutable - * @draft ICU 63 + * @stable ICU 63 */ typedef struct UMutableCPTrie UMutableCPTrie; @@ -59,7 +57,7 @@ typedef struct UMutableCPTrie UMutableCPTrie; * @param errorValue the value for out-of-range code points and ill-formed UTF-8/16 * @param pErrorCode an in/out ICU UErrorCode * @return the trie - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UMutableCPTrie * U_EXPORT2 umutablecptrie_open(uint32_t initialValue, uint32_t errorValue, UErrorCode *pErrorCode); @@ -71,7 +69,7 @@ umutablecptrie_open(uint32_t initialValue, uint32_t errorValue, UErrorCode *pErr * @param other the trie to clone * @param pErrorCode an in/out ICU UErrorCode * @return the trie clone - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UMutableCPTrie * U_EXPORT2 umutablecptrie_clone(const UMutableCPTrie *other, UErrorCode *pErrorCode); @@ -80,7 +78,7 @@ umutablecptrie_clone(const UMutableCPTrie *other, UErrorCode *pErrorCode); * Closes a mutable trie and releases associated memory. * * @param trie the trie - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI void U_EXPORT2 umutablecptrie_close(UMutableCPTrie *trie); @@ -96,7 +94,7 @@ U_NAMESPACE_BEGIN * * @see LocalPointerBase * @see LocalPointer - * @draft ICU 63 + * @stable ICU 63 */ U_DEFINE_LOCAL_OPEN_POINTER(LocalUMutableCPTriePointer, UMutableCPTrie, umutablecptrie_close); @@ -111,7 +109,7 @@ U_NAMESPACE_END * @param map the source map * @param pErrorCode an in/out ICU UErrorCode * @return the mutable trie - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UMutableCPTrie * U_EXPORT2 umutablecptrie_fromUCPMap(const UCPMap *map, UErrorCode *pErrorCode); @@ -123,7 +121,7 @@ umutablecptrie_fromUCPMap(const UCPMap *map, UErrorCode *pErrorCode); * @param trie the immutable trie * @param pErrorCode an in/out ICU UErrorCode * @return the mutable trie - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UMutableCPTrie * U_EXPORT2 umutablecptrie_fromUCPTrie(const UCPTrie *trie, UErrorCode *pErrorCode); @@ -134,7 +132,7 @@ umutablecptrie_fromUCPTrie(const UCPTrie *trie, UErrorCode *pErrorCode); * @param trie the trie * @param c the code point * @return the value - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI uint32_t U_EXPORT2 umutablecptrie_get(const UMutableCPTrie *trie, UChar32 c); @@ -166,7 +164,7 @@ umutablecptrie_get(const UMutableCPTrie *trie, UChar32 c); * may have been modified by filter(context, trie value) * if that function pointer is not NULL * @return the range end code point, or -1 if start is not a valid code point - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UChar32 U_EXPORT2 umutablecptrie_getRange(const UMutableCPTrie *trie, UChar32 start, @@ -180,7 +178,7 @@ umutablecptrie_getRange(const UMutableCPTrie *trie, UChar32 start, * @param c the code point * @param value the value * @param pErrorCode an in/out ICU UErrorCode - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI void U_EXPORT2 umutablecptrie_set(UMutableCPTrie *trie, UChar32 c, uint32_t value, UErrorCode *pErrorCode); @@ -194,7 +192,7 @@ umutablecptrie_set(UMutableCPTrie *trie, UChar32 c, uint32_t value, UErrorCode * * @param end the last code point to get the value (inclusive) * @param value the value * @param pErrorCode an in/out ICU UErrorCode - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI void U_EXPORT2 umutablecptrie_setRange(UMutableCPTrie *trie, @@ -229,7 +227,7 @@ umutablecptrie_setRange(UMutableCPTrie *trie, * @param pErrorCode an in/out ICU UErrorCode * * @see umutablecptrie_fromUCPTrie - * @draft ICU 63 + * @stable ICU 63 */ U_CAPI UCPTrie * U_EXPORT2 umutablecptrie_buildImmutable(UMutableCPTrie *trie, UCPTrieType type, UCPTrieValueWidth valueWidth, @@ -237,5 +235,4 @@ umutablecptrie_buildImmutable(UMutableCPTrie *trie, UCPTrieType type, UCPTrieVal U_CDECL_END -#endif // U_HIDE_DRAFT_API #endif diff --git a/deps/icu-small/source/common/unicode/unifilt.h b/deps/icu-small/source/common/unicode/unifilt.h index 99cce785b6eec8..1a77089233bf10 100644 --- a/deps/icu-small/source/common/unicode/unifilt.h +++ b/deps/icu-small/source/common/unicode/unifilt.h @@ -12,6 +12,10 @@ #ifndef UNIFILT_H #define UNIFILT_H +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/unifunct.h" #include "unicode/unimatch.h" @@ -67,6 +71,14 @@ class U_COMMON_API UnicodeFilter : public UnicodeFunctor, public UnicodeMatcher */ virtual ~UnicodeFilter(); + /** + * Clones this object polymorphically. + * The caller owns the result and should delete it when done. + * @return clone, or nullptr if an error occurred + * @stable ICU 2.4 + */ + virtual UnicodeFilter* clone() const = 0; + /** * Returns true for characters that are in the selected * subset. In other words, if a character is to be @@ -119,4 +131,6 @@ class U_COMMON_API UnicodeFilter : public UnicodeFunctor, public UnicodeMatcher U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/unifunct.h b/deps/icu-small/source/common/unicode/unifunct.h index 66a02ce7cd5ce8..2b1b766ea76187 100644 --- a/deps/icu-small/source/common/unicode/unifunct.h +++ b/deps/icu-small/source/common/unicode/unifunct.h @@ -13,6 +13,9 @@ #define UNIFUNCT_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" /** @@ -124,4 +127,6 @@ class U_COMMON_API UnicodeFunctor : public UObject { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/unimatch.h b/deps/icu-small/source/common/unicode/unimatch.h index 8bf39950187b1b..2d3c5210c38e25 100644 --- a/deps/icu-small/source/common/unicode/unimatch.h +++ b/deps/icu-small/source/common/unicode/unimatch.h @@ -17,6 +17,7 @@ * \brief C++ API: Unicode Matcher */ +#if U_SHOW_CPLUSPLUS_API U_NAMESPACE_BEGIN @@ -162,4 +163,6 @@ class U_COMMON_API UnicodeMatcher /* not : public UObject because this is an int U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/uniset.h b/deps/icu-small/source/common/unicode/uniset.h index e5e7726d604a73..18cc9376442a2f 100644 --- a/deps/icu-small/source/common/unicode/uniset.h +++ b/deps/icu-small/source/common/unicode/uniset.h @@ -13,6 +13,10 @@ #ifndef UNICODESET_H #define UNICODESET_H +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/ucpmap.h" #include "unicode/unifilt.h" #include "unicode/unistr.h" @@ -501,7 +505,7 @@ class U_COMMON_API UnicodeSet U_FINAL : public UnicodeFilter { * @see cloneAsThawed * @stable ICU 2.0 */ - virtual UnicodeFunctor* clone() const; + virtual UnicodeSet* clone() const; /** * Returns the hash code value for this set. @@ -579,7 +583,7 @@ class U_COMMON_API UnicodeSet U_FINAL : public UnicodeFilter { * @see cloneAsThawed * @stable ICU 3.8 */ - UnicodeFunctor *freeze(); + UnicodeSet *freeze(); /** * Clone the set and make the clone mutable. @@ -589,7 +593,7 @@ class U_COMMON_API UnicodeSet U_FINAL : public UnicodeFilter { * @see isFrozen * @stable ICU 3.8 */ - UnicodeFunctor *cloneAsThawed() const; + UnicodeSet *cloneAsThawed() const; //---------------------------------------------------------------- // Public API @@ -1651,11 +1655,10 @@ class U_COMMON_API UnicodeSet U_FINAL : public UnicodeFilter { const UnicodeSet* inclusions, UErrorCode &status); -#ifndef U_HIDE_DRAFT_API // Skipped: ucpmap.h is draft only. + // UCPMap is now stable ICU 63 void applyIntPropertyValue(const UCPMap *map, UCPMapValueFilter *filter, const void *context, UErrorCode &errorCode); -#endif /* U_HIDE_DRAFT_API */ /** * Set the new pattern to cache. @@ -1736,4 +1739,6 @@ inline int32_t UnicodeSet::spanBack(const UnicodeString &s, int32_t limit, USetS U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/unistr.h b/deps/icu-small/source/common/unicode/unistr.h index 8fd144425e87c0..da79053765acf6 100644 --- a/deps/icu-small/source/common/unicode/unistr.h +++ b/deps/icu-small/source/common/unicode/unistr.h @@ -28,8 +28,11 @@ * \brief C++ API: Unicode String */ -#include #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + +#include #include "unicode/char16ptr.h" #include "unicode/rep.h" #include "unicode/std_string.h" @@ -209,7 +212,9 @@ class UnicodeStringAppendable; // unicode/appendable.h * similar functionality as the Java String and StringBuffer/StringBuilder classes. * It is a concrete implementation of the abstract class Replaceable (for transliteration). * - * A UnicodeString may also "alias" an external array of characters + * The UnicodeString equivalent of std::string’s clear() is remove(). + * + * A UnicodeString may "alias" an external array of characters * (that is, point to it, rather than own the array) * whose lifetime must then at least match the lifetime of the aliasing object. * This aliasing may be preserved when returning a UnicodeString by value, @@ -2092,8 +2097,7 @@ class U_COMMON_API UnicodeString : public Replaceable * s.truncate(0); // set to an empty string (complete truncation), or * s=UnicodeString(); // assign an empty string, or * s.setTo((UChar32)-1); // set to a pseudo code point that is out of range, or - * static const char16_t nul=0; - * s.setTo(&nul, 0); // set to an empty C Unicode string + * s.setTo(u"", 0); // set to an empty C Unicode string * } * \endcode * @@ -2534,11 +2538,14 @@ class U_COMMON_API UnicodeString : public Replaceable /* Remove operations */ /** - * Remove all characters from the UnicodeString object. + * Removes all characters from the UnicodeString object and clears the bogus flag. + * This is the UnicodeString equivalent of std::string’s clear(). + * * @return a reference to this + * @see setToBogus * @stable ICU 2.0 */ - inline UnicodeString& remove(void); + inline UnicodeString& remove(); /** * Remove the characters in the range @@ -3034,11 +3041,11 @@ class U_COMMON_API UnicodeString : public Replaceable * uint16_t * constructor. * Delegates to UnicodeString(const char16_t *, int32_t). * @param text UTF-16 string - * @param length string length + * @param textLength string length * @stable ICU 59 */ - UnicodeString(const uint16_t *text, int32_t length) : - UnicodeString(ConstChar16Ptr(text), length) {} + UnicodeString(const uint16_t *text, int32_t textLength) : + UnicodeString(ConstChar16Ptr(text), textLength) {} #endif #if U_SIZEOF_WCHAR_T==2 || defined(U_IN_DOXYGEN) @@ -3047,21 +3054,21 @@ class U_COMMON_API UnicodeString : public Replaceable * (Only defined if U_SIZEOF_WCHAR_T==2.) * Delegates to UnicodeString(const char16_t *, int32_t). * @param text NUL-terminated UTF-16 string - * @param length string length + * @param textLength string length * @stable ICU 59 */ - UnicodeString(const wchar_t *text, int32_t length) : - UnicodeString(ConstChar16Ptr(text), length) {} + UnicodeString(const wchar_t *text, int32_t textLength) : + UnicodeString(ConstChar16Ptr(text), textLength) {} #endif /** * nullptr_t constructor. * Effectively the same as the default constructor, makes an empty string object. * @param text nullptr - * @param length ignored + * @param textLength ignored * @stable ICU 59 */ - inline UnicodeString(const std::nullptr_t text, int32_t length); + inline UnicodeString(const std::nullptr_t text, int32_t textLength); /** * Readonly-aliasing char16_t* constructor. @@ -3266,13 +3273,13 @@ class U_COMMON_API UnicodeString : public Replaceable * } * \endcode * @param src String using only invariant characters. - * @param length Length of src, or -1 if NUL-terminated. + * @param textLength Length of src, or -1 if NUL-terminated. * @param inv Signature-distinguishing paramater, use US_INV. * * @see US_INV * @stable ICU 3.2 */ - UnicodeString(const char *src, int32_t length, enum EInvariant inv); + UnicodeString(const char *src, int32_t textLength, enum EInvariant inv); /** @@ -3323,9 +3330,6 @@ class U_COMMON_API UnicodeString : public Replaceable * Clones can be used concurrently in multiple threads. * If a subclass does not implement clone(), or if an error occurs, * then NULL is returned. - * The clone functions in all subclasses return a pointer to a Replaceable - * because some compilers do not support covariant (same-as-this) - * return types; cast to the appropriate subclass if necessary. * The caller must delete the clone. * * @return a clone of this object @@ -3334,7 +3338,7 @@ class U_COMMON_API UnicodeString : public Replaceable * @see getDynamicClassID * @stable ICU 2.6 */ - virtual Replaceable *clone() const; + virtual UnicodeString *clone() const; /** Destructor. * @stable ICU 2.0 @@ -4748,4 +4752,6 @@ UnicodeString::reverse(int32_t start, U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/unorm.h b/deps/icu-small/source/common/unicode/unorm.h index 3839de129573c1..09dd366a968c1b 100644 --- a/deps/icu-small/source/common/unicode/unorm.h +++ b/deps/icu-small/source/common/unicode/unorm.h @@ -131,6 +131,8 @@ // Do not conditionalize the following enum with #ifndef U_HIDE_DEPRECATED_API, // it is needed for layout of Normalizer object. +#ifndef U_FORCE_HIDE_DEPRECATED_API + /** * Constants for normalization modes. * @deprecated ICU 56 Use unorm2.h instead. @@ -155,6 +157,8 @@ typedef enum { UNORM_MODE_COUNT } UNormalizationMode; +#endif // U_FORCE_HIDE_DEPRECATED_API + #ifndef U_HIDE_DEPRECATED_API /** diff --git a/deps/icu-small/source/common/unicode/uobject.h b/deps/icu-small/source/common/unicode/uobject.h index 53b8eb005f4cc0..6a137af83c2456 100644 --- a/deps/icu-small/source/common/unicode/uobject.h +++ b/deps/icu-small/source/common/unicode/uobject.h @@ -20,6 +20,9 @@ #define __UOBJECT_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/platform.h" /** @@ -43,7 +46,7 @@ * @stable ICU 4.2. Since ICU 64, Use U_NOEXCEPT instead. See ICU-20422. */ #ifndef U_NO_THROW -#define U_NO_THROW throw() +#define U_NO_THROW U_NOEXCEPT #endif /*===========================================================================*/ @@ -212,11 +215,8 @@ class U_COMMON_API UMemory { * The clone() function is not available in UObject because it is not * implemented by all ICU classes. * Many ICU services provide a clone() function for their class trees, - * defined on the service's C++ base class, and all subclasses within that - * service class tree return a pointer to the service base class + * defined on the service's C++ base class * (which itself is a subclass of UObject). - * This is because some compilers do not support covariant (same-as-this) - * return types; cast to the appropriate subclass if necessary. * * @stable ICU 2.2 */ @@ -319,4 +319,6 @@ class U_COMMON_API UObject : public UMemory { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/urename.h b/deps/icu-small/source/common/unicode/urename.h index eaf56c9614d7f2..e302bf0976e01d 100644 --- a/deps/icu-small/source/common/unicode/urename.h +++ b/deps/icu-small/source/common/unicode/urename.h @@ -193,10 +193,13 @@ #define res_getAlias U_ICU_ENTRY_POINT_RENAME(res_getAlias) #define res_getArrayItem U_ICU_ENTRY_POINT_RENAME(res_getArrayItem) #define res_getBinary U_ICU_ENTRY_POINT_RENAME(res_getBinary) +#define res_getBinaryNoTrace U_ICU_ENTRY_POINT_RENAME(res_getBinaryNoTrace) #define res_getIntVector U_ICU_ENTRY_POINT_RENAME(res_getIntVector) +#define res_getIntVectorNoTrace U_ICU_ENTRY_POINT_RENAME(res_getIntVectorNoTrace) #define res_getPublicType U_ICU_ENTRY_POINT_RENAME(res_getPublicType) #define res_getResource U_ICU_ENTRY_POINT_RENAME(res_getResource) #define res_getString U_ICU_ENTRY_POINT_RENAME(res_getString) +#define res_getStringNoTrace U_ICU_ENTRY_POINT_RENAME(res_getStringNoTrace) #define res_getTableItemByIndex U_ICU_ENTRY_POINT_RENAME(res_getTableItemByIndex) #define res_getTableItemByKey U_ICU_ENTRY_POINT_RENAME(res_getTableItemByKey) #define res_load U_ICU_ENTRY_POINT_RENAME(res_load) @@ -523,6 +526,7 @@ #define ucal_getDefaultTimeZone U_ICU_ENTRY_POINT_RENAME(ucal_getDefaultTimeZone) #define ucal_getFieldDifference U_ICU_ENTRY_POINT_RENAME(ucal_getFieldDifference) #define ucal_getGregorianChange U_ICU_ENTRY_POINT_RENAME(ucal_getGregorianChange) +#define ucal_getHostTimeZone U_ICU_ENTRY_POINT_RENAME(ucal_getHostTimeZone) #define ucal_getKeywordValuesForLocale U_ICU_ENTRY_POINT_RENAME(ucal_getKeywordValuesForLocale) #define ucal_getLimit U_ICU_ENTRY_POINT_RENAME(ucal_getLimit) #define ucal_getLocaleByType U_ICU_ENTRY_POINT_RENAME(ucal_getLocaleByType) @@ -575,7 +579,6 @@ #define ucasemap_getLocale U_ICU_ENTRY_POINT_RENAME(ucasemap_getLocale) #define ucasemap_getOptions U_ICU_ENTRY_POINT_RENAME(ucasemap_getOptions) #define ucasemap_internalUTF8ToTitle U_ICU_ENTRY_POINT_RENAME(ucasemap_internalUTF8ToTitle) -#define ucasemap_mapUTF8 U_ICU_ENTRY_POINT_RENAME(ucasemap_mapUTF8) #define ucasemap_open U_ICU_ENTRY_POINT_RENAME(ucasemap_open) #define ucasemap_setBreakIterator U_ICU_ENTRY_POINT_RENAME(ucasemap_setBreakIterator) #define ucasemap_setLocale U_ICU_ENTRY_POINT_RENAME(ucasemap_setLocale) @@ -930,16 +933,9 @@ #define ufieldpositer_close U_ICU_ENTRY_POINT_RENAME(ufieldpositer_close) #define ufieldpositer_next U_ICU_ENTRY_POINT_RENAME(ufieldpositer_next) #define ufieldpositer_open U_ICU_ENTRY_POINT_RENAME(ufieldpositer_open) -#define ufile_close_translit U_ICU_ENTRY_POINT_RENAME(ufile_close_translit) -#define ufile_fill_uchar_buffer U_ICU_ENTRY_POINT_RENAME(ufile_fill_uchar_buffer) -#define ufile_flush_io U_ICU_ENTRY_POINT_RENAME(ufile_flush_io) -#define ufile_flush_translit U_ICU_ENTRY_POINT_RENAME(ufile_flush_translit) #define ufile_getch U_ICU_ENTRY_POINT_RENAME(ufile_getch) #define ufile_getch32 U_ICU_ENTRY_POINT_RENAME(ufile_getch32) -#define ufmt_64tou U_ICU_ENTRY_POINT_RENAME(ufmt_64tou) #define ufmt_close U_ICU_ENTRY_POINT_RENAME(ufmt_close) -#define ufmt_defaultCPToUnicode U_ICU_ENTRY_POINT_RENAME(ufmt_defaultCPToUnicode) -#define ufmt_digitvalue U_ICU_ENTRY_POINT_RENAME(ufmt_digitvalue) #define ufmt_getArrayItemByIndex U_ICU_ENTRY_POINT_RENAME(ufmt_getArrayItemByIndex) #define ufmt_getArrayLength U_ICU_ENTRY_POINT_RENAME(ufmt_getArrayLength) #define ufmt_getDate U_ICU_ENTRY_POINT_RENAME(ufmt_getDate) @@ -951,11 +947,7 @@ #define ufmt_getType U_ICU_ENTRY_POINT_RENAME(ufmt_getType) #define ufmt_getUChars U_ICU_ENTRY_POINT_RENAME(ufmt_getUChars) #define ufmt_isNumeric U_ICU_ENTRY_POINT_RENAME(ufmt_isNumeric) -#define ufmt_isdigit U_ICU_ENTRY_POINT_RENAME(ufmt_isdigit) #define ufmt_open U_ICU_ENTRY_POINT_RENAME(ufmt_open) -#define ufmt_ptou U_ICU_ENTRY_POINT_RENAME(ufmt_ptou) -#define ufmt_uto64 U_ICU_ENTRY_POINT_RENAME(ufmt_uto64) -#define ufmt_utop U_ICU_ENTRY_POINT_RENAME(ufmt_utop) #define ufmtval_getString U_ICU_ENTRY_POINT_RENAME(ufmtval_getString) #define ufmtval_nextPosition U_ICU_ENTRY_POINT_RENAME(ufmtval_nextPosition) #define ugender_getInstance U_ICU_ENTRY_POINT_RENAME(ugender_getInstance) @@ -1103,6 +1095,7 @@ #define uloc_getVariant U_ICU_ENTRY_POINT_RENAME(uloc_getVariant) #define uloc_isRightToLeft U_ICU_ENTRY_POINT_RENAME(uloc_isRightToLeft) #define uloc_minimizeSubtags U_ICU_ENTRY_POINT_RENAME(uloc_minimizeSubtags) +#define uloc_openAvailableByType U_ICU_ENTRY_POINT_RENAME(uloc_openAvailableByType) #define uloc_openKeywordList U_ICU_ENTRY_POINT_RENAME(uloc_openKeywordList) #define uloc_openKeywords U_ICU_ENTRY_POINT_RENAME(uloc_openKeywords) #define uloc_setDefault U_ICU_ENTRY_POINT_RENAME(uloc_setDefault) @@ -1159,9 +1152,6 @@ #define umsg_toPattern U_ICU_ENTRY_POINT_RENAME(umsg_toPattern) #define umsg_vformat U_ICU_ENTRY_POINT_RENAME(umsg_vformat) #define umsg_vparse U_ICU_ENTRY_POINT_RENAME(umsg_vparse) -#define umtx_condBroadcast U_ICU_ENTRY_POINT_RENAME(umtx_condBroadcast) -#define umtx_condSignal U_ICU_ENTRY_POINT_RENAME(umtx_condSignal) -#define umtx_condWait U_ICU_ENTRY_POINT_RENAME(umtx_condWait) #define umtx_lock U_ICU_ENTRY_POINT_RENAME(umtx_lock) #define umtx_unlock U_ICU_ENTRY_POINT_RENAME(umtx_unlock) #define umutablecptrie_buildImmutable U_ICU_ENTRY_POINT_RENAME(umutablecptrie_buildImmutable) @@ -1327,7 +1317,6 @@ #define uprv_decNumberAbs U_ICU_ENTRY_POINT_RENAME(uprv_decNumberAbs) #define uprv_decNumberAdd U_ICU_ENTRY_POINT_RENAME(uprv_decNumberAdd) #define uprv_decNumberAnd U_ICU_ENTRY_POINT_RENAME(uprv_decNumberAnd) -#define uprv_decNumberClass U_ICU_ENTRY_POINT_RENAME(uprv_decNumberClass) #define uprv_decNumberClassToString U_ICU_ENTRY_POINT_RENAME(uprv_decNumberClassToString) #define uprv_decNumberCompare U_ICU_ENTRY_POINT_RENAME(uprv_decNumberCompare) #define uprv_decNumberCompareSignal U_ICU_ENTRY_POINT_RENAME(uprv_decNumberCompareSignal) @@ -1393,6 +1382,7 @@ #define uprv_dlsym_func U_ICU_ENTRY_POINT_RENAME(uprv_dlsym_func) #define uprv_eastrncpy U_ICU_ENTRY_POINT_RENAME(uprv_eastrncpy) #define uprv_ebcdicFromAscii U_ICU_ENTRY_POINT_RENAME(uprv_ebcdicFromAscii) +#define uprv_ebcdicToAscii U_ICU_ENTRY_POINT_RENAME(uprv_ebcdicToAscii) #define uprv_ebcdicToLowercaseAscii U_ICU_ENTRY_POINT_RENAME(uprv_ebcdicToLowercaseAscii) #define uprv_ebcdictolower U_ICU_ENTRY_POINT_RENAME(uprv_ebcdictolower) #define uprv_fabs U_ICU_ENTRY_POINT_RENAME(uprv_fabs) @@ -1412,6 +1402,7 @@ #define uprv_getUTCtime U_ICU_ENTRY_POINT_RENAME(uprv_getUTCtime) #define uprv_int32Comparator U_ICU_ENTRY_POINT_RENAME(uprv_int32Comparator) #define uprv_isASCIILetter U_ICU_ENTRY_POINT_RENAME(uprv_isASCIILetter) +#define uprv_isEbcdicAtSign U_ICU_ENTRY_POINT_RENAME(uprv_isEbcdicAtSign) #define uprv_isInfinite U_ICU_ENTRY_POINT_RENAME(uprv_isInfinite) #define uprv_isInvariantString U_ICU_ENTRY_POINT_RENAME(uprv_isInvariantString) #define uprv_isInvariantUString U_ICU_ENTRY_POINT_RENAME(uprv_isInvariantUString) @@ -1579,6 +1570,7 @@ #define ures_getUTF8String U_ICU_ENTRY_POINT_RENAME(ures_getUTF8String) #define ures_getUTF8StringByIndex U_ICU_ENTRY_POINT_RENAME(ures_getUTF8StringByIndex) #define ures_getUTF8StringByKey U_ICU_ENTRY_POINT_RENAME(ures_getUTF8StringByKey) +#define ures_getValueWithFallback U_ICU_ENTRY_POINT_RENAME(ures_getValueWithFallback) #define ures_getVersion U_ICU_ENTRY_POINT_RENAME(ures_getVersion) #define ures_getVersionByKey U_ICU_ENTRY_POINT_RENAME(ures_getVersionByKey) #define ures_getVersionNumber U_ICU_ENTRY_POINT_RENAME(ures_getVersionNumber) diff --git a/deps/icu-small/source/common/unicode/usetiter.h b/deps/icu-small/source/common/unicode/usetiter.h index 057adbc04f5f05..f3f470f95aa5f5 100644 --- a/deps/icu-small/source/common/unicode/usetiter.h +++ b/deps/icu-small/source/common/unicode/usetiter.h @@ -10,6 +10,9 @@ #define USETITER_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" #include "unicode/unistr.h" @@ -317,4 +320,6 @@ inline UChar32 UnicodeSetIterator::getCodepointEnd() const { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/common/unicode/utext.h b/deps/icu-small/source/common/unicode/utext.h index ff78784c61ec54..6f1e3409d8fdeb 100644 --- a/deps/icu-small/source/common/unicode/utext.h +++ b/deps/icu-small/source/common/unicode/utext.h @@ -766,12 +766,14 @@ utext_extract(UText *ut, * * @stable ICU 3.8 */ -#define UTEXT_SETNATIVEINDEX(ut, ix) \ - { int64_t __offset = (ix) - (ut)->chunkNativeStart; \ - if (__offset>=0 && __offset<(int64_t)(ut)->nativeIndexingLimit && (ut)->chunkContents[__offset]<0xdc00) { \ - (ut)->chunkOffset=(int32_t)__offset; \ - } else { \ - utext_setNativeIndex((ut), (ix)); } } +#define UTEXT_SETNATIVEINDEX(ut, ix) UPRV_BLOCK_MACRO_BEGIN { \ + int64_t __offset = (ix) - (ut)->chunkNativeStart; \ + if (__offset>=0 && __offset<(int64_t)(ut)->nativeIndexingLimit && (ut)->chunkContents[__offset]<0xdc00) { \ + (ut)->chunkOffset=(int32_t)__offset; \ + } else { \ + utext_setNativeIndex((ut), (ix)); \ + } \ +} UPRV_BLOCK_MACRO_END diff --git a/deps/icu-small/source/common/unicode/utf16.h b/deps/icu-small/source/common/unicode/utf16.h index 0908b4f00e9bf1..3315214ae69d86 100644 --- a/deps/icu-small/source/common/unicode/utf16.h +++ b/deps/icu-small/source/common/unicode/utf16.h @@ -163,7 +163,7 @@ * @see U16_GET * @stable ICU 2.4 */ -#define U16_GET_UNSAFE(s, i, c) { \ +#define U16_GET_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[i]; \ if(U16_IS_SURROGATE(c)) { \ if(U16_IS_SURROGATE_LEAD(c)) { \ @@ -172,7 +172,7 @@ (c)=U16_GET_SUPPLEMENTARY((s)[(i)-1], (c)); \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Get a code point from a string at a random-access offset, @@ -197,7 +197,7 @@ * @see U16_GET_UNSAFE * @stable ICU 2.4 */ -#define U16_GET(s, start, i, length, c) { \ +#define U16_GET(s, start, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[i]; \ if(U16_IS_SURROGATE(c)) { \ uint16_t __c2; \ @@ -211,7 +211,7 @@ } \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Get a code point from a string at a random-access offset, @@ -236,7 +236,7 @@ * @see U16_GET_UNSAFE * @stable ICU 60 */ -#define U16_GET_OR_FFFD(s, start, i, length, c) { \ +#define U16_GET_OR_FFFD(s, start, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[i]; \ if(U16_IS_SURROGATE(c)) { \ uint16_t __c2; \ @@ -254,7 +254,7 @@ } \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /* definitions with forward iteration --------------------------------------- */ @@ -277,12 +277,12 @@ * @see U16_NEXT * @stable ICU 2.4 */ -#define U16_NEXT_UNSAFE(s, i, c) { \ +#define U16_NEXT_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if(U16_IS_LEAD(c)) { \ (c)=U16_GET_SUPPLEMENTARY((c), (s)[(i)++]); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Get a code point from a string at a code point boundary offset, @@ -305,7 +305,7 @@ * @see U16_NEXT_UNSAFE * @stable ICU 2.4 */ -#define U16_NEXT(s, i, length, c) { \ +#define U16_NEXT(s, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if(U16_IS_LEAD(c)) { \ uint16_t __c2; \ @@ -314,7 +314,7 @@ (c)=U16_GET_SUPPLEMENTARY((c), __c2); \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Get a code point from a string at a code point boundary offset, @@ -337,7 +337,7 @@ * @see U16_NEXT_UNSAFE * @stable ICU 60 */ -#define U16_NEXT_OR_FFFD(s, i, length, c) { \ +#define U16_NEXT_OR_FFFD(s, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if(U16_IS_SURROGATE(c)) { \ uint16_t __c2; \ @@ -348,7 +348,7 @@ (c)=0xfffd; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Append a code point to a string, overwriting 1 or 2 code units. @@ -363,14 +363,14 @@ * @see U16_APPEND * @stable ICU 2.4 */ -#define U16_APPEND_UNSAFE(s, i, c) { \ +#define U16_APPEND_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c)<=0xffff) { \ (s)[(i)++]=(uint16_t)(c); \ } else { \ (s)[(i)++]=(uint16_t)(((c)>>10)+0xd7c0); \ (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Append a code point to a string, overwriting 1 or 2 code units. @@ -389,7 +389,7 @@ * @see U16_APPEND_UNSAFE * @stable ICU 2.4 */ -#define U16_APPEND(s, i, capacity, c, isError) { \ +#define U16_APPEND(s, i, capacity, c, isError) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c)<=0xffff) { \ (s)[(i)++]=(uint16_t)(c); \ } else if((uint32_t)(c)<=0x10ffff && (i)+1<(capacity)) { \ @@ -398,7 +398,7 @@ } else /* c>0x10ffff or not enough space */ { \ (isError)=TRUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the next. @@ -410,11 +410,11 @@ * @see U16_FWD_1 * @stable ICU 2.4 */ -#define U16_FWD_1_UNSAFE(s, i) { \ +#define U16_FWD_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U16_IS_LEAD((s)[(i)++])) { \ ++(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the next. @@ -429,11 +429,11 @@ * @see U16_FWD_1_UNSAFE * @stable ICU 2.4 */ -#define U16_FWD_1(s, i, length) { \ +#define U16_FWD_1(s, i, length) UPRV_BLOCK_MACRO_BEGIN { \ if(U16_IS_LEAD((s)[(i)++]) && (i)!=(length) && U16_IS_TRAIL((s)[i])) { \ ++(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the n-th next one, @@ -447,13 +447,13 @@ * @see U16_FWD_N * @stable ICU 2.4 */ -#define U16_FWD_N_UNSAFE(s, i, n) { \ +#define U16_FWD_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ U16_FWD_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the n-th next one, @@ -470,13 +470,13 @@ * @see U16_FWD_N_UNSAFE * @stable ICU 2.4 */ -#define U16_FWD_N(s, i, length, n) { \ +#define U16_FWD_N(s, i, length, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0 && ((i)<(length) || ((length)<0 && (s)[i]!=0))) { \ U16_FWD_1(s, i, length); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary @@ -491,11 +491,11 @@ * @see U16_SET_CP_START * @stable ICU 2.4 */ -#define U16_SET_CP_START_UNSAFE(s, i) { \ +#define U16_SET_CP_START_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U16_IS_TRAIL((s)[i])) { \ --(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary @@ -511,11 +511,11 @@ * @see U16_SET_CP_START_UNSAFE * @stable ICU 2.4 */ -#define U16_SET_CP_START(s, start, i) { \ +#define U16_SET_CP_START(s, start, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U16_IS_TRAIL((s)[i]) && (i)>(start) && U16_IS_LEAD((s)[(i)-1])) { \ --(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /* definitions with backward iteration -------------------------------------- */ @@ -539,12 +539,12 @@ * @see U16_PREV * @stable ICU 2.4 */ -#define U16_PREV_UNSAFE(s, i, c) { \ +#define U16_PREV_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if(U16_IS_TRAIL(c)) { \ (c)=U16_GET_SUPPLEMENTARY((s)[--(i)], (c)); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one @@ -566,7 +566,7 @@ * @see U16_PREV_UNSAFE * @stable ICU 2.4 */ -#define U16_PREV(s, start, i, c) { \ +#define U16_PREV(s, start, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if(U16_IS_TRAIL(c)) { \ uint16_t __c2; \ @@ -575,7 +575,7 @@ (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one @@ -597,7 +597,7 @@ * @see U16_PREV_UNSAFE * @stable ICU 60 */ -#define U16_PREV_OR_FFFD(s, start, i, c) { \ +#define U16_PREV_OR_FFFD(s, start, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if(U16_IS_SURROGATE(c)) { \ uint16_t __c2; \ @@ -608,7 +608,7 @@ (c)=0xfffd; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one. @@ -621,11 +621,11 @@ * @see U16_BACK_1 * @stable ICU 2.4 */ -#define U16_BACK_1_UNSAFE(s, i) { \ +#define U16_BACK_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U16_IS_TRAIL((s)[--(i)])) { \ --(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one. @@ -639,11 +639,11 @@ * @see U16_BACK_1_UNSAFE * @stable ICU 2.4 */ -#define U16_BACK_1(s, start, i) { \ +#define U16_BACK_1(s, start, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U16_IS_TRAIL((s)[--(i)]) && (i)>(start) && U16_IS_LEAD((s)[(i)-1])) { \ --(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the n-th one before it, @@ -658,13 +658,13 @@ * @see U16_BACK_N * @stable ICU 2.4 */ -#define U16_BACK_N_UNSAFE(s, i, n) { \ +#define U16_BACK_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ U16_BACK_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the n-th one before it, @@ -680,13 +680,13 @@ * @see U16_BACK_N_UNSAFE * @stable ICU 2.4 */ -#define U16_BACK_N(s, start, i, n) { \ +#define U16_BACK_N(s, start, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0 && (i)>(start)) { \ U16_BACK_1(s, start, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary after a code point. @@ -701,11 +701,11 @@ * @see U16_SET_CP_LIMIT * @stable ICU 2.4 */ -#define U16_SET_CP_LIMIT_UNSAFE(s, i) { \ +#define U16_SET_CP_LIMIT_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U16_IS_LEAD((s)[(i)-1])) { \ ++(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary after a code point. @@ -724,10 +724,10 @@ * @see U16_SET_CP_LIMIT_UNSAFE * @stable ICU 2.4 */ -#define U16_SET_CP_LIMIT(s, start, i, length) { \ +#define U16_SET_CP_LIMIT(s, start, i, length) UPRV_BLOCK_MACRO_BEGIN { \ if((start)<(i) && ((i)<(length) || (length)<0) && U16_IS_LEAD((s)[(i)-1]) && U16_IS_TRAIL((s)[i])) { \ ++(i); \ } \ -} +} UPRV_BLOCK_MACRO_END #endif diff --git a/deps/icu-small/source/common/unicode/utf8.h b/deps/icu-small/source/common/unicode/utf8.h index 41155f119bbb86..bb001303747efe 100644 --- a/deps/icu-small/source/common/unicode/utf8.h +++ b/deps/icu-small/source/common/unicode/utf8.h @@ -229,11 +229,11 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_GET * @stable ICU 2.4 */ -#define U8_GET_UNSAFE(s, i, c) { \ +#define U8_GET_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ int32_t _u8_get_unsafe_index=(int32_t)(i); \ U8_SET_CP_START_UNSAFE(s, _u8_get_unsafe_index); \ U8_NEXT_UNSAFE(s, _u8_get_unsafe_index, c); \ -} +} UPRV_BLOCK_MACRO_END /** * Get a code point from a string at a random-access offset, @@ -256,11 +256,11 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_GET_UNSAFE * @stable ICU 2.4 */ -#define U8_GET(s, start, i, length, c) { \ +#define U8_GET(s, start, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ int32_t _u8_get_index=(i); \ U8_SET_CP_START(s, start, _u8_get_index); \ U8_NEXT(s, _u8_get_index, length, c); \ -} +} UPRV_BLOCK_MACRO_END /** * Get a code point from a string at a random-access offset, @@ -287,11 +287,11 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_GET * @stable ICU 51 */ -#define U8_GET_OR_FFFD(s, start, i, length, c) { \ +#define U8_GET_OR_FFFD(s, start, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ int32_t _u8_get_index=(i); \ U8_SET_CP_START(s, start, _u8_get_index); \ U8_NEXT_OR_FFFD(s, _u8_get_index, length, c); \ -} +} UPRV_BLOCK_MACRO_END /* definitions with forward iteration --------------------------------------- */ @@ -312,7 +312,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_NEXT * @stable ICU 2.4 */ -#define U8_NEXT_UNSAFE(s, i, c) { \ +#define U8_NEXT_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(uint8_t)(s)[(i)++]; \ if(!U8_IS_SINGLE(c)) { \ if((c)<0xe0) { \ @@ -326,7 +326,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); (i)+=3; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Get a code point from a string at a code point boundary offset, @@ -377,7 +377,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); #define U8_NEXT_OR_FFFD(s, i, length, c) U8_INTERNAL_NEXT_OR_SUB(s, i, length, c, 0xfffd) /** @internal */ -#define U8_INTERNAL_NEXT_OR_SUB(s, i, length, c, sub) { \ +#define U8_INTERNAL_NEXT_OR_SUB(s, i, length, c, sub) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(uint8_t)(s)[(i)++]; \ if(!U8_IS_SINGLE(c)) { \ uint8_t __t = 0; \ @@ -403,7 +403,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); (c)=(sub); /* ill-formed*/ \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Append a code point to a string, overwriting 1 to 4 bytes. @@ -418,7 +418,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_APPEND * @stable ICU 2.4 */ -#define U8_APPEND_UNSAFE(s, i, c) { \ +#define U8_APPEND_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ uint32_t __uc=(c); \ if(__uc<=0x7f) { \ (s)[(i)++]=(uint8_t)__uc; \ @@ -436,7 +436,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); } \ (s)[(i)++]=(uint8_t)((__uc&0x3f)|0x80); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Append a code point to a string, overwriting 1 to 4 bytes. @@ -455,7 +455,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_APPEND_UNSAFE * @stable ICU 2.4 */ -#define U8_APPEND(s, i, capacity, c, isError) { \ +#define U8_APPEND(s, i, capacity, c, isError) UPRV_BLOCK_MACRO_BEGIN { \ uint32_t __uc=(c); \ if(__uc<=0x7f) { \ (s)[(i)++]=(uint8_t)__uc; \ @@ -474,7 +474,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); } else { \ (isError)=TRUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the next. @@ -486,9 +486,9 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_FWD_1 * @stable ICU 2.4 */ -#define U8_FWD_1_UNSAFE(s, i) { \ +#define U8_FWD_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ (i)+=1+U8_COUNT_TRAIL_BYTES_UNSAFE((s)[i]); \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the next. @@ -503,7 +503,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_FWD_1_UNSAFE * @stable ICU 2.4 */ -#define U8_FWD_1(s, i, length) { \ +#define U8_FWD_1(s, i, length) UPRV_BLOCK_MACRO_BEGIN { \ uint8_t __b=(s)[(i)++]; \ if(U8_IS_LEAD(__b) && (i)!=(length)) { \ uint8_t __t1=(s)[i]; \ @@ -524,7 +524,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); } \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the n-th next one, @@ -538,13 +538,13 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_FWD_N * @stable ICU 2.4 */ -#define U8_FWD_N_UNSAFE(s, i, n) { \ +#define U8_FWD_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ U8_FWD_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Advance the string offset from one code point boundary to the n-th next one, @@ -561,13 +561,13 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_FWD_N_UNSAFE * @stable ICU 2.4 */ -#define U8_FWD_N(s, i, length, n) { \ +#define U8_FWD_N(s, i, length, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0 && ((i)<(length) || ((length)<0 && (s)[i]!=0))) { \ U8_FWD_1(s, i, length); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary @@ -582,9 +582,9 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_SET_CP_START * @stable ICU 2.4 */ -#define U8_SET_CP_START_UNSAFE(s, i) { \ +#define U8_SET_CP_START_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ while(U8_IS_TRAIL((s)[i])) { --(i); } \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary @@ -603,11 +603,11 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_TRUNCATE_IF_INCOMPLETE * @stable ICU 2.4 */ -#define U8_SET_CP_START(s, start, i) { \ +#define U8_SET_CP_START(s, start, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U8_IS_TRAIL((s)[(i)])) { \ (i)=utf8_back1SafeBody(s, start, (i)); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * If the string ends with a UTF-8 byte sequence that is valid so far @@ -635,7 +635,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_SET_CP_START * @stable ICU 61 */ -#define U8_TRUNCATE_IF_INCOMPLETE(s, start, length) \ +#define U8_TRUNCATE_IF_INCOMPLETE(s, start, length) UPRV_BLOCK_MACRO_BEGIN { \ if((length)>(start)) { \ uint8_t __b1=s[(length)-1]; \ if(U8_IS_SINGLE(__b1)) { \ @@ -656,7 +656,8 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); } \ } \ } \ - } + } \ +} UPRV_BLOCK_MACRO_END /* definitions with backward iteration -------------------------------------- */ @@ -679,7 +680,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_PREV * @stable ICU 2.4 */ -#define U8_PREV_UNSAFE(s, i, c) { \ +#define U8_PREV_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(uint8_t)(s)[--(i)]; \ if(U8_IS_TRAIL(c)) { \ uint8_t __b, __count=1, __shift=6; \ @@ -699,7 +700,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); } \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one @@ -721,12 +722,12 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_PREV_UNSAFE * @stable ICU 2.4 */ -#define U8_PREV(s, start, i, c) { \ +#define U8_PREV(s, start, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(uint8_t)(s)[--(i)]; \ if(!U8_IS_SINGLE(c)) { \ (c)=utf8_prevCharSafeBody((const uint8_t *)s, start, &(i), c, -1); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one @@ -752,12 +753,12 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_PREV * @stable ICU 51 */ -#define U8_PREV_OR_FFFD(s, start, i, c) { \ +#define U8_PREV_OR_FFFD(s, start, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(uint8_t)(s)[--(i)]; \ if(!U8_IS_SINGLE(c)) { \ (c)=utf8_prevCharSafeBody((const uint8_t *)s, start, &(i), c, -3); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one. @@ -770,9 +771,9 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_BACK_1 * @stable ICU 2.4 */ -#define U8_BACK_1_UNSAFE(s, i) { \ +#define U8_BACK_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ while(U8_IS_TRAIL((s)[--(i)])) {} \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the previous one. @@ -786,11 +787,11 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_BACK_1_UNSAFE * @stable ICU 2.4 */ -#define U8_BACK_1(s, start, i) { \ +#define U8_BACK_1(s, start, i) UPRV_BLOCK_MACRO_BEGIN { \ if(U8_IS_TRAIL((s)[--(i)])) { \ (i)=utf8_back1SafeBody(s, start, (i)); \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the n-th one before it, @@ -805,13 +806,13 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_BACK_N * @stable ICU 2.4 */ -#define U8_BACK_N_UNSAFE(s, i, n) { \ +#define U8_BACK_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ U8_BACK_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Move the string offset from one code point boundary to the n-th one before it, @@ -827,13 +828,13 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_BACK_N_UNSAFE * @stable ICU 2.4 */ -#define U8_BACK_N(s, start, i, n) { \ +#define U8_BACK_N(s, start, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0 && (i)>(start)) { \ U8_BACK_1(s, start, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary after a code point. @@ -848,10 +849,10 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_SET_CP_LIMIT * @stable ICU 2.4 */ -#define U8_SET_CP_LIMIT_UNSAFE(s, i) { \ +#define U8_SET_CP_LIMIT_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ U8_BACK_1_UNSAFE(s, i); \ U8_FWD_1_UNSAFE(s, i); \ -} +} UPRV_BLOCK_MACRO_END /** * Adjust a random-access offset to a code point boundary after a code point. @@ -870,11 +871,11 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); * @see U8_SET_CP_LIMIT_UNSAFE * @stable ICU 2.4 */ -#define U8_SET_CP_LIMIT(s, start, i, length) { \ +#define U8_SET_CP_LIMIT(s, start, i, length) UPRV_BLOCK_MACRO_BEGIN { \ if((start)<(i) && ((i)<(length) || (length)<0)) { \ U8_BACK_1(s, start, i); \ U8_FWD_1(s, i, length); \ } \ -} +} UPRV_BLOCK_MACRO_END #endif diff --git a/deps/icu-small/source/common/unicode/utf_old.h b/deps/icu-small/source/common/unicode/utf_old.h index 55c17c01df6db3..b2428e6b31e282 100644 --- a/deps/icu-small/source/common/unicode/utf_old.h +++ b/deps/icu-small/source/common/unicode/utf_old.h @@ -19,9 +19,6 @@ /** * \file * \brief C API: Deprecated macros for Unicode string handling - */ - -/** * * The macros in utf_old.h are all deprecated and their use discouraged. * Some of the design principles behind the set of UTF macros @@ -139,12 +136,16 @@ * *


* - * @deprecated ICU 2.4. Use the macros in utf.h, utf16.h, utf8.h instead. + * Deprecated ICU 2.4. Use the macros in utf.h, utf16.h, utf8.h instead. */ #ifndef __UTF_OLD_H__ #define __UTF_OLD_H__ +#include "unicode/utf.h" +#include "unicode/utf8.h" +#include "unicode/utf16.h" + /** * \def U_HIDE_OBSOLETE_UTF_OLD_H * @@ -162,10 +163,6 @@ #if !defined(U_HIDE_DEPRECATED_API) && !U_HIDE_OBSOLETE_UTF_OLD_H -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" - /* Formerly utf.h, part 1 --------------------------------------------------- */ #ifdef U_USE_UTF_DEPRECATES @@ -365,21 +362,21 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I #define UTF8_ARRAY_SIZE(size) ((5*(size))/2) /** @deprecated ICU 2.4. Renamed to U8_GET_UNSAFE, see utf_old.h. */ -#define UTF8_GET_CHAR_UNSAFE(s, i, c) { \ +#define UTF8_GET_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ int32_t _utf8_get_char_unsafe_index=(int32_t)(i); \ UTF8_SET_CHAR_START_UNSAFE(s, _utf8_get_char_unsafe_index); \ UTF8_NEXT_CHAR_UNSAFE(s, _utf8_get_char_unsafe_index, c); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U8_GET instead, see utf_old.h. */ -#define UTF8_GET_CHAR_SAFE(s, start, i, length, c, strict) { \ +#define UTF8_GET_CHAR_SAFE(s, start, i, length, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ int32_t _utf8_get_char_safe_index=(int32_t)(i); \ UTF8_SET_CHAR_START_SAFE(s, start, _utf8_get_char_safe_index); \ UTF8_NEXT_CHAR_SAFE(s, _utf8_get_char_safe_index, length, c, strict); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_NEXT_UNSAFE, see utf_old.h. */ -#define UTF8_NEXT_CHAR_UNSAFE(s, i, c) { \ +#define UTF8_NEXT_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if((uint8_t)((c)-0xc0)<0x35) { \ uint8_t __count=UTF8_COUNT_TRAIL_BYTES(c); \ @@ -396,10 +393,10 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I break; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_APPEND_UNSAFE, see utf_old.h. */ -#define UTF8_APPEND_CHAR_UNSAFE(s, i, c) { \ +#define UTF8_APPEND_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c)<=0x7f) { \ (s)[(i)++]=(uint8_t)(c); \ } else { \ @@ -416,29 +413,29 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I } \ (s)[(i)++]=(uint8_t)(((c)&0x3f)|0x80); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_FWD_1_UNSAFE, see utf_old.h. */ -#define UTF8_FWD_1_UNSAFE(s, i) { \ +#define UTF8_FWD_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ (i)+=1+UTF8_COUNT_TRAIL_BYTES((s)[i]); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_FWD_N_UNSAFE, see utf_old.h. */ -#define UTF8_FWD_N_UNSAFE(s, i, n) { \ +#define UTF8_FWD_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ UTF8_FWD_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_SET_CP_START_UNSAFE, see utf_old.h. */ -#define UTF8_SET_CHAR_START_UNSAFE(s, i) { \ +#define UTF8_SET_CHAR_START_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ while(UTF8_IS_TRAIL((s)[i])) { --(i); } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U8_NEXT instead, see utf_old.h. */ -#define UTF8_NEXT_CHAR_SAFE(s, i, length, c, strict) { \ +#define UTF8_NEXT_CHAR_SAFE(s, i, length, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if((c)>=0x80) { \ if(UTF8_IS_LEAD(c)) { \ @@ -447,16 +444,16 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I (c)=UTF8_ERROR_VALUE_1; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U8_APPEND instead, see utf_old.h. */ -#define UTF8_APPEND_CHAR_SAFE(s, i, length, c) { \ +#define UTF8_APPEND_CHAR_SAFE(s, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c)<=0x7f) { \ (s)[(i)++]=(uint8_t)(c); \ } else { \ (i)=utf8_appendCharSafeBody(s, (int32_t)(i), (int32_t)(length), c, NULL); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_FWD_1, see utf_old.h. */ #define UTF8_FWD_1_SAFE(s, i, length) U8_FWD_1(s, i, length) @@ -468,7 +465,7 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I #define UTF8_SET_CHAR_START_SAFE(s, start, i) U8_SET_CP_START(s, start, i) /** @deprecated ICU 2.4. Renamed to U8_PREV_UNSAFE, see utf_old.h. */ -#define UTF8_PREV_CHAR_UNSAFE(s, i, c) { \ +#define UTF8_PREV_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if(UTF8_IS_TRAIL(c)) { \ uint8_t __b, __count=1, __shift=6; \ @@ -488,30 +485,30 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I } \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_BACK_1_UNSAFE, see utf_old.h. */ -#define UTF8_BACK_1_UNSAFE(s, i) { \ +#define UTF8_BACK_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ while(UTF8_IS_TRAIL((s)[--(i)])) {} \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_BACK_N_UNSAFE, see utf_old.h. */ -#define UTF8_BACK_N_UNSAFE(s, i, n) { \ +#define UTF8_BACK_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ UTF8_BACK_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_SET_CP_LIMIT_UNSAFE, see utf_old.h. */ -#define UTF8_SET_CHAR_LIMIT_UNSAFE(s, i) { \ +#define UTF8_SET_CHAR_LIMIT_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ UTF8_BACK_1_UNSAFE(s, i); \ UTF8_FWD_1_UNSAFE(s, i); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U8_PREV instead, see utf_old.h. */ -#define UTF8_PREV_CHAR_SAFE(s, start, i, c, strict) { \ +#define UTF8_PREV_CHAR_SAFE(s, start, i, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if((c)>=0x80) { \ if((c)<=0xbf) { \ @@ -520,7 +517,7 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I (c)=UTF8_ERROR_VALUE_1; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U8_BACK_1, see utf_old.h. */ #define UTF8_BACK_1_SAFE(s, start, i) U8_BACK_1(s, start, i) @@ -593,7 +590,7 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I * UTF16_PREV_CHAR[_UNSAFE]() is more efficient for that. * @deprecated ICU 2.4. Renamed to U16_GET_UNSAFE, see utf_old.h. */ -#define UTF16_GET_CHAR_UNSAFE(s, i, c) { \ +#define UTF16_GET_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[i]; \ if(UTF_IS_SURROGATE(c)) { \ if(UTF_IS_SURROGATE_FIRST(c)) { \ @@ -602,10 +599,10 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I (c)=UTF16_GET_PAIR_VALUE((s)[(i)-1], (c)); \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U16_GET instead, see utf_old.h. */ -#define UTF16_GET_CHAR_SAFE(s, start, i, length, c, strict) { \ +#define UTF16_GET_CHAR_SAFE(s, start, i, length, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[i]; \ if(UTF_IS_SURROGATE(c)) { \ uint16_t __c2; \ @@ -629,51 +626,51 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I } else if((strict) && !UTF_IS_UNICODE_CHAR(c)) { \ (c)=UTF_ERROR_VALUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_NEXT_UNSAFE, see utf_old.h. */ -#define UTF16_NEXT_CHAR_UNSAFE(s, i, c) { \ +#define UTF16_NEXT_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if(UTF_IS_FIRST_SURROGATE(c)) { \ (c)=UTF16_GET_PAIR_VALUE((c), (s)[(i)++]); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_APPEND_UNSAFE, see utf_old.h. */ -#define UTF16_APPEND_CHAR_UNSAFE(s, i, c) { \ +#define UTF16_APPEND_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c)<=0xffff) { \ (s)[(i)++]=(uint16_t)(c); \ } else { \ (s)[(i)++]=(uint16_t)(((c)>>10)+0xd7c0); \ (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_FWD_1_UNSAFE, see utf_old.h. */ -#define UTF16_FWD_1_UNSAFE(s, i) { \ +#define UTF16_FWD_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(UTF_IS_FIRST_SURROGATE((s)[(i)++])) { \ ++(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_FWD_N_UNSAFE, see utf_old.h. */ -#define UTF16_FWD_N_UNSAFE(s, i, n) { \ +#define UTF16_FWD_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ UTF16_FWD_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_SET_CP_START_UNSAFE, see utf_old.h. */ -#define UTF16_SET_CHAR_START_UNSAFE(s, i) { \ +#define UTF16_SET_CHAR_START_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(UTF_IS_SECOND_SURROGATE((s)[i])) { \ --(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U16_NEXT instead, see utf_old.h. */ -#define UTF16_NEXT_CHAR_SAFE(s, i, length, c, strict) { \ +#define UTF16_NEXT_CHAR_SAFE(s, i, length, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if(UTF_IS_FIRST_SURROGATE(c)) { \ uint16_t __c2; \ @@ -689,10 +686,10 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I /* unmatched second surrogate or other non-character */ \ (c)=UTF_ERROR_VALUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U16_APPEND instead, see utf_old.h. */ -#define UTF16_APPEND_CHAR_SAFE(s, i, length, c) { \ +#define UTF16_APPEND_CHAR_SAFE(s, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c)<=0xffff) { \ (s)[(i)++]=(uint16_t)(c); \ } else if((uint32_t)(c)<=0x10ffff) { \ @@ -705,7 +702,7 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I } else /* c>0x10ffff, write error value */ { \ (s)[(i)++]=UTF_ERROR_VALUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_FWD_1, see utf_old.h. */ #define UTF16_FWD_1_SAFE(s, i, length) U16_FWD_1(s, i, length) @@ -717,38 +714,38 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I #define UTF16_SET_CHAR_START_SAFE(s, start, i) U16_SET_CP_START(s, start, i) /** @deprecated ICU 2.4. Renamed to U16_PREV_UNSAFE, see utf_old.h. */ -#define UTF16_PREV_CHAR_UNSAFE(s, i, c) { \ +#define UTF16_PREV_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if(UTF_IS_SECOND_SURROGATE(c)) { \ (c)=UTF16_GET_PAIR_VALUE((s)[--(i)], (c)); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_BACK_1_UNSAFE, see utf_old.h. */ -#define UTF16_BACK_1_UNSAFE(s, i) { \ +#define UTF16_BACK_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(UTF_IS_SECOND_SURROGATE((s)[--(i)])) { \ --(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_BACK_N_UNSAFE, see utf_old.h. */ -#define UTF16_BACK_N_UNSAFE(s, i, n) { \ +#define UTF16_BACK_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __N=(n); \ while(__N>0) { \ UTF16_BACK_1_UNSAFE(s, i); \ --__N; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_SET_CP_LIMIT_UNSAFE, see utf_old.h. */ -#define UTF16_SET_CHAR_LIMIT_UNSAFE(s, i) { \ +#define UTF16_SET_CHAR_LIMIT_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ if(UTF_IS_FIRST_SURROGATE((s)[(i)-1])) { \ ++(i); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Use U16_PREV instead, see utf_old.h. */ -#define UTF16_PREV_CHAR_SAFE(s, start, i, c, strict) { \ +#define UTF16_PREV_CHAR_SAFE(s, start, i, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if(UTF_IS_SECOND_SURROGATE(c)) { \ uint16_t __c2; \ @@ -764,7 +761,7 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I /* unmatched first surrogate or other non-character */ \ (c)=UTF_ERROR_VALUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Renamed to U16_BACK_1, see utf_old.h. */ #define UTF16_BACK_1_SAFE(s, start, i) U16_BACK_1(s, start, i) @@ -830,122 +827,122 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[]; /* U_IMPORT2? */ /*U_I #define UTF32_ARRAY_SIZE(size) (size) /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_GET_CHAR_UNSAFE(s, i, c) { \ +#define UTF32_GET_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[i]; \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_GET_CHAR_SAFE(s, start, i, length, c, strict) { \ +#define UTF32_GET_CHAR_SAFE(s, start, i, length, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[i]; \ if(!UTF32_IS_SAFE(c, strict)) { \ (c)=UTF_ERROR_VALUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /* definitions with forward iteration --------------------------------------- */ /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_NEXT_CHAR_UNSAFE(s, i, c) { \ +#define UTF32_NEXT_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_APPEND_CHAR_UNSAFE(s, i, c) { \ +#define UTF32_APPEND_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (s)[(i)++]=(c); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_FWD_1_UNSAFE(s, i) { \ +#define UTF32_FWD_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ ++(i); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_FWD_N_UNSAFE(s, i, n) { \ +#define UTF32_FWD_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ (i)+=(n); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_SET_CHAR_START_UNSAFE(s, i) { \ -} +#define UTF32_SET_CHAR_START_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_NEXT_CHAR_SAFE(s, i, length, c, strict) { \ +#define UTF32_NEXT_CHAR_SAFE(s, i, length, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[(i)++]; \ if(!UTF32_IS_SAFE(c, strict)) { \ (c)=UTF_ERROR_VALUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_APPEND_CHAR_SAFE(s, i, length, c) { \ +#define UTF32_APPEND_CHAR_SAFE(s, i, length, c) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c)<=0x10ffff) { \ (s)[(i)++]=(c); \ } else /* c>0x10ffff, write 0xfffd */ { \ (s)[(i)++]=0xfffd; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_FWD_1_SAFE(s, i, length) { \ +#define UTF32_FWD_1_SAFE(s, i, length) UPRV_BLOCK_MACRO_BEGIN { \ ++(i); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_FWD_N_SAFE(s, i, length, n) { \ +#define UTF32_FWD_N_SAFE(s, i, length, n) UPRV_BLOCK_MACRO_BEGIN { \ if(((i)+=(n))>(length)) { \ (i)=(length); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_SET_CHAR_START_SAFE(s, start, i) { \ -} +#define UTF32_SET_CHAR_START_SAFE(s, start, i) UPRV_BLOCK_MACRO_BEGIN { \ +} UPRV_BLOCK_MACRO_END /* definitions with backward iteration -------------------------------------- */ /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_PREV_CHAR_UNSAFE(s, i, c) { \ +#define UTF32_PREV_CHAR_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_BACK_1_UNSAFE(s, i) { \ +#define UTF32_BACK_1_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ --(i); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_BACK_N_UNSAFE(s, i, n) { \ +#define UTF32_BACK_N_UNSAFE(s, i, n) UPRV_BLOCK_MACRO_BEGIN { \ (i)-=(n); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_SET_CHAR_LIMIT_UNSAFE(s, i) { \ -} +#define UTF32_SET_CHAR_LIMIT_UNSAFE(s, i) UPRV_BLOCK_MACRO_BEGIN { \ +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_PREV_CHAR_SAFE(s, start, i, c, strict) { \ +#define UTF32_PREV_CHAR_SAFE(s, start, i, c, strict) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(s)[--(i)]; \ if(!UTF32_IS_SAFE(c, strict)) { \ (c)=UTF_ERROR_VALUE; \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_BACK_1_SAFE(s, start, i) { \ +#define UTF32_BACK_1_SAFE(s, start, i) UPRV_BLOCK_MACRO_BEGIN { \ --(i); \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_BACK_N_SAFE(s, start, i, n) { \ +#define UTF32_BACK_N_SAFE(s, start, i, n) UPRV_BLOCK_MACRO_BEGIN { \ (i)-=(n); \ if((i)<(start)) { \ (i)=(start); \ } \ -} +} UPRV_BLOCK_MACRO_END /** @deprecated ICU 2.4. Obsolete, see utf_old.h. */ -#define UTF32_SET_CHAR_LIMIT_SAFE(s, i, length) { \ -} +#define UTF32_SET_CHAR_LIMIT_SAFE(s, i, length) UPRV_BLOCK_MACRO_BEGIN { \ +} UPRV_BLOCK_MACRO_END /* Formerly utf.h, part 2 --------------------------------------------------- */ diff --git a/deps/icu-small/source/common/unicode/utrace.h b/deps/icu-small/source/common/unicode/utrace.h index bf6fd036f06c41..0af050756fc38a 100644 --- a/deps/icu-small/source/common/unicode/utrace.h +++ b/deps/icu-small/source/common/unicode/utrace.h @@ -66,6 +66,7 @@ typedef enum UTraceFunctionNumber { UTRACE_FUNCTION_START=0, UTRACE_U_INIT=UTRACE_FUNCTION_START, UTRACE_U_CLEANUP, + #ifndef U_HIDE_DEPRECATED_API /** * One more than the highest normal collation trace location. @@ -83,6 +84,7 @@ typedef enum UTraceFunctionNumber { UTRACE_UCNV_FLUSH_CACHE, UTRACE_UCNV_LOAD, UTRACE_UCNV_UNLOAD, + #ifndef U_HIDE_DEPRECATED_API /** * One more than the highest normal collation trace location. @@ -101,13 +103,80 @@ typedef enum UTraceFunctionNumber { UTRACE_UCOL_STRCOLLITER, UTRACE_UCOL_OPEN_FROM_SHORT_STRING, UTRACE_UCOL_STRCOLLUTF8, /**< @stable ICU 50 */ + #ifndef U_HIDE_DEPRECATED_API /** * One more than the highest normal collation trace location. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ - UTRACE_COLLATION_LIMIT + UTRACE_COLLATION_LIMIT, #endif // U_HIDE_DEPRECATED_API + +#ifndef U_HIDE_DRAFT_API + + /** + * The lowest resource/data location. + * @draft ICU 65 + */ + UTRACE_UDATA_START=0x3000, + + /** + * Indicates that a value was read from a resource bundle. Provides three + * C-style strings to UTraceData: type, file name, and resource path. The + * possible types are: + * + * - "string" (a string value was accessed) + * - "binary" (a binary value was accessed) + * - "intvector" (a integer vector value was accessed) + * - "int" (a signed integer value was accessed) + * - "uint" (a unsigned integer value was accessed) + * - "get" (a path was loaded, but the value was not accessed) + * - "getalias" (a path was loaded, and an alias was resolved) + * + * @draft ICU 65 + */ + UTRACE_UDATA_RESOURCE=UTRACE_UDATA_START, + + /** + * Indicates that a resource bundle was opened. + * + * Provides one C-style string to UTraceData: file name. + * @draft ICU 65 + */ + UTRACE_UDATA_BUNDLE, + + /** + * Indicates that a data file was opened, but not *.res files. + * + * Provides one C-style string to UTraceData: file name. + * + * @draft ICU 65 + */ + UTRACE_UDATA_DATA_FILE, + + /** + * Indicates that a *.res file was opened. + * + * This differs from UTRACE_UDATA_BUNDLE because a res file is typically + * opened only once per application runtime, but the bundle corresponding + * to that res file may be opened many times. + * + * Provides one C-style string to UTraceData: file name. + * + * @draft ICU 65 + */ + UTRACE_UDATA_RES_FILE, + +#endif // U_HIDE_DRAFT_API + +#ifndef U_HIDE_INTERNAL_API + /** + * One more than the highest normal resource/data trace location. + * @internal The numeric value may change over time, see ICU ticket #12420. + */ + UTRACE_RES_DATA_LIMIT, +#endif // U_HIDE_INTERNAL_API + } UTraceFunctionNumber; /** diff --git a/deps/icu-small/source/common/unicode/utypes.h b/deps/icu-small/source/common/unicode/utypes.h index 49eb12cd40022c..c98de9e6fc3dad 100644 --- a/deps/icu-small/source/common/unicode/utypes.h +++ b/deps/icu-small/source/common/unicode/utypes.h @@ -385,17 +385,31 @@ typedef double UDate; /*===========================================================================*/ /** - * Error code to replace exception handling, so that the code is compatible with all C++ compilers, - * and to use the same mechanism for C and C++. + * Standard ICU4C error code type, a substitute for exceptions. + * + * Initialize the UErrorCode with U_ZERO_ERROR, and check for success or + * failure using U_SUCCESS() or U_FAILURE(): + * + * UErrorCode errorCode = U_ZERO_ERROR; + * // call ICU API that needs an error code parameter. + * if (U_FAILURE(errorCode)) { + * // An error occurred. Handle it here. + * } + * + * C++ code should use icu::ErrorCode, available in unicode/errorcode.h, or a + * suitable subclass. + * + * For more information, see: + * http://icu-project.org/userguide/conventions + * + * Note: By convention, ICU functions that take a reference (C++) or a pointer + * (C) to a UErrorCode first test: + * + * if (U_FAILURE(errorCode)) { return immediately; } * - * \par - * ICU functions that take a reference (C++) or a pointer (C) to a UErrorCode - * first test if(U_FAILURE(errorCode)) { return immediately; } * so that in a chain of such functions the first one that sets an error code * causes the following ones to not perform any operations. * - * \par - * Error codes should be tested using U_FAILURE() and U_SUCCESS(). * @stable ICU 2.0 */ typedef enum UErrorCode { diff --git a/deps/icu-small/source/common/unicode/uvernum.h b/deps/icu-small/source/common/unicode/uvernum.h index 7c114be2cc87f1..0923c1d9189d0f 100644 --- a/deps/icu-small/source/common/unicode/uvernum.h +++ b/deps/icu-small/source/common/unicode/uvernum.h @@ -60,13 +60,13 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 64 +#define U_ICU_VERSION_MAJOR_NUM 65 /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 2 +#define U_ICU_VERSION_MINOR_NUM 1 /** The current ICU patchlevel version as an integer. * This value will change in the subsequent releases of ICU @@ -86,7 +86,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _64 +#define U_ICU_VERSION_SUFFIX _65 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -139,7 +139,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "64.2" +#define U_ICU_VERSION "65.1" /** * The current ICU library major version number as a string, for library name suffixes. @@ -152,13 +152,13 @@ * * @stable ICU 2.6 */ -#define U_ICU_VERSION_SHORT "64" +#define U_ICU_VERSION_SHORT "65" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "64.2" +#define U_ICU_DATA_VERSION "65.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/deps/icu-small/source/common/unicode/uversion.h b/deps/icu-small/source/common/unicode/uversion.h index 3f0251d3994bcb..c8c7a374c820b2 100644 --- a/deps/icu-small/source/common/unicode/uversion.h +++ b/deps/icu-small/source/common/unicode/uversion.h @@ -62,26 +62,22 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH]; /* C++ namespace if supported. Versioned unless versioning is disabled. */ /*===========================================================================*/ +/* Define C++ namespace symbols. */ +#ifdef __cplusplus + /** * \def U_NAMESPACE_BEGIN - * This is used to begin a declaration of a public ICU C++ API. - * When not compiling for C++, it does nothing. - * When compiling for C++, it begins an extern "C++" linkage block (to protect - * against cases in which an external client includes ICU header files inside - * an extern "C" linkage block). + * This is used to begin a declaration of a public ICU C++ API within + * versioned-ICU-namespace block. * - * It also begins a versioned-ICU-namespace block. * @stable ICU 2.4 */ /** * \def U_NAMESPACE_END * This is used to end a declaration of a public ICU C++ API. - * When not compiling for C++, it does nothing. - * When compiling for C++, it ends the extern "C++" block begun by - * U_NAMESPACE_BEGIN. + * It ends the versioned-ICU-namespace block begun by U_NAMESPACE_BEGIN. * - * It also ends the versioned-ICU-namespace block begun by U_NAMESPACE_BEGIN. * @stable ICU 2.4 */ @@ -89,9 +85,6 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH]; * \def U_NAMESPACE_USE * This is used to specify that the rest of the code uses the * public ICU C++ API namespace. - * This is invoked by default; we recommend that you turn it off: - * See the "Recommended Build Options" section of the ICU4C readme - * (http://source.icu-project.org/repos/icu/icu/trunk/readme.html#RecBuild) * @stable ICU 2.4 */ @@ -105,8 +98,6 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH]; * @stable ICU 2.4 */ -/* Define C++ namespace symbols. */ -#ifdef __cplusplus # if U_DISABLE_RENAMING # define U_ICU_NAMESPACE icu namespace U_ICU_NAMESPACE { } @@ -116,8 +107,8 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH]; namespace icu = U_ICU_NAMESPACE; # endif -# define U_NAMESPACE_BEGIN extern "C++" { namespace U_ICU_NAMESPACE { -# define U_NAMESPACE_END } } +# define U_NAMESPACE_BEGIN namespace U_ICU_NAMESPACE { +# define U_NAMESPACE_END } # define U_NAMESPACE_USE using namespace U_ICU_NAMESPACE; # define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE:: @@ -133,12 +124,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH]; # if U_USING_ICU_NAMESPACE U_NAMESPACE_USE # endif -#else -# define U_NAMESPACE_BEGIN -# define U_NAMESPACE_END -# define U_NAMESPACE_USE -# define U_NAMESPACE_QUALIFIER -#endif +#endif /* __cplusplus */ /*===========================================================================*/ /* General version helper functions. Definitions in putil.c */ diff --git a/deps/icu-small/source/common/unifiedcache.cpp b/deps/icu-small/source/common/unifiedcache.cpp index 641f4ec6594e12..f2dd916559588c 100644 --- a/deps/icu-small/source/common/unifiedcache.cpp +++ b/deps/icu-small/source/common/unifiedcache.cpp @@ -13,22 +13,15 @@ #include "unifiedcache.h" #include // For std::max() +#include -#include "mutex.h" #include "uassert.h" #include "uhash.h" #include "ucln_cmn.h" -#include "umutex.h" static icu::UnifiedCache *gCache = NULL; -static icu::UMutex *gCacheMutex() { - static icu::UMutex m = U_MUTEX_INITIALIZER; - return &m; -} -static icu::UConditionVar *gInProgressValueAddedCond() { - static icu::UConditionVar cv = U_CONDITION_INITIALIZER; - return &cv; -} +static std::mutex *gCacheMutex = nullptr; +static std::condition_variable *gInProgressValueAddedCond; static icu::UInitOnce gCacheInitOnce = U_INITONCE_INITIALIZER; static const int32_t MAX_EVICT_ITERATIONS = 10; @@ -39,10 +32,12 @@ static const int32_t DEFAULT_PERCENTAGE_OF_IN_USE = 100; U_CDECL_BEGIN static UBool U_CALLCONV unifiedcache_cleanup() { gCacheInitOnce.reset(); - if (gCache) { - delete gCache; - gCache = NULL; - } + delete gCache; + gCache = nullptr; + gCacheMutex->~mutex(); + gCacheMutex = nullptr; + gInProgressValueAddedCond->~condition_variable(); + gInProgressValueAddedCond = nullptr; return TRUE; } U_CDECL_END @@ -77,6 +72,8 @@ static void U_CALLCONV cacheInit(UErrorCode &status) { ucln_common_registerCleanup( UCLN_COMMON_UNIFIED_CACHE, unifiedcache_cleanup); + gCacheMutex = STATIC_NEW(std::mutex); + gInProgressValueAddedCond = STATIC_NEW(std::condition_variable); gCache = new UnifiedCache(status); if (gCache == NULL) { status = U_MEMORY_ALLOCATION_ERROR; @@ -138,28 +135,28 @@ void UnifiedCache::setEvictionPolicy( status = U_ILLEGAL_ARGUMENT_ERROR; return; } - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); fMaxUnused = count; fMaxPercentageOfInUse = percentageOfInUseItems; } int32_t UnifiedCache::unusedCount() const { - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); return uhash_count(fHashtable) - fNumValuesInUse; } int64_t UnifiedCache::autoEvictedCount() const { - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); return fAutoEvictedCount; } int32_t UnifiedCache::keyCount() const { - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); return uhash_count(fHashtable); } void UnifiedCache::flush() const { - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); // Use a loop in case cache items that are flushed held hard references to // other cache items making those additional cache items eligible for @@ -168,7 +165,7 @@ void UnifiedCache::flush() const { } void UnifiedCache::handleUnreferencedObject() const { - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); --fNumValuesInUse; _runEvictionSlice(); } @@ -187,7 +184,7 @@ void UnifiedCache::dump() { } void UnifiedCache::dumpContents() const { - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); _dumpContents(); } @@ -227,7 +224,7 @@ UnifiedCache::~UnifiedCache() { // Now all that should be left in the cache are entries that refer to // each other and entries with hard references from outside the cache. // Nothing we can do about these so proceed to wipe out the cache. - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); _flush(TRUE); } uhash_close(fHashtable); @@ -328,7 +325,7 @@ void UnifiedCache::_putIfAbsentAndGet( const CacheKeyBase &key, const SharedObject *&value, UErrorCode &status) const { - Mutex lock(gCacheMutex()); + std::lock_guard lock(*gCacheMutex); const UHashElement *element = uhash_find(fHashtable, &key); if (element != NULL && !_inProgress(element)) { _fetch(element, value, status); @@ -353,15 +350,15 @@ UBool UnifiedCache::_poll( UErrorCode &status) const { U_ASSERT(value == NULL); U_ASSERT(status == U_ZERO_ERROR); - Mutex lock(gCacheMutex()); + std::unique_lock lock(*gCacheMutex); const UHashElement *element = uhash_find(fHashtable, &key); // If the hash table contains an inProgress placeholder entry for this key, // this means that another thread is currently constructing the value object. // Loop, waiting for that construction to complete. while (element != NULL && _inProgress(element)) { - umtx_condWait(gInProgressValueAddedCond(), gCacheMutex()); - element = uhash_find(fHashtable, &key); + gInProgressValueAddedCond->wait(lock); + element = uhash_find(fHashtable, &key); } // If the hash table contains an entry for the key, @@ -433,7 +430,7 @@ void UnifiedCache::_put( // Tell waiting threads that we replace in-progress status with // an error. - umtx_condBroadcast(gInProgressValueAddedCond()); + gInProgressValueAddedCond->notify_all(); } void UnifiedCache::_fetch( diff --git a/deps/icu-small/source/common/uniset.cpp b/deps/icu-small/source/common/uniset.cpp index 1db382afe6f6ba..3807b837475948 100644 --- a/deps/icu-small/source/common/uniset.cpp +++ b/deps/icu-small/source/common/uniset.cpp @@ -278,11 +278,11 @@ UnicodeSet& UnicodeSet::copyFrom(const UnicodeSet& o, UBool asThawed) { * to support cloning in order to allow classes using * UnicodeMatchers, such as Transliterator, to implement cloning. */ -UnicodeFunctor* UnicodeSet::clone() const { +UnicodeSet* UnicodeSet::clone() const { return new UnicodeSet(*this); } -UnicodeFunctor *UnicodeSet::cloneAsThawed() const { +UnicodeSet *UnicodeSet::cloneAsThawed() const { return new UnicodeSet(*this, TRUE); } @@ -2172,7 +2172,7 @@ void UnicodeSet::setPattern(const char16_t *newPat, int32_t newPatLen) { // We can regenerate an equivalent pattern later when requested. } -UnicodeFunctor *UnicodeSet::freeze() { +UnicodeSet *UnicodeSet::freeze() { if(!isFrozen() && !isBogus()) { compact(); diff --git a/deps/icu-small/source/common/uniset_props.cpp b/deps/icu-small/source/common/uniset_props.cpp index 6f7918a91ab9ed..45d3dab9938b29 100644 --- a/deps/icu-small/source/common/uniset_props.cpp +++ b/deps/icu-small/source/common/uniset_props.cpp @@ -802,7 +802,10 @@ static UBool mungeCharName(char* dst, const char* src, int32_t dstCapacity) { // Property set API //---------------------------------------------------------------- -#define FAIL(ec) {ec=U_ILLEGAL_ARGUMENT_ERROR; return *this;} +#define FAIL(ec) UPRV_BLOCK_MACRO_BEGIN { \ + ec=U_ILLEGAL_ARGUMENT_ERROR; \ + return *this; \ +} UPRV_BLOCK_MACRO_END UnicodeSet& UnicodeSet::applyIntPropertyValue(UProperty prop, int32_t value, UErrorCode& ec) { diff --git a/deps/icu-small/source/common/unisetspan.cpp b/deps/icu-small/source/common/unisetspan.cpp index 0a8893472f958b..68e44d91ee7066 100644 --- a/deps/icu-small/source/common/unisetspan.cpp +++ b/deps/icu-small/source/common/unisetspan.cpp @@ -400,7 +400,7 @@ UnicodeSetStringSpan::UnicodeSetStringSpan(const UnicodeSetStringSpan &otherStri if(otherStringSpan.pSpanNotSet==&otherStringSpan.spanSet) { pSpanNotSet=&spanSet; } else { - pSpanNotSet=(UnicodeSet *)otherStringSpan.pSpanNotSet->clone(); + pSpanNotSet=otherStringSpan.pSpanNotSet->clone(); } // Allocate a block of meta data. @@ -436,7 +436,7 @@ void UnicodeSetStringSpan::addToSpanNotSet(UChar32 c) { if(spanSet.contains(c)) { return; // Nothing to do. } - UnicodeSet *newSet=(UnicodeSet *)spanSet.cloneAsThawed(); + UnicodeSet *newSet=spanSet.cloneAsThawed(); if(newSet==NULL) { return; // Out of memory. } else { diff --git a/deps/icu-small/source/common/unistr.cpp b/deps/icu-small/source/common/unistr.cpp index 31b0ed84bee07d..eeb0c3a679a5e9 100644 --- a/deps/icu-small/source/common/unistr.cpp +++ b/deps/icu-small/source/common/unistr.cpp @@ -332,7 +332,7 @@ Replaceable::clone() const { } // UnicodeString overrides clone() with a real implementation -Replaceable * +UnicodeString * UnicodeString::clone() const { return new UnicodeString(*this); } diff --git a/deps/icu-small/source/common/uresbund.cpp b/deps/icu-small/source/common/uresbund.cpp index c9f2c860da7c33..3a9b4340bb4a38 100644 --- a/deps/icu-small/source/common/uresbund.cpp +++ b/deps/icu-small/source/common/uresbund.cpp @@ -31,6 +31,7 @@ #include "ucln_cmn.h" #include "cmemory.h" #include "cstring.h" +#include "mutex.h" #include "uhash.h" #include "unicode/uenum.h" #include "uenumimp.h" @@ -38,6 +39,7 @@ #include "umutex.h" #include "putilimp.h" #include "uassert.h" +#include "uresdata.h" using namespace icu; @@ -47,12 +49,9 @@ TODO: This cache should probably be removed when the deprecated code is completely removed. */ static UHashtable *cache = NULL; -static icu::UInitOnce gCacheInitOnce; +static icu::UInitOnce gCacheInitOnce = U_INITONCE_INITIALIZER; -static UMutex *resbMutex() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex resbMutex; /* INTERNAL: hashes an entry */ static int32_t U_CALLCONV hashEntry(const UHashTok parm) { @@ -96,13 +95,12 @@ static UBool chopLocale(char *name) { * Internal function */ static void entryIncrease(UResourceDataEntry *entry) { - umtx_lock(resbMutex()); + Mutex lock(&resbMutex); entry->fCountExisting++; while(entry->fParent != NULL) { entry = entry->fParent; entry->fCountExisting++; } - umtx_unlock(resbMutex()); } /** @@ -184,9 +182,8 @@ static int32_t ures_flushCache() /*if shared data hasn't even been lazy evaluated yet * return 0 */ - umtx_lock(resbMutex()); + Mutex lock(&resbMutex); if (cache == NULL) { - umtx_unlock(resbMutex()); return 0; } @@ -218,7 +215,6 @@ static int32_t ures_flushCache() * got decremented by free_entry(). */ } while(deletedMore); - umtx_unlock(resbMutex()); return rbDeletedNum; } @@ -232,9 +228,8 @@ U_CAPI UBool U_EXPORT2 ures_dumpCacheContents(void) { const UHashElement *e; UResourceDataEntry *resB; - umtx_lock(resbMutex()); + Mutex lock(&resbMutex); if (cache == NULL) { - umtx_unlock(resbMutex()); fprintf(stderr,"%s:%d: RB Cache is NULL.\n", __FILE__, __LINE__); return FALSE; } @@ -253,9 +248,6 @@ U_CAPI UBool U_EXPORT2 ures_dumpCacheContents(void) { } fprintf(stderr,"%s:%d: RB Cache still contains %d items.\n", __FILE__, __LINE__, uhash_count(cache)); - - umtx_unlock(resbMutex()); - return cacheNotEmpty; } @@ -401,7 +393,8 @@ static UResourceDataEntry *init_entry(const char *localeID, const char *path, UE /* We'll try to get alias string from the bundle */ aliasres = res_getResource(&(r->fData), "%%ALIAS"); if (aliasres != RES_BOGUS) { - const UChar *alias = res_getString(&(r->fData), aliasres, &aliasLen); + // No tracing: called during initial data loading + const UChar *alias = res_getStringNoTrace(&(r->fData), aliasres, &aliasLen); if(alias != NULL && aliasLen > 0) { /* if there is actual alias - unload and load new data */ u_UCharsToChars(alias, aliasName, aliasLen+1); r->fAlias = init_entry(aliasName, path, status); @@ -542,7 +535,8 @@ loadParentsExceptRoot(UResourceDataEntry *&t1, Resource parentRes = res_getResource(&t1->fData, "%%Parent"); if (parentRes != RES_BOGUS) { // An explicit parent was found. int32_t parentLocaleLen = 0; - const UChar *parentLocaleName = res_getString(&(t1->fData), parentRes, &parentLocaleLen); + // No tracing: called during initial data loading + const UChar *parentLocaleName = res_getStringNoTrace(&(t1->fData), parentRes, &parentLocaleLen); if(parentLocaleName != NULL && 0 < parentLocaleLen && parentLocaleLen < nameCapacity) { u_UCharsToChars(parentLocaleName, name, parentLocaleLen + 1); if (uprv_strcmp(name, kRootLocaleName) == 0) { @@ -666,107 +660,105 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, } } - umtx_lock(resbMutex()); - { /* umtx_lock */ - /* We're going to skip all the locales that do not have any data */ - r = findFirstExisting(path, name, &isRoot, &hasChopped, &isDefault, &intStatus); + Mutex lock(&resbMutex); // Lock resbMutex until the end of this function. + + /* We're going to skip all the locales that do not have any data */ + r = findFirstExisting(path, name, &isRoot, &hasChopped, &isDefault, &intStatus); + + // If we failed due to out-of-memory, report the failure and exit early. + if (intStatus == U_MEMORY_ALLOCATION_ERROR) { + *status = intStatus; + goto finish; + } + + if(r != NULL) { /* if there is one real locale, we can look for parents. */ + t1 = r; + hasRealData = TRUE; + if ( usingUSRData ) { /* This code inserts user override data into the inheritance chain */ + UErrorCode usrStatus = U_ZERO_ERROR; + UResourceDataEntry *u1 = init_entry(t1->fName, usrDataPath, &usrStatus); + // If we failed due to out-of-memory, report the failure and exit early. + if (intStatus == U_MEMORY_ALLOCATION_ERROR) { + *status = intStatus; + goto finish; + } + if ( u1 != NULL ) { + if(u1->fBogus == U_ZERO_ERROR) { + u1->fParent = t1; + r = u1; + } else { + /* the USR override data wasn't found, set it to be deleted */ + u1->fCountExisting = 0; + } + } + } + if (hasChopped && !isRoot) { + if (!loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), usingUSRData, usrDataPath, status)) { + goto finish; + } + } + } + /* we could have reached this point without having any real data */ + /* if that is the case, we need to chain in the default locale */ + if(r==NULL && openType == URES_OPEN_LOCALE_DEFAULT_ROOT && !isDefault && !isRoot) { + /* insert default locale */ + uprv_strcpy(name, uloc_getDefault()); + r = findFirstExisting(path, name, &isRoot, &hasChopped, &isDefault, &intStatus); // If we failed due to out-of-memory, report the failure and exit early. if (intStatus == U_MEMORY_ALLOCATION_ERROR) { *status = intStatus; - goto finishUnlock; + goto finish; } - - if(r != NULL) { /* if there is one real locale, we can look for parents. */ + intStatus = U_USING_DEFAULT_WARNING; + if(r != NULL) { /* the default locale exists */ t1 = r; hasRealData = TRUE; - if ( usingUSRData ) { /* This code inserts user override data into the inheritance chain */ - UErrorCode usrStatus = U_ZERO_ERROR; - UResourceDataEntry *u1 = init_entry(t1->fName, usrDataPath, &usrStatus); - // If we failed due to out-of-memory, report the failure and exit early. - if (intStatus == U_MEMORY_ALLOCATION_ERROR) { - *status = intStatus; - goto finishUnlock; - } - if ( u1 != NULL ) { - if(u1->fBogus == U_ZERO_ERROR) { - u1->fParent = t1; - r = u1; - } else { - /* the USR override data wasn't found, set it to be deleted */ - u1->fCountExisting = 0; - } - } - } + isDefault = TRUE; + // TODO: Why not if (usingUSRData) { ... } like in the non-default-locale code path? if (hasChopped && !isRoot) { if (!loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), usingUSRData, usrDataPath, status)) { - goto finishUnlock; + goto finish; } } } + } - /* we could have reached this point without having any real data */ - /* if that is the case, we need to chain in the default locale */ - if(r==NULL && openType == URES_OPEN_LOCALE_DEFAULT_ROOT && !isDefault && !isRoot) { - /* insert default locale */ - uprv_strcpy(name, uloc_getDefault()); - r = findFirstExisting(path, name, &isRoot, &hasChopped, &isDefault, &intStatus); - // If we failed due to out-of-memory, report the failure and exit early. - if (intStatus == U_MEMORY_ALLOCATION_ERROR) { - *status = intStatus; - goto finishUnlock; - } + /* we could still have r == NULL at this point - maybe even default locale is not */ + /* present */ + if(r == NULL) { + uprv_strcpy(name, kRootLocaleName); + r = findFirstExisting(path, name, &isRoot, &hasChopped, &isDefault, &intStatus); + // If we failed due to out-of-memory, report the failure and exit early. + if (intStatus == U_MEMORY_ALLOCATION_ERROR) { + *status = intStatus; + goto finish; + } + if(r != NULL) { + t1 = r; intStatus = U_USING_DEFAULT_WARNING; - if(r != NULL) { /* the default locale exists */ - t1 = r; - hasRealData = TRUE; - isDefault = TRUE; - // TODO: Why not if (usingUSRData) { ... } like in the non-default-locale code path? - if (hasChopped && !isRoot) { - if (!loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), usingUSRData, usrDataPath, status)) { - goto finishUnlock; - } - } - } + hasRealData = TRUE; + } else { /* we don't even have the root locale */ + *status = U_MISSING_RESOURCE_ERROR; + goto finish; } - - /* we could still have r == NULL at this point - maybe even default locale is not */ - /* present */ - if(r == NULL) { - uprv_strcpy(name, kRootLocaleName); - r = findFirstExisting(path, name, &isRoot, &hasChopped, &isDefault, &intStatus); - // If we failed due to out-of-memory, report the failure and exit early. - if (intStatus == U_MEMORY_ALLOCATION_ERROR) { - *status = intStatus; - goto finishUnlock; - } - if(r != NULL) { - t1 = r; - intStatus = U_USING_DEFAULT_WARNING; - hasRealData = TRUE; - } else { /* we don't even have the root locale */ - *status = U_MISSING_RESOURCE_ERROR; - goto finishUnlock; - } - } else if(!isRoot && uprv_strcmp(t1->fName, kRootLocaleName) != 0 && - t1->fParent == NULL && !r->fData.noFallback) { - if (!insertRootBundle(t1, status)) { - goto finishUnlock; - } - if(!hasRealData) { - r->fBogus = U_USING_DEFAULT_WARNING; - } + } else if(!isRoot && uprv_strcmp(t1->fName, kRootLocaleName) != 0 && + t1->fParent == NULL && !r->fData.noFallback) { + if (!insertRootBundle(t1, status)) { + goto finish; } - - // TODO: Does this ever loop? - while(r != NULL && !isRoot && t1->fParent != NULL) { - t1->fParent->fCountExisting++; - t1 = t1->fParent; + if(!hasRealData) { + r->fBogus = U_USING_DEFAULT_WARNING; } - } /* umtx_lock */ -finishUnlock: - umtx_unlock(resbMutex()); + } + // TODO: Does this ever loop? + while(r != NULL && !isRoot && t1->fParent != NULL) { + t1->fParent->fCountExisting++; + t1 = t1->fParent; + } + +finish: if(U_SUCCESS(*status)) { if(intStatus != U_ZERO_ERROR) { *status = intStatus; @@ -790,7 +782,7 @@ entryOpenDirect(const char* path, const char* localeID, UErrorCode* status) { return NULL; } - umtx_lock(resbMutex()); + Mutex lock(&resbMutex); // findFirstExisting() without fallbacks. UResourceDataEntry *r = init_entry(localeID, path, status); if(U_SUCCESS(*status)) { @@ -828,7 +820,6 @@ entryOpenDirect(const char* path, const char* localeID, UErrorCode* status) { t1 = t1->fParent; } } - umtx_unlock(resbMutex()); return r; } @@ -871,9 +862,8 @@ static void entryCloseInt(UResourceDataEntry *resB) { */ static void entryClose(UResourceDataEntry *resB) { - umtx_lock(resbMutex()); + Mutex lock(&resbMutex); entryCloseInt(resB); - umtx_unlock(resbMutex()); } /* @@ -1177,6 +1167,7 @@ static UResourceBundle *init_resb_result(const ResourceData *rdata, Resource r, if(mainRes != result) { ures_close(mainRes); } + ResourceTracer(resB).maybeTrace("getalias"); return result; } } else { @@ -1256,6 +1247,7 @@ static UResourceBundle *init_resb_result(const ResourceData *rdata, Resource r, /*resB->fParent = parent->fRes;*/ uprv_memmove(&resB->fResData, rdata, sizeof(ResourceData)); resB->fSize = res_countArrayItems(&(resB->fResData), resB->fRes); + ResourceTracer(resB).trace("get"); return resB; } @@ -1304,7 +1296,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getString(const UResourceBundle* resB, int32_ *status = U_ILLEGAL_ARGUMENT_ERROR; return NULL; } - s = res_getString(&(resB->fResData), resB->fRes, len); + s = res_getString({resB}, &(resB->fResData), resB->fRes, len); if (s == NULL) { *status = U_RESOURCE_TYPE_MISMATCH; } @@ -1393,7 +1385,7 @@ U_CAPI const uint8_t* U_EXPORT2 ures_getBinary(const UResourceBundle* resB, int3 *status = U_ILLEGAL_ARGUMENT_ERROR; return NULL; } - p = res_getBinary(&(resB->fResData), resB->fRes, len); + p = res_getBinary({resB}, &(resB->fResData), resB->fRes, len); if (p == NULL) { *status = U_RESOURCE_TYPE_MISMATCH; } @@ -1410,7 +1402,7 @@ U_CAPI const int32_t* U_EXPORT2 ures_getIntVector(const UResourceBundle* resB, i *status = U_ILLEGAL_ARGUMENT_ERROR; return NULL; } - p = res_getIntVector(&(resB->fResData), resB->fRes, len); + p = res_getIntVector({resB}, &(resB->fResData), resB->fRes, len); if (p == NULL) { *status = U_RESOURCE_TYPE_MISMATCH; } @@ -1431,7 +1423,7 @@ U_CAPI int32_t U_EXPORT2 ures_getInt(const UResourceBundle* resB, UErrorCode *st *status = U_RESOURCE_TYPE_MISMATCH; return 0xffffffff; } - return RES_GET_INT(resB->fRes); + return res_getInt({resB}, resB->fRes); } U_CAPI uint32_t U_EXPORT2 ures_getUInt(const UResourceBundle* resB, UErrorCode *status) { @@ -1446,7 +1438,7 @@ U_CAPI uint32_t U_EXPORT2 ures_getUInt(const UResourceBundle* resB, UErrorCode * *status = U_RESOURCE_TYPE_MISMATCH; return 0xffffffff; } - return RES_GET_UINT(resB->fRes); + return res_getUInt({resB}, resB->fRes); } U_CAPI UResType U_EXPORT2 ures_getType(const UResourceBundle *resB) { @@ -1457,10 +1449,18 @@ U_CAPI UResType U_EXPORT2 ures_getType(const UResourceBundle *resB) { } U_CAPI const char * U_EXPORT2 ures_getKey(const UResourceBundle *resB) { + // + // TODO: Trace ures_getKey? I guess not usually. + // + // We usually get the key string to decide whether we want the value, or to + // make a key-value pair. Tracing the value should suffice. + // + // However, I believe we have some data (e.g., in res_index) where the key + // strings are the data. Tracing the enclosing table should suffice. + // if(resB == NULL) { return NULL; } - return(resB->fKey); } @@ -1480,7 +1480,7 @@ static const UChar* ures_getStringWithAlias(const UResourceBundle *resB, Resourc ures_close(tempRes); return result; } else { - return res_getString(&(resB->fResData), r, len); + return res_getString({resB, sIndex}, &(resB->fResData), r, len); } } @@ -1516,7 +1516,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getNextString(UResourceBundle *resB, int32_t* switch(RES_GET_TYPE(resB->fRes)) { case URES_STRING: case URES_STRING_V2: - return res_getString(&(resB->fResData), resB->fRes, len); + return res_getString({resB}, &(resB->fResData), resB->fRes, len); case URES_TABLE: case URES_TABLE16: case URES_TABLE32: @@ -1661,7 +1661,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByIndex(const UResourceBundle *resB, switch(RES_GET_TYPE(resB->fRes)) { case URES_STRING: case URES_STRING_V2: - return res_getString(&(resB->fResData), resB->fRes, len); + return res_getString({resB}, &(resB->fResData), resB->fRes, len); case URES_TABLE: case URES_TABLE16: case URES_TABLE32: @@ -1953,10 +1953,10 @@ void getAllItemsWithFallback( // When the sink sees the no-fallback/no-inheritance marker, // then it would remove the parent's item. // We would deserialize parent values even though they are overridden in a child bundle. - value.pResData = &bundle->fResData; + value.setData(&bundle->fResData); UResourceDataEntry *parentEntry = bundle->fData->fParent; UBool hasParent = parentEntry != NULL && U_SUCCESS(parentEntry->fBogus); - value.setResource(bundle->fRes); + value.setResource(bundle->fRes, ResourceTracer(bundle)); sink.put(bundle->fKey, value, !hasParent, errorCode); if (hasParent) { // We might try to query the sink whether @@ -2001,31 +2001,60 @@ void getAllItemsWithFallback( } // namespace +// Requires a ResourceDataValue fill-in, so that we need not cast from a ResourceValue. +// Unfortunately, the caller must know which subclass to make and pass in. +// Alternatively, we could make it as polymorphic as in Java by +// returning a ResourceValue pointer (possibly wrapped into a LocalPointer) +// that the caller then owns. +// +// Also requires a UResourceBundle fill-in, so that the value's ResourceTracer +// can point to a non-local bundle. +// Without tracing, the child bundle could be a function-local object. +U_CAPI void U_EXPORT2 +ures_getValueWithFallback(const UResourceBundle *bundle, const char *path, + UResourceBundle *tempFillIn, + ResourceDataValue &value, UErrorCode &errorCode) { + if (U_FAILURE(errorCode)) { return; } + if (path == nullptr) { + errorCode = U_ILLEGAL_ARGUMENT_ERROR; + return; + } + const UResourceBundle *rb; + if (*path == 0) { + // empty path + rb = bundle; + } else { + rb = ures_getByKeyWithFallback(bundle, path, tempFillIn, &errorCode); + if (U_FAILURE(errorCode)) { + return; + } + } + value.setData(&rb->fResData); + value.setResource(rb->fRes, ResourceTracer(rb)); +} + U_CAPI void U_EXPORT2 ures_getAllItemsWithFallback(const UResourceBundle *bundle, const char *path, icu::ResourceSink &sink, UErrorCode &errorCode) { if (U_FAILURE(errorCode)) { return; } - if (path == NULL) { + if (path == nullptr) { errorCode = U_ILLEGAL_ARGUMENT_ERROR; return; } - UResourceBundle stackBundle; - ures_initStackObject(&stackBundle); + StackUResourceBundle stackBundle; const UResourceBundle *rb; if (*path == 0) { // empty path rb = bundle; } else { - rb = ures_getByKeyWithFallback(bundle, path, &stackBundle, &errorCode); + rb = ures_getByKeyWithFallback(bundle, path, stackBundle.getAlias(), &errorCode); if (U_FAILURE(errorCode)) { - ures_close(&stackBundle); return; } } // Get all table items with fallback. ResourceDataValue value; getAllItemsWithFallback(rb, value, sink, errorCode); - ures_close(&stackBundle); } U_CAPI UResourceBundle* U_EXPORT2 ures_getByKey(const UResourceBundle *resB, const char* inKey, UResourceBundle *fillIn, UErrorCode *status) { @@ -2108,7 +2137,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, c switch (RES_GET_TYPE(res)) { case URES_STRING: case URES_STRING_V2: - return res_getString(rd, res, len); + return res_getString({resB, key}, rd, res, len); case URES_ALIAS: { const UChar* result = 0; @@ -2130,7 +2159,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, c switch (RES_GET_TYPE(res)) { case URES_STRING: case URES_STRING_V2: - return res_getString(&(resB->fResData), res, len); + return res_getString({resB, key}, &(resB->fResData), res, len); case URES_ALIAS: { const UChar* result = 0; @@ -2151,6 +2180,7 @@ U_CAPI const UChar* U_EXPORT2 ures_getStringByKey(const UResourceBundle *resB, c /* here should go a first attempt to locate the key using index table */ const ResourceData *rd = getFallbackData(resB, &key, &realData, &res, status); if(U_SUCCESS(*status)) { + // TODO: Tracing return res_getString(rd, res, len); } else { *status = U_MISSING_RESOURCE_ERROR; @@ -2296,6 +2326,8 @@ ures_openWithType(UResourceBundle *r, const char* path, const char* localeID, r->fSize = res_countArrayItems(&(r->fResData), r->fRes); r->fIndex = -1; + ResourceTracer(r).traceOpen(); + return r; } diff --git a/deps/icu-small/source/common/uresdata.cpp b/deps/icu-small/source/common/uresdata.cpp index a0b8d3ba904ad6..1bb938be62c35b 100644 --- a/deps/icu-small/source/common/uresdata.cpp +++ b/deps/icu-small/source/common/uresdata.cpp @@ -33,6 +33,7 @@ #include "uinvchar.h" #include "uresdata.h" #include "uresimp.h" +#include "utracimp.h" /* * Resource access helpers @@ -307,7 +308,7 @@ res_getPublicType(Resource res) { } U_CAPI const UChar * U_EXPORT2 -res_getString(const ResourceData *pResData, Resource res, int32_t *pLength) { +res_getStringNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) { const UChar *p; uint32_t offset=RES_GET_OFFSET(res); int32_t length; @@ -402,7 +403,8 @@ int32_t getStringArray(const ResourceData *pResData, const icu::ResourceArray &a } for(int32_t i = 0; i < length; ++i) { int32_t sLength; - const UChar *s = res_getString(pResData, array.internalGetResource(pResData, i), &sLength); + // No tracing: handled by the caller + const UChar *s = res_getStringNoTrace(pResData, array.internalGetResource(pResData, i), &sLength); if(s == NULL) { errorCode = U_RESOURCE_TYPE_MISMATCH; return 0; @@ -434,7 +436,7 @@ res_getAlias(const ResourceData *pResData, Resource res, int32_t *pLength) { } U_CAPI const uint8_t * U_EXPORT2 -res_getBinary(const ResourceData *pResData, Resource res, int32_t *pLength) { +res_getBinaryNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) { const uint8_t *p; uint32_t offset=RES_GET_OFFSET(res); int32_t length; @@ -454,7 +456,7 @@ res_getBinary(const ResourceData *pResData, Resource res, int32_t *pLength) { U_CAPI const int32_t * U_EXPORT2 -res_getIntVector(const ResourceData *pResData, Resource res, int32_t *pLength) { +res_getIntVectorNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength) { const int32_t *p; uint32_t offset=RES_GET_OFFSET(res); int32_t length; @@ -507,7 +509,7 @@ const UChar *ResourceDataValue::getString(int32_t &length, UErrorCode &errorCode if(U_FAILURE(errorCode)) { return NULL; } - const UChar *s = res_getString(pResData, res, &length); + const UChar *s = res_getString(fTraceInfo, &getData(), res, &length); if(s == NULL) { errorCode = U_RESOURCE_TYPE_MISMATCH; } @@ -518,7 +520,7 @@ const UChar *ResourceDataValue::getAliasString(int32_t &length, UErrorCode &erro if(U_FAILURE(errorCode)) { return NULL; } - const UChar *s = res_getAlias(pResData, res, &length); + const UChar *s = res_getAlias(&getData(), res, &length); if(s == NULL) { errorCode = U_RESOURCE_TYPE_MISMATCH; } @@ -532,7 +534,7 @@ int32_t ResourceDataValue::getInt(UErrorCode &errorCode) const { if(RES_GET_TYPE(res) != URES_INT) { errorCode = U_RESOURCE_TYPE_MISMATCH; } - return RES_GET_INT(res); + return res_getInt(fTraceInfo, res); } uint32_t ResourceDataValue::getUInt(UErrorCode &errorCode) const { @@ -542,14 +544,14 @@ uint32_t ResourceDataValue::getUInt(UErrorCode &errorCode) const { if(RES_GET_TYPE(res) != URES_INT) { errorCode = U_RESOURCE_TYPE_MISMATCH; } - return RES_GET_UINT(res); + return res_getUInt(fTraceInfo, res); } const int32_t *ResourceDataValue::getIntVector(int32_t &length, UErrorCode &errorCode) const { if(U_FAILURE(errorCode)) { return NULL; } - const int32_t *iv = res_getIntVector(pResData, res, &length); + const int32_t *iv = res_getIntVector(fTraceInfo, &getData(), res, &length); if(iv == NULL) { errorCode = U_RESOURCE_TYPE_MISMATCH; } @@ -560,7 +562,7 @@ const uint8_t *ResourceDataValue::getBinary(int32_t &length, UErrorCode &errorCo if(U_FAILURE(errorCode)) { return NULL; } - const uint8_t *b = res_getBinary(pResData, res, &length); + const uint8_t *b = res_getBinary(fTraceInfo, &getData(), res, &length); if(b == NULL) { errorCode = U_RESOURCE_TYPE_MISMATCH; } @@ -578,19 +580,19 @@ ResourceArray ResourceDataValue::getArray(UErrorCode &errorCode) const { switch(RES_GET_TYPE(res)) { case URES_ARRAY: if (offset!=0) { // empty if offset==0 - items32 = (const Resource *)pResData->pRoot+offset; + items32 = (const Resource *)getData().pRoot+offset; length = *items32++; } break; case URES_ARRAY16: - items16 = pResData->p16BitUnits+offset; + items16 = getData().p16BitUnits+offset; length = *items16++; break; default: errorCode = U_RESOURCE_TYPE_MISMATCH; return ResourceArray(); } - return ResourceArray(items16, items32, length); + return ResourceArray(items16, items32, length, fTraceInfo); } ResourceTable ResourceDataValue::getTable(UErrorCode &errorCode) const { @@ -606,19 +608,19 @@ ResourceTable ResourceDataValue::getTable(UErrorCode &errorCode) const { switch(RES_GET_TYPE(res)) { case URES_TABLE: if (offset != 0) { // empty if offset==0 - keys16 = (const uint16_t *)(pResData->pRoot+offset); + keys16 = (const uint16_t *)(getData().pRoot+offset); length = *keys16++; items32 = (const Resource *)(keys16+length+(~length&1)); } break; case URES_TABLE16: - keys16 = pResData->p16BitUnits+offset; + keys16 = getData().p16BitUnits+offset; length = *keys16++; items16 = keys16 + length; break; case URES_TABLE32: if (offset != 0) { // empty if offset==0 - keys32 = pResData->pRoot+offset; + keys32 = getData().pRoot+offset; length = *keys32++; items32 = (const Resource *)keys32 + length; } @@ -627,22 +629,22 @@ ResourceTable ResourceDataValue::getTable(UErrorCode &errorCode) const { errorCode = U_RESOURCE_TYPE_MISMATCH; return ResourceTable(); } - return ResourceTable(keys16, keys32, items16, items32, length); + return ResourceTable(keys16, keys32, items16, items32, length, fTraceInfo); } UBool ResourceDataValue::isNoInheritanceMarker() const { - return ::isNoInheritanceMarker(pResData, res); + return ::isNoInheritanceMarker(&getData(), res); } int32_t ResourceDataValue::getStringArray(UnicodeString *dest, int32_t capacity, UErrorCode &errorCode) const { - return ::getStringArray(pResData, getArray(errorCode), dest, capacity, errorCode); + return ::getStringArray(&getData(), getArray(errorCode), dest, capacity, errorCode); } int32_t ResourceDataValue::getStringArrayOrStringAsArray(UnicodeString *dest, int32_t capacity, UErrorCode &errorCode) const { if(URES_IS_ARRAY(res)) { - return ::getStringArray(pResData, getArray(errorCode), dest, capacity, errorCode); + return ::getStringArray(&getData(), getArray(errorCode), dest, capacity, errorCode); } if(U_FAILURE(errorCode)) { return 0; @@ -656,7 +658,7 @@ int32_t ResourceDataValue::getStringArrayOrStringAsArray(UnicodeString *dest, in return 1; } int32_t sLength; - const UChar *s = res_getString(pResData, res, &sLength); + const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength); if(s != NULL) { dest[0].setTo(TRUE, s, sLength); return 1; @@ -671,7 +673,7 @@ UnicodeString ResourceDataValue::getStringOrFirstOfArray(UErrorCode &errorCode) return us; } int32_t sLength; - const UChar *s = res_getString(pResData, res, &sLength); + const UChar *s = res_getString(fTraceInfo, &getData(), res, &sLength); if(s != NULL) { us.setTo(TRUE, s, sLength); return us; @@ -681,7 +683,8 @@ UnicodeString ResourceDataValue::getStringOrFirstOfArray(UErrorCode &errorCode) return us; } if(array.getSize() > 0) { - s = res_getString(pResData, array.internalGetResource(pResData, 0), &sLength); + // Tracing is already performed above (unimportant for trace that this is an array) + s = res_getStringNoTrace(&getData(), array.internalGetResource(&getData(), 0), &sLength); if(s != NULL) { us.setTo(TRUE, s, sLength); return us; @@ -818,18 +821,45 @@ UBool icu::ResourceTable::getKeyAndValue(int32_t i, const char *&key, icu::ResourceValue &value) const { if(0 <= i && i < length) { icu::ResourceDataValue &rdValue = static_cast(value); - if (keys16 != NULL) { - key = RES_GET_KEY16(rdValue.pResData, keys16[i]); + if (keys16 != nullptr) { + key = RES_GET_KEY16(&rdValue.getData(), keys16[i]); } else { - key = RES_GET_KEY32(rdValue.pResData, keys32[i]); + key = RES_GET_KEY32(&rdValue.getData(), keys32[i]); } Resource res; - if (items16 != NULL) { - res = makeResourceFrom16(rdValue.pResData, items16[i]); + if (items16 != nullptr) { + res = makeResourceFrom16(&rdValue.getData(), items16[i]); } else { res = items32[i]; } - rdValue.setResource(res); + // Note: the ResourceTracer keeps a reference to the field of this + // ResourceTable. This is OK because the ResourceTable should remain + // alive for the duration that fields are being read from it + // (including nested fields). + rdValue.setResource(res, ResourceTracer(fTraceInfo, key)); + return TRUE; + } + return FALSE; +} + +UBool icu::ResourceTable::findValue(const char *key, ResourceValue &value) const { + icu::ResourceDataValue &rdValue = static_cast(value); + const char *realKey = nullptr; + int32_t i; + if (keys16 != nullptr) { + i = _res_findTableItem(&rdValue.getData(), keys16, length, key, &realKey); + } else { + i = _res_findTable32Item(&rdValue.getData(), keys32, length, key, &realKey); + } + if (i >= 0) { + Resource res; + if (items16 != nullptr) { + res = makeResourceFrom16(&rdValue.getData(), items16[i]); + } else { + res = items32[i]; + } + // Same note about lifetime as in getKeyAndValue(). + rdValue.setResource(res, ResourceTracer(fTraceInfo, key)); return TRUE; } return FALSE; @@ -875,7 +905,13 @@ uint32_t icu::ResourceArray::internalGetResource(const ResourceData *pResData, i UBool icu::ResourceArray::getValue(int32_t i, icu::ResourceValue &value) const { if(0 <= i && i < length) { icu::ResourceDataValue &rdValue = static_cast(value); - rdValue.setResource(internalGetResource(rdValue.pResData, i)); + // Note: the ResourceTracer keeps a reference to the field of this + // ResourceArray. This is OK because the ResourceArray should remain + // alive for the duration that fields are being read from it + // (including nested fields). + rdValue.setResource( + internalGetResource(&rdValue.getData(), i), + ResourceTracer(fTraceInfo, i)); return TRUE; } return FALSE; diff --git a/deps/icu-small/source/common/uresdata.h b/deps/icu-small/source/common/uresdata.h index 4e28ddccf63199..d1b67babf29049 100644 --- a/deps/icu-small/source/common/uresdata.h +++ b/deps/icu-small/source/common/uresdata.h @@ -69,14 +69,16 @@ typedef uint32_t Resource; #define RES_GET_OFFSET(res) ((res)&0x0fffffff) #define RES_GET_POINTER(pRoot, res) ((pRoot)+RES_GET_OFFSET(res)) -/* get signed and unsigned integer values directly from the Resource handle */ +/* get signed and unsigned integer values directly from the Resource handle + * NOTE: For proper logging, please use the res_getInt() constexpr + */ #if U_SIGNED_RIGHT_SHIFT_IS_ARITHMETIC -# define RES_GET_INT(res) (((int32_t)((res)<<4L))>>4L) +# define RES_GET_INT_NO_TRACE(res) (((int32_t)((res)<<4L))>>4L) #else -# define RES_GET_INT(res) (int32_t)(((res)&0x08000000) ? (res)|0xf0000000 : (res)&0x07ffffff) +# define RES_GET_INT_NO_TRACE(res) (int32_t)(((res)&0x08000000) ? (res)|0xf0000000 : (res)&0x07ffffff) #endif -#define RES_GET_UINT(res) ((res)&0x0fffffff) +#define RES_GET_UINT_NO_TRACE(res) ((res)&0x0fffffff) #define URES_IS_ARRAY(type) ((int32_t)(type)==URES_ARRAY || (int32_t)(type)==URES_ARRAY16) #define URES_IS_TABLE(type) ((int32_t)(type)==URES_TABLE || (int32_t)(type)==URES_TABLE16 || (int32_t)(type)==URES_TABLE32) @@ -423,22 +425,26 @@ res_unload(ResourceData *pResData); U_INTERNAL UResType U_EXPORT2 res_getPublicType(Resource res); +/////////////////////////////////////////////////////////////////////////// +// To enable tracing, use the inline versions of the res_get* functions. // +/////////////////////////////////////////////////////////////////////////// + /* * Return a pointer to a zero-terminated, const UChar* string * and set its length in *pLength. * Returns NULL if not found. */ U_INTERNAL const UChar * U_EXPORT2 -res_getString(const ResourceData *pResData, Resource res, int32_t *pLength); - -U_INTERNAL const UChar * U_EXPORT2 -res_getAlias(const ResourceData *pResData, Resource res, int32_t *pLength); +res_getStringNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength); U_INTERNAL const uint8_t * U_EXPORT2 -res_getBinary(const ResourceData *pResData, Resource res, int32_t *pLength); +res_getBinaryNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength); U_INTERNAL const int32_t * U_EXPORT2 -res_getIntVector(const ResourceData *pResData, Resource res, int32_t *pLength); +res_getIntVectorNoTrace(const ResourceData *pResData, Resource res, int32_t *pLength); + +U_INTERNAL const UChar * U_EXPORT2 +res_getAlias(const ResourceData *pResData, Resource res, int32_t *pLength); U_INTERNAL Resource U_EXPORT2 res_getResource(const ResourceData *pResData, const char *key); @@ -470,17 +476,55 @@ U_CFUNC Resource res_findResource(const ResourceData *pResData, Resource r, #ifdef __cplusplus #include "resource.h" +#include "restrace.h" U_NAMESPACE_BEGIN +inline const UChar* res_getString(const ResourceTracer& traceInfo, + const ResourceData *pResData, Resource res, int32_t *pLength) { + traceInfo.trace("string"); + return res_getStringNoTrace(pResData, res, pLength); +} + +inline const uint8_t* res_getBinary(const ResourceTracer& traceInfo, + const ResourceData *pResData, Resource res, int32_t *pLength) { + traceInfo.trace("binary"); + return res_getBinaryNoTrace(pResData, res, pLength); +} + +inline const int32_t* res_getIntVector(const ResourceTracer& traceInfo, + const ResourceData *pResData, Resource res, int32_t *pLength) { + traceInfo.trace("intvector"); + return res_getIntVectorNoTrace(pResData, res, pLength); +} + +inline int32_t res_getInt(const ResourceTracer& traceInfo, Resource res) { + traceInfo.trace("int"); + return RES_GET_INT_NO_TRACE(res); +} + +inline uint32_t res_getUInt(const ResourceTracer& traceInfo, Resource res) { + traceInfo.trace("uint"); + return RES_GET_UINT_NO_TRACE(res); +} + class ResourceDataValue : public ResourceValue { public: - ResourceDataValue() : pResData(NULL), res(static_cast(URES_NONE)) {} + ResourceDataValue() : + res(static_cast(URES_NONE)), + fTraceInfo() {} virtual ~ResourceDataValue(); - void setData(const ResourceData *data) { pResData = data; } - void setResource(Resource r) { res = r; } + void setData(const ResourceData *data) { + resData = *data; + } + void setResource(Resource r, ResourceTracer&& traceInfo) { + res = r; + fTraceInfo = traceInfo; + } + + const ResourceData &getData() const { return resData; } virtual UResType getType() const; virtual const UChar *getString(int32_t &length, UErrorCode &errorCode) const; virtual const UChar *getAliasString(int32_t &length, UErrorCode &errorCode) const; @@ -497,10 +541,12 @@ class ResourceDataValue : public ResourceValue { UErrorCode &errorCode) const; virtual UnicodeString getStringOrFirstOfArray(UErrorCode &errorCode) const; - const ResourceData *pResData; - private: + // TODO(ICU-20769): If UResourceBundle.fResData becomes a pointer, + // then remove this value field again and just store a pResData pointer. + ResourceData resData; Resource res; + ResourceTracer fTraceInfo; }; U_NAMESPACE_END diff --git a/deps/icu-small/source/common/uresimp.h b/deps/icu-small/source/common/uresimp.h index 16144012a5bc0d..2e477dfad3e98f 100644 --- a/deps/icu-small/source/common/uresimp.h +++ b/deps/icu-small/source/common/uresimp.h @@ -67,6 +67,9 @@ struct UResourceBundle { char *fVersion; UResourceDataEntry *fTopLevelData; /* for getting the valid locale */ char *fResPath; /* full path to the resource: "zh_TW/CollationElements/Sequence" */ + // TODO(ICU-20769): Try to change the by-value fResData into a pointer, + // with the struct in only one place for each bundle. + // Also replace class ResourceDataValue.resData with a pResData pointer again. ResourceData fResData; char fResBuf[RES_BUFSIZE]; int32_t fResPathLen; @@ -281,6 +284,11 @@ ures_getStringByKeyWithFallback(const UResourceBundle *resB, #ifdef __cplusplus +U_CAPI void U_EXPORT2 +ures_getValueWithFallback(const UResourceBundle *bundle, const char *path, + UResourceBundle *tempFillIn, + icu::ResourceDataValue &value, UErrorCode &errorCode); + U_CAPI void U_EXPORT2 ures_getAllItemsWithFallback(const UResourceBundle *bundle, const char *path, icu::ResourceSink &sink, UErrorCode &errorCode); diff --git a/deps/icu-small/source/common/usprep.cpp b/deps/icu-small/source/common/usprep.cpp index 9155ae077b3497..f1c075a391116f 100644 --- a/deps/icu-small/source/common/usprep.cpp +++ b/deps/icu-small/source/common/usprep.cpp @@ -45,13 +45,9 @@ U_CDECL_BEGIN Static cache for already opened StringPrep profiles */ static UHashtable *SHARED_DATA_HASHTABLE = NULL; -static icu::UInitOnce gSharedDataInitOnce; - -static UMutex *usprepMutex() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static icu::UInitOnce gSharedDataInitOnce = U_INITONCE_INITIALIZER; +static UMutex usprepMutex; /* format version of spp file */ //static uint8_t formatVersion[4]={ 0, 0, 0, 0 }; @@ -151,9 +147,9 @@ usprep_internal_flushCache(UBool noRefCount){ * if shared data hasn't even been lazy evaluated yet * return 0 */ - umtx_lock(usprepMutex()); + umtx_lock(&usprepMutex); if (SHARED_DATA_HASHTABLE == NULL) { - umtx_unlock(usprepMutex()); + umtx_unlock(&usprepMutex); return 0; } @@ -184,7 +180,7 @@ usprep_internal_flushCache(UBool noRefCount){ } } - umtx_unlock(usprepMutex()); + umtx_unlock(&usprepMutex); return deletedNum; } @@ -262,7 +258,7 @@ loadData(UStringPrepProfile* profile, } /* in the mutex block, set the data for this process */ - umtx_lock(usprepMutex()); + umtx_lock(&usprepMutex); if(profile->sprepData==NULL) { profile->sprepData=dataMemory; dataMemory=NULL; @@ -271,7 +267,7 @@ loadData(UStringPrepProfile* profile, } else { p=(const int32_t *)udata_getMemory(profile->sprepData); } - umtx_unlock(usprepMutex()); + umtx_unlock(&usprepMutex); /* initialize some variables */ profile->mappingData=(uint16_t *)((uint8_t *)(p+_SPREP_INDEX_TOP)+profile->indexes[_SPREP_INDEX_TRIE_SIZE]); @@ -328,12 +324,12 @@ usprep_getProfile(const char* path, stackKey.path = (char*) path; /* fetch the data from the cache */ - umtx_lock(usprepMutex()); + umtx_lock(&usprepMutex); profile = (UStringPrepProfile*) (uhash_get(SHARED_DATA_HASHTABLE,&stackKey)); if(profile != NULL) { profile->refCount++; } - umtx_unlock(usprepMutex()); + umtx_unlock(&usprepMutex); if(profile == NULL) { /* else load the data and put the data in the cache */ @@ -365,7 +361,7 @@ usprep_getProfile(const char* path, return NULL; } - umtx_lock(usprepMutex()); + umtx_lock(&usprepMutex); // If another thread already inserted the same key/value, refcount and cleanup our thread data profile = (UStringPrepProfile*) (uhash_get(SHARED_DATA_HASHTABLE,&stackKey)); if(profile != NULL) { @@ -386,7 +382,7 @@ usprep_getProfile(const char* path, profile->refCount = 1; uhash_put(SHARED_DATA_HASHTABLE, key.orphan(), profile, status); } - umtx_unlock(usprepMutex()); + umtx_unlock(&usprepMutex); } return profile; @@ -425,12 +421,12 @@ usprep_close(UStringPrepProfile* profile){ return; } - umtx_lock(usprepMutex()); + umtx_lock(&usprepMutex); /* decrement the ref count*/ if(profile->refCount > 0){ profile->refCount--; } - umtx_unlock(usprepMutex()); + umtx_unlock(&usprepMutex); } diff --git a/deps/icu-small/source/common/ustr_titlecase_brkiter.cpp b/deps/icu-small/source/common/ustr_titlecase_brkiter.cpp index 056b40eb4175f6..457905eb60da00 100644 --- a/deps/icu-small/source/common/ustr_titlecase_brkiter.cpp +++ b/deps/icu-small/source/common/ustr_titlecase_brkiter.cpp @@ -45,7 +45,7 @@ class WholeStringBreakIterator : public BreakIterator { WholeStringBreakIterator() : BreakIterator(), length(0) {} ~WholeStringBreakIterator() U_OVERRIDE; UBool operator==(const BreakIterator&) const U_OVERRIDE; - BreakIterator *clone() const U_OVERRIDE; + WholeStringBreakIterator *clone() const U_OVERRIDE; static UClassID U_EXPORT2 getStaticClassID(); UClassID getDynamicClassID() const U_OVERRIDE; CharacterIterator &getText() const U_OVERRIDE; @@ -62,9 +62,9 @@ class WholeStringBreakIterator : public BreakIterator { int32_t preceding(int32_t offset) U_OVERRIDE; UBool isBoundary(int32_t offset) U_OVERRIDE; int32_t next(int32_t n) U_OVERRIDE; - BreakIterator *createBufferClone(void *stackBuffer, int32_t &BufferSize, - UErrorCode &errorCode) U_OVERRIDE; - BreakIterator &refreshInputText(UText *input, UErrorCode &errorCode) U_OVERRIDE; + WholeStringBreakIterator *createBufferClone(void *stackBuffer, int32_t &BufferSize, + UErrorCode &errorCode) U_OVERRIDE; + WholeStringBreakIterator &refreshInputText(UText *input, UErrorCode &errorCode) U_OVERRIDE; private: int32_t length; @@ -74,7 +74,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(WholeStringBreakIterator) WholeStringBreakIterator::~WholeStringBreakIterator() {} UBool WholeStringBreakIterator::operator==(const BreakIterator&) const { return FALSE; } -BreakIterator *WholeStringBreakIterator::clone() const { return nullptr; } +WholeStringBreakIterator *WholeStringBreakIterator::clone() const { return nullptr; } CharacterIterator &WholeStringBreakIterator::getText() const { UPRV_UNREACHABLE; // really should not be called @@ -113,14 +113,14 @@ int32_t WholeStringBreakIterator::preceding(int32_t /*offset*/) { return 0; } UBool WholeStringBreakIterator::isBoundary(int32_t /*offset*/) { return FALSE; } int32_t WholeStringBreakIterator::next(int32_t /*n*/) { return length; } -BreakIterator *WholeStringBreakIterator::createBufferClone( +WholeStringBreakIterator *WholeStringBreakIterator::createBufferClone( void * /*stackBuffer*/, int32_t & /*BufferSize*/, UErrorCode &errorCode) { if (U_SUCCESS(errorCode)) { errorCode = U_UNSUPPORTED_ERROR; } return nullptr; } -BreakIterator &WholeStringBreakIterator::refreshInputText( +WholeStringBreakIterator &WholeStringBreakIterator::refreshInputText( UText * /*input*/, UErrorCode &errorCode) { if (U_SUCCESS(errorCode)) { errorCode = U_UNSUPPORTED_ERROR; diff --git a/deps/icu-small/source/common/ustring.cpp b/deps/icu-small/source/common/ustring.cpp index a1a51f4b1e1734..6886c145d9a216 100644 --- a/deps/icu-small/source/common/ustring.cpp +++ b/deps/icu-small/source/common/ustring.cpp @@ -1428,7 +1428,7 @@ u_unescape(const char *src, UChar *dest, int32_t destCapacity) { * NUL-terminate a string no matter what its type. * Set warning and error codes accordingly. */ -#define __TERMINATE_STRING(dest, destCapacity, length, pErrorCode) \ +#define __TERMINATE_STRING(dest, destCapacity, length, pErrorCode) UPRV_BLOCK_MACRO_BEGIN { \ if(pErrorCode!=NULL && U_SUCCESS(*pErrorCode)) { \ /* not a public function, so no complete argument checking */ \ \ @@ -1448,7 +1448,8 @@ u_unescape(const char *src, UChar *dest, int32_t destCapacity) { /* even the string itself did not fit - set an error code */ \ *pErrorCode=U_BUFFER_OVERFLOW_ERROR; \ } \ - } + } \ +} UPRV_BLOCK_MACRO_END U_CAPI int32_t U_EXPORT2 u_terminateUChars(UChar *dest, int32_t destCapacity, int32_t length, UErrorCode *pErrorCode) { @@ -1488,7 +1489,7 @@ u_terminateWChars(wchar_t *dest, int32_t destCapacity, int32_t length, UErrorCod the output range. [LIU] */ -#define STRING_HASH(TYPE, STR, STRLEN, DEREF) \ +#define STRING_HASH(TYPE, STR, STRLEN, DEREF) UPRV_BLOCK_MACRO_BEGIN { \ uint32_t hash = 0; \ const TYPE *p = (const TYPE*) STR; \ if (p != NULL) { \ @@ -1500,7 +1501,8 @@ u_terminateWChars(wchar_t *dest, int32_t destCapacity, int32_t length, UErrorCod p += inc; \ } \ } \ - return static_cast(hash) + return static_cast(hash); \ +} UPRV_BLOCK_MACRO_END /* Used by UnicodeString to compute its hashcode - Not public API. */ U_CAPI int32_t U_EXPORT2 diff --git a/deps/icu-small/source/common/utext.cpp b/deps/icu-small/source/common/utext.cpp index 5e3a005626e6b8..324341f1ba65dc 100644 --- a/deps/icu-small/source/common/utext.cpp +++ b/deps/icu-small/source/common/utext.cpp @@ -567,7 +567,7 @@ enum { struct ExtendedUText { UText ut; - UAlignedMemory extension; + max_align_t extension; }; static const UText emptyText = UTEXT_INITIALIZER; @@ -582,7 +582,7 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) { // We need to heap-allocate storage for the new UText int32_t spaceRequired = sizeof(UText); if (extraSpace > 0) { - spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(UAlignedMemory); + spaceRequired = sizeof(ExtendedUText) + extraSpace - sizeof(max_align_t); } ut = (UText *)uprv_malloc(spaceRequired); if (ut == NULL) { diff --git a/deps/icu-small/source/common/util.cpp b/deps/icu-small/source/common/util.cpp index 838a201a73d803..56dd4f1bfa76a0 100644 --- a/deps/icu-small/source/common/util.cpp +++ b/deps/icu-small/source/common/util.cpp @@ -276,6 +276,16 @@ int32_t ICU_Utility::parsePattern(const UnicodeString& pat, return -1; // text ended before end of pat } +int32_t ICU_Utility::parseAsciiInteger(const UnicodeString& str, int32_t& pos) { + int32_t result = 0; + UChar c; + while (pos < str.length() && (c = str.charAt(pos)) >= u'0' && c <= u'9') { + result = result * 10 + (c - u'0'); + pos++; + } + return result; +} + /** * Append a character to a rule that is being built up. To flush * the quoteBuf to rule, make one final call with isLiteral == TRUE. diff --git a/deps/icu-small/source/common/util.h b/deps/icu-small/source/common/util.h index 92cdc9ef69a58a..a2be25056e9acb 100644 --- a/deps/icu-small/source/common/util.h +++ b/deps/icu-small/source/common/util.h @@ -179,12 +179,21 @@ class U_COMMON_API ICU_Utility /* not : public UObject because all methods are s * Parse an integer at pos, either of the form \d+ or of the form * 0x[0-9A-Fa-f]+ or 0[0-7]+, that is, in standard decimal, hex, * or octal format. - * @param pos INPUT-OUTPUT parameter. On input, the first - * character to parse. On output, the character after the last - * parsed character. + * @param pos INPUT-OUTPUT parameter. On input, the index of the first + * character to parse. On output, the index of the character after the + * last parsed character. */ static int32_t parseInteger(const UnicodeString& rule, int32_t& pos, int32_t limit); + /** + * Parse an integer at pos using only ASCII digits. + * Base 10 only. + * @param pos INPUT-OUTPUT parameter. On input, the index of the first + * character to parse. On output, the index of the character after the + * last parsed character. + */ + static int32_t parseAsciiInteger(const UnicodeString& str, int32_t& pos); + /** * Parse a Unicode identifier from the given string at the given * position. Return the identifier, or an empty string if there diff --git a/deps/icu-small/source/common/utrace.cpp b/deps/icu-small/source/common/utrace.cpp index 01bdb38e907518..04488d06a0e233 100644 --- a/deps/icu-small/source/common/utrace.cpp +++ b/deps/icu-small/source/common/utrace.cpp @@ -477,6 +477,16 @@ trCollNames[] = { }; +static const char* const +trResDataNames[] = { + "resc", + "bundle-open", + "file-open", + "res-open", + NULL +}; + + U_CAPI const char * U_EXPORT2 utrace_functionName(int32_t fnNumber) { if(UTRACE_FUNCTION_START <= fnNumber && fnNumber < UTRACE_FUNCTION_LIMIT) { @@ -485,6 +495,8 @@ utrace_functionName(int32_t fnNumber) { return trConvNames[fnNumber - UTRACE_CONVERSION_START]; } else if(UTRACE_COLLATION_START <= fnNumber && fnNumber < UTRACE_COLLATION_LIMIT){ return trCollNames[fnNumber - UTRACE_COLLATION_START]; + } else if(UTRACE_UDATA_START <= fnNumber && fnNumber < UTRACE_RES_DATA_LIMIT){ + return trResDataNames[fnNumber - UTRACE_UDATA_START]; } else { return "[BOGUS Trace Function Number]"; } diff --git a/deps/icu-small/source/common/utracimp.h b/deps/icu-small/source/common/utracimp.h index c2819830e1ba52..84e7031da8bc17 100644 --- a/deps/icu-small/source/common/utracimp.h +++ b/deps/icu-small/source/common/utracimp.h @@ -144,10 +144,12 @@ U_CDECL_END */ #define UTRACE_ENTRY(fnNumber) \ int32_t utraceFnNumber=(fnNumber); \ +UPRV_BLOCK_MACRO_BEGIN { \ if(utrace_getLevel()>=UTRACE_INFO) { \ utrace_entry(fnNumber); \ utraceFnNumber |= UTRACE_TRACED_ENTRY; \ - } + } \ +} UPRV_BLOCK_MACRO_END /** @@ -162,10 +164,12 @@ U_CDECL_END */ #define UTRACE_ENTRY_OC(fnNumber) \ int32_t utraceFnNumber=(fnNumber); \ +UPRV_BLOCK_MACRO_BEGIN { \ if(utrace_getLevel()>=UTRACE_OPEN_CLOSE) { \ utrace_entry(fnNumber); \ utraceFnNumber |= UTRACE_TRACED_ENTRY; \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement for each exit point of a function that has a UTRACE_ENTRY() @@ -179,10 +183,11 @@ U_CDECL_END * * @internal */ -#define UTRACE_EXIT() \ - {if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ +#define UTRACE_EXIT() UPRV_BLOCK_MACRO_BEGIN { \ + if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ utrace_exit(utraceFnNumber & ~UTRACE_TRACED_ENTRY, UTRACE_EXITV_NONE); \ - }} + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement for each exit point of a function that has a UTRACE_ENTRY() @@ -192,25 +197,29 @@ U_CDECL_END * * @internal */ -#define UTRACE_EXIT_VALUE(val) \ - {if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ +#define UTRACE_EXIT_VALUE(val) UPRV_BLOCK_MACRO_BEGIN { \ + if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ utrace_exit(utraceFnNumber & ~UTRACE_TRACED_ENTRY, UTRACE_EXITV_I32, val); \ - }} + } \ +} UPRV_BLOCK_MACRO_END -#define UTRACE_EXIT_STATUS(status) \ - {if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ +#define UTRACE_EXIT_STATUS(status) UPRV_BLOCK_MACRO_BEGIN { \ + if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ utrace_exit(utraceFnNumber & ~UTRACE_TRACED_ENTRY, UTRACE_EXITV_STATUS, status); \ - }} + } \ +} UPRV_BLOCK_MACRO_END -#define UTRACE_EXIT_VALUE_STATUS(val, status) \ - {if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ +#define UTRACE_EXIT_VALUE_STATUS(val, status) UPRV_BLOCK_MACRO_BEGIN { \ + if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ utrace_exit(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (UTRACE_EXITV_I32 | UTRACE_EXITV_STATUS), val, status); \ - }} + } \ +} UPRV_BLOCK_MACRO_END -#define UTRACE_EXIT_PTR_STATUS(ptr, status) \ - {if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ +#define UTRACE_EXIT_PTR_STATUS(ptr, status) UPRV_BLOCK_MACRO_BEGIN { \ + if(utraceFnNumber & UTRACE_TRACED_ENTRY) { \ utrace_exit(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (UTRACE_EXITV_PTR | UTRACE_EXITV_STATUS), ptr, status); \ - }} + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -220,10 +229,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA0(level, fmt) \ +#define UTRACE_DATA0(level, fmt) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -233,10 +243,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA1(level, fmt, a) \ +#define UTRACE_DATA1(level, fmt, a) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY , (level), (fmt), (a)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -246,10 +257,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA2(level, fmt, a, b) \ +#define UTRACE_DATA2(level, fmt, a, b) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY , (level), (fmt), (a), (b)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -259,10 +271,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA3(level, fmt, a, b, c) \ +#define UTRACE_DATA3(level, fmt, a, b, c) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt), (a), (b), (c)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -272,10 +285,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA4(level, fmt, a, b, c, d) \ +#define UTRACE_DATA4(level, fmt, a, b, c, d) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt), (a), (b), (c), (d)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -285,10 +299,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA5(level, fmt, a, b, c, d, e) \ +#define UTRACE_DATA5(level, fmt, a, b, c, d, e) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt), (a), (b), (c), (d), (e)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -298,10 +313,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA6(level, fmt, a, b, c, d, e, f) \ +#define UTRACE_DATA6(level, fmt, a, b, c, d, e, f) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt), (a), (b), (c), (d), (e), (f)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -311,10 +327,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA7(level, fmt, a, b, c, d, e, f, g) \ +#define UTRACE_DATA7(level, fmt, a, b, c, d, e, f, g) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt), (a), (b), (c), (d), (e), (f), (g)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -324,10 +341,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA8(level, fmt, a, b, c, d, e, f, g, h) \ +#define UTRACE_DATA8(level, fmt, a, b, c, d, e, f, g, h) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt), (a), (b), (c), (d), (e), (f), (g), (h)); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** * Trace statement used inside functions that have a UTRACE_ENTRY() statement. @@ -337,10 +355,11 @@ U_CDECL_END * Calls utrace_data() if the level is high enough. * @internal */ -#define UTRACE_DATA9(level, fmt, a, b, c, d, e, f, g, h, i) \ +#define UTRACE_DATA9(level, fmt, a, b, c, d, e, f, g, h, i) UPRV_BLOCK_MACRO_BEGIN { \ if(UTRACE_LEVEL(level)) { \ utrace_data(utraceFnNumber & ~UTRACE_TRACED_ENTRY, (level), (fmt), (a), (b), (c), (d), (e), (f), (g), (h), (i)); \ - } + } \ +} UPRV_BLOCK_MACRO_END #else diff --git a/deps/icu-small/source/common/utrie.h b/deps/icu-small/source/common/utrie.h index 3e2197eda6c261..532ba778eb6ed1 100644 --- a/deps/icu-small/source/common/utrie.h +++ b/deps/icu-small/source/common/utrie.h @@ -182,7 +182,7 @@ typedef struct UTrie UTrie; ] /** Internal trie getter from a pair of surrogates */ -#define _UTRIE_GET_FROM_PAIR(trie, data, c, c2, result, resultType) { \ +#define _UTRIE_GET_FROM_PAIR(trie, data, c, c2, result, resultType) UPRV_BLOCK_MACRO_BEGIN { \ int32_t __offset; \ \ /* get data for lead surrogate */ \ @@ -195,18 +195,18 @@ typedef struct UTrie UTrie; } else { \ (result)=(resultType)((trie)->initialValue); \ } \ -} +} UPRV_BLOCK_MACRO_END /** Internal trie getter from a BMP code point, treating a lead surrogate as a normal code point */ #define _UTRIE_GET_FROM_BMP(trie, data, c16) \ - _UTRIE_GET_RAW(trie, data, 0xd800<=(c16) && (c16)<=0xdbff ? UTRIE_LEAD_INDEX_DISP : 0, c16); + _UTRIE_GET_RAW(trie, data, 0xd800<=(c16) && (c16)<=0xdbff ? UTRIE_LEAD_INDEX_DISP : 0, c16) /** * Internal trie getter from a code point. * Could be faster(?) but longer with * if((c32)<=0xd7ff) { (result)=_UTRIE_GET_RAW(trie, data, 0, c32); } */ -#define _UTRIE_GET(trie, data, c32, result, resultType) \ +#define _UTRIE_GET(trie, data, c32, result, resultType) UPRV_BLOCK_MACRO_BEGIN { \ if((uint32_t)(c32)<=0xffff) { \ /* BMP code points */ \ (result)=_UTRIE_GET_FROM_BMP(trie, data, c32); \ @@ -217,10 +217,11 @@ typedef struct UTrie UTrie; } else { \ /* out of range */ \ (result)=(resultType)((trie)->initialValue); \ - } + } \ +} UPRV_BLOCK_MACRO_END /** Internal next-post-increment: get the next code point (c, c2) and its data */ -#define _UTRIE_NEXT(trie, data, src, limit, c, c2, result, resultType) { \ +#define _UTRIE_NEXT(trie, data, src, limit, c, c2, result, resultType) UPRV_BLOCK_MACRO_BEGIN { \ (c)=*(src)++; \ if(!U16_IS_LEAD(c)) { \ (c2)=0; \ @@ -233,10 +234,10 @@ typedef struct UTrie UTrie; (c2)=0; \ (result)=_UTRIE_GET_RAW((trie), data, UTRIE_LEAD_INDEX_DISP, (c)); \ } \ -} +} UPRV_BLOCK_MACRO_END /** Internal previous: get the previous code point (c, c2) and its data */ -#define _UTRIE_PREVIOUS(trie, data, start, src, c, c2, result, resultType) { \ +#define _UTRIE_PREVIOUS(trie, data, start, src, c, c2, result, resultType) UPRV_BLOCK_MACRO_BEGIN { \ (c)=*--(src); \ if(!U16_IS_SURROGATE(c)) { \ (c2)=0; \ @@ -257,7 +258,7 @@ typedef struct UTrie UTrie; (c2)=0; \ (result)=_UTRIE_GET_RAW((trie), data, UTRIE_LEAD_INDEX_DISP, (c)); \ } \ -} +} UPRV_BLOCK_MACRO_END /* Public UTrie API ---------------------------------------------------------*/ diff --git a/deps/icu-small/source/common/utrie2.h b/deps/icu-small/source/common/utrie2.h index 75028ee23ac1e9..671f44e16a65cc 100644 --- a/deps/icu-small/source/common/utrie2.h +++ b/deps/icu-small/source/common/utrie2.h @@ -871,7 +871,7 @@ utrie2_internalU8PrevIndex(const UTrie2 *trie, UChar32 c, (trie)->data[_UTRIE2_INDEX_FROM_CP(trie, asciiOffset, c)] /** Internal next-post-increment: get the next code point (c) and its data. */ -#define _UTRIE2_U16_NEXT(trie, data, src, limit, c, result) { \ +#define _UTRIE2_U16_NEXT(trie, data, src, limit, c, result) UPRV_BLOCK_MACRO_BEGIN { \ { \ uint16_t __c2; \ (c)=*(src)++; \ @@ -885,10 +885,10 @@ utrie2_internalU8PrevIndex(const UTrie2 *trie, UChar32 c, (result)=_UTRIE2_GET_FROM_SUPP((trie), data, (c)); \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** Internal pre-decrement-previous: get the previous code point (c) and its data */ -#define _UTRIE2_U16_PREV(trie, data, start, src, c, result) { \ +#define _UTRIE2_U16_PREV(trie, data, start, src, c, result) UPRV_BLOCK_MACRO_BEGIN { \ { \ uint16_t __c2; \ (c)=*--(src); \ @@ -900,10 +900,10 @@ utrie2_internalU8PrevIndex(const UTrie2 *trie, UChar32 c, (result)=_UTRIE2_GET_FROM_SUPP((trie), data, (c)); \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** Internal UTF-8 next-post-increment: get the next code point's data. */ -#define _UTRIE2_U8_NEXT(trie, ascii, data, src, limit, result) { \ +#define _UTRIE2_U8_NEXT(trie, ascii, data, src, limit, result) UPRV_BLOCK_MACRO_BEGIN { \ uint8_t __lead=(uint8_t)*(src)++; \ if(U8_IS_SINGLE(__lead)) { \ (result)=(trie)->ascii[__lead]; \ @@ -935,10 +935,10 @@ utrie2_internalU8PrevIndex(const UTrie2 *trie, UChar32 c, (result)=(trie)->data[__index>>3]; \ } \ } \ -} +} UPRV_BLOCK_MACRO_END /** Internal UTF-8 pre-decrement-previous: get the previous code point's data. */ -#define _UTRIE2_U8_PREV(trie, ascii, data, start, src, result) { \ +#define _UTRIE2_U8_PREV(trie, ascii, data, start, src, result) UPRV_BLOCK_MACRO_BEGIN { \ uint8_t __b=(uint8_t)*--(src); \ if(U8_IS_SINGLE(__b)) { \ (result)=(trie)->ascii[__b]; \ @@ -948,7 +948,7 @@ utrie2_internalU8PrevIndex(const UTrie2 *trie, UChar32 c, (src)-=__index&7; \ (result)=(trie)->data[__index>>3]; \ } \ -} +} UPRV_BLOCK_MACRO_END U_CDECL_END diff --git a/deps/icu-small/source/data/in/icudt64l.dat b/deps/icu-small/source/data/in/icudt65l.dat similarity index 68% rename from deps/icu-small/source/data/in/icudt64l.dat rename to deps/icu-small/source/data/in/icudt65l.dat index de81e4c01361aa..5ac4e12176e634 100644 Binary files a/deps/icu-small/source/data/in/icudt64l.dat and b/deps/icu-small/source/data/in/icudt65l.dat differ diff --git a/deps/icu-small/source/i18n/alphaindex.cpp b/deps/icu-small/source/i18n/alphaindex.cpp index 99f70114cbdb15..532e3373835e7c 100644 --- a/deps/icu-small/source/i18n/alphaindex.cpp +++ b/deps/icu-small/source/i18n/alphaindex.cpp @@ -260,8 +260,7 @@ AlphabeticIndex::ImmutableIndex *AlphabeticIndex::buildImmutableIndex(UErrorCode // but that would be worth it only if this method is called multiple times, // or called after using the old-style bucket iterator API. LocalPointer immutableBucketList(createBucketList(errorCode)); - LocalPointer coll( - static_cast(collatorPrimaryOnly_->clone())); + LocalPointer coll(collatorPrimaryOnly_->clone()); if (immutableBucketList.isNull() || coll.isNull()) { errorCode = U_MEMORY_ALLOCATION_ERROR; return NULL; @@ -907,7 +906,7 @@ void AlphabeticIndex::init(const Locale *locale, UErrorCode &status) { return; } } - collatorPrimaryOnly_ = static_cast(collator_->clone()); + collatorPrimaryOnly_ = collator_->clone(); if (collatorPrimaryOnly_ == NULL) { status = U_MEMORY_ALLOCATION_ERROR; return; @@ -958,7 +957,7 @@ collatorComparator(const void *context, const void *left, const void *right) { } if (leftString == NULL) { return 1; - }; + } if (rightString == NULL) { return -1; } diff --git a/deps/icu-small/source/i18n/anytrans.cpp b/deps/icu-small/source/i18n/anytrans.cpp index 6e382b824b95b7..167b0185285371 100644 --- a/deps/icu-small/source/i18n/anytrans.cpp +++ b/deps/icu-small/source/i18n/anytrans.cpp @@ -226,7 +226,7 @@ AnyTransliterator::AnyTransliterator(const AnyTransliterator& o) : /** * Transliterator API. */ -Transliterator* AnyTransliterator::clone() const { +AnyTransliterator* AnyTransliterator::clone() const { return new AnyTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/anytrans.h b/deps/icu-small/source/i18n/anytrans.h index 703d42b6d4be55..627dee3c814e68 100644 --- a/deps/icu-small/source/i18n/anytrans.h +++ b/deps/icu-small/source/i18n/anytrans.h @@ -66,7 +66,7 @@ class AnyTransliterator : public Transliterator { /** * Transliterator API. */ - virtual Transliterator* clone() const; + virtual AnyTransliterator* clone() const; /** * Implements {@link Transliterator#handleTransliterate}. diff --git a/deps/icu-small/source/i18n/astro.cpp b/deps/icu-small/source/i18n/astro.cpp index 0d521b037dd772..d28e516472e1b9 100644 --- a/deps/icu-small/source/i18n/astro.cpp +++ b/deps/icu-small/source/i18n/astro.cpp @@ -65,10 +65,7 @@ static inline UBool isINVALID(double d) { return(uprv_isNaN(d)); } -static icu::UMutex *ccLock() { - static icu::UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static icu::UMutex ccLock; U_CDECL_BEGIN static UBool calendar_astro_cleanup(void) { @@ -1552,12 +1549,12 @@ int32_t CalendarCache::get(CalendarCache** cache, int32_t key, UErrorCode &statu if(U_FAILURE(status)) { return 0; } - umtx_lock(ccLock()); + umtx_lock(&ccLock); if(*cache == NULL) { createCache(cache, status); if(U_FAILURE(status)) { - umtx_unlock(ccLock()); + umtx_unlock(&ccLock); return 0; } } @@ -1565,7 +1562,7 @@ int32_t CalendarCache::get(CalendarCache** cache, int32_t key, UErrorCode &statu res = uhash_igeti((*cache)->fTable, key); U_DEBUG_ASTRO_MSG(("%p: GET: [%d] == %d\n", (*cache)->fTable, key, res)); - umtx_unlock(ccLock()); + umtx_unlock(&ccLock); return res; } @@ -1573,12 +1570,12 @@ void CalendarCache::put(CalendarCache** cache, int32_t key, int32_t value, UErro if(U_FAILURE(status)) { return; } - umtx_lock(ccLock()); + umtx_lock(&ccLock); if(*cache == NULL) { createCache(cache, status); if(U_FAILURE(status)) { - umtx_unlock(ccLock()); + umtx_unlock(&ccLock); return; } } @@ -1586,7 +1583,7 @@ void CalendarCache::put(CalendarCache** cache, int32_t key, int32_t value, UErro uhash_iputi((*cache)->fTable, key, value, &status); U_DEBUG_ASTRO_MSG(("%p: PUT: [%d] := %d\n", (*cache)->fTable, key, value)); - umtx_unlock(ccLock()); + umtx_unlock(&ccLock); } CalendarCache::CalendarCache(int32_t size, UErrorCode &status) { diff --git a/deps/icu-small/source/i18n/bocsu.h b/deps/icu-small/source/i18n/bocsu.h index 6b8ed5197097fd..631e29aa768b9d 100644 --- a/deps/icu-small/source/i18n/bocsu.h +++ b/deps/icu-small/source/i18n/bocsu.h @@ -144,14 +144,14 @@ U_NAMESPACE_END * yields negative modulo results and quotients that are one more than * what we need here. */ -#define NEGDIVMOD(n, d, m) { \ +#define NEGDIVMOD(n, d, m) UPRV_BLOCK_MACRO_BEGIN { \ (m)=(n)%(d); \ (n)/=(d); \ if((m)<0) { \ --(n); \ (m)+=(d); \ } \ -} +} UPRV_BLOCK_MACRO_END U_CFUNC UChar32 u_writeIdenticalLevelRun(UChar32 prev, const UChar *s, int32_t length, icu::ByteSink &sink); diff --git a/deps/icu-small/source/i18n/brktrans.cpp b/deps/icu-small/source/i18n/brktrans.cpp index ac9e2afb7e4679..46b0e345dae97d 100644 --- a/deps/icu-small/source/i18n/brktrans.cpp +++ b/deps/icu-small/source/i18n/brktrans.cpp @@ -64,7 +64,7 @@ BreakTransliterator::BreakTransliterator(const BreakTransliterator& o) : /** * Transliterator API. */ -Transliterator* BreakTransliterator::clone(void) const { +BreakTransliterator* BreakTransliterator::clone() const { return new BreakTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/brktrans.h b/deps/icu-small/source/i18n/brktrans.h index fcc8bdd002ca76..caa1e16ee6e62e 100644 --- a/deps/icu-small/source/i18n/brktrans.h +++ b/deps/icu-small/source/i18n/brktrans.h @@ -54,7 +54,7 @@ class BreakTransliterator : public Transliterator { * Transliterator API. * @return A copy of the object. */ - virtual Transliterator* clone(void) const; + virtual BreakTransliterator* clone() const; virtual const UnicodeString &getInsertion() const; diff --git a/deps/icu-small/source/i18n/buddhcal.cpp b/deps/icu-small/source/i18n/buddhcal.cpp index b6ccbc4749955a..bddfd1768a0aba 100644 --- a/deps/icu-small/source/i18n/buddhcal.cpp +++ b/deps/icu-small/source/i18n/buddhcal.cpp @@ -53,7 +53,7 @@ BuddhistCalendar& BuddhistCalendar::operator= ( const BuddhistCalendar& right) return *this; } -Calendar* BuddhistCalendar::clone(void) const +BuddhistCalendar* BuddhistCalendar::clone() const { return new BuddhistCalendar(*this); } @@ -133,7 +133,7 @@ void BuddhistCalendar::timeToFields(UDate theTime, UBool quick, UErrorCode& stat */ static UDate gSystemDefaultCenturyStart = DBL_MIN; static int32_t gSystemDefaultCenturyStartYear = -1; -static icu::UInitOnce gBCInitOnce; +static icu::UInitOnce gBCInitOnce = U_INITONCE_INITIALIZER; UBool BuddhistCalendar::haveDefaultCentury() const diff --git a/deps/icu-small/source/i18n/buddhcal.h b/deps/icu-small/source/i18n/buddhcal.h index 89e3f3dec36625..c3ffa6a41d3565 100644 --- a/deps/icu-small/source/i18n/buddhcal.h +++ b/deps/icu-small/source/i18n/buddhcal.h @@ -94,7 +94,7 @@ class BuddhistCalendar : public GregorianCalendar { * @return return a polymorphic copy of this calendar. * @internal */ - virtual Calendar* clone(void) const; + virtual BuddhistCalendar* clone() const; public: /** diff --git a/deps/icu-small/source/i18n/calendar.cpp b/deps/icu-small/source/i18n/calendar.cpp index 85a387ef49ed16..94625465614547 100644 --- a/deps/icu-small/source/i18n/calendar.cpp +++ b/deps/icu-small/source/i18n/calendar.cpp @@ -268,6 +268,8 @@ static ECalType getCalendarTypeForLocale(const char *locid) { // canonicalize, so grandfathered variant will be transformed to keywords // e.g ja_JP_TRADITIONAL -> ja_JP@calendar=japanese + // NOTE: Since ICU-20187, ja_JP_TRADITIONAL no longer canonicalizes, and + // the Gregorian calendar is returned instead. int32_t canonicalLen = uloc_canonicalize(locid, canonicalName, sizeof(canonicalName) - 1, &status); if (U_FAILURE(status)) { return CALTYPE_GREGORIAN; @@ -748,6 +750,7 @@ fSkippedWallTime(UCAL_WALLTIME_LAST) validLocale[0] = 0; actualLocale[0] = 0; if (U_FAILURE(success)) { + delete zone; return; } if(zone == 0) { @@ -2592,7 +2595,7 @@ Calendar::isWeekend(UDate date, UErrorCode &status) const return FALSE; } // clone the calendar so we don't mess with the real one. - Calendar *work = (Calendar*)this->clone(); + Calendar *work = this->clone(); if (work == NULL) { status = U_MEMORY_ALLOCATION_ERROR; return FALSE; @@ -2752,7 +2755,7 @@ Calendar::getActualMinimum(UCalendarDateFields field, UErrorCode& status) const // clone the calendar so we don't mess with the real one, and set it to // accept anything for the field values - Calendar *work = (Calendar*)this->clone(); + Calendar *work = this->clone(); if (work == NULL) { status = U_MEMORY_ALLOCATION_ERROR; return 0; diff --git a/deps/icu-small/source/i18n/casetrn.cpp b/deps/icu-small/source/i18n/casetrn.cpp index f08d448881d364..06750b29837223 100644 --- a/deps/icu-small/source/i18n/casetrn.cpp +++ b/deps/icu-small/source/i18n/casetrn.cpp @@ -125,7 +125,7 @@ CaseMapTransliterator::CaseMapTransliterator(const CaseMapTransliterator& o) : /** * Transliterator API. */ -/*Transliterator* CaseMapTransliterator::clone(void) const { +/*CaseMapTransliterator* CaseMapTransliterator::clone() const { return new CaseMapTransliterator(*this); }*/ diff --git a/deps/icu-small/source/i18n/casetrn.h b/deps/icu-small/source/i18n/casetrn.h index eee443fc81d4e6..47914022f857eb 100644 --- a/deps/icu-small/source/i18n/casetrn.h +++ b/deps/icu-small/source/i18n/casetrn.h @@ -58,7 +58,7 @@ class CaseMapTransliterator : public Transliterator { * Transliterator API. * @return a copy of the object. */ - virtual Transliterator* clone(void) const = 0; + virtual CaseMapTransliterator* clone() const = 0; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/chnsecal.cpp b/deps/icu-small/source/i18n/chnsecal.cpp index 3c4ad2a846619f..2ff9f755afe1f1 100644 --- a/deps/icu-small/source/i18n/chnsecal.cpp +++ b/deps/icu-small/source/i18n/chnsecal.cpp @@ -51,10 +51,7 @@ static void debug_chnsecal_msg(const char *pat, ...) // --- The cache -- -static icu::UMutex *astroLock() { // Protects access to gChineseCalendarAstro. - static icu::UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static icu::UMutex astroLock; static icu::CalendarAstronomer *gChineseCalendarAstro = NULL; // Lazy Creation & Access synchronized by class CalendarCache with a mutex. @@ -121,7 +118,7 @@ U_NAMESPACE_BEGIN //------------------------------------------------------------------------- -Calendar* ChineseCalendar::clone() const { +ChineseCalendar* ChineseCalendar::clone() const { return new ChineseCalendar(*this); } @@ -538,14 +535,14 @@ int32_t ChineseCalendar::winterSolstice(int32_t gyear) const { // PST 1298 with a final result of Dec 14 10:31:59 PST 1299. double ms = daysToMillis(Grego::fieldsToDay(gyear, UCAL_DECEMBER, 1)); - umtx_lock(astroLock()); + umtx_lock(&astroLock); if(gChineseCalendarAstro == NULL) { gChineseCalendarAstro = new CalendarAstronomer(); ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup); } gChineseCalendarAstro->setTime(ms); UDate solarLong = gChineseCalendarAstro->getSunTime(CalendarAstronomer::WINTER_SOLSTICE(), TRUE); - umtx_unlock(astroLock()); + umtx_unlock(&astroLock); // Winter solstice is 270 degrees solar longitude aka Dongzhi cacheValue = (int32_t)millisToDays(solarLong); @@ -568,14 +565,14 @@ int32_t ChineseCalendar::winterSolstice(int32_t gyear) const { */ int32_t ChineseCalendar::newMoonNear(double days, UBool after) const { - umtx_lock(astroLock()); + umtx_lock(&astroLock); if(gChineseCalendarAstro == NULL) { gChineseCalendarAstro = new CalendarAstronomer(); ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup); } gChineseCalendarAstro->setTime(daysToMillis(days)); UDate newMoon = gChineseCalendarAstro->getMoonTime(CalendarAstronomer::NEW_MOON(), after); - umtx_unlock(astroLock()); + umtx_unlock(&astroLock); return (int32_t) millisToDays(newMoon); } @@ -600,14 +597,14 @@ int32_t ChineseCalendar::synodicMonthsBetween(int32_t day1, int32_t day2) const */ int32_t ChineseCalendar::majorSolarTerm(int32_t days) const { - umtx_lock(astroLock()); + umtx_lock(&astroLock); if(gChineseCalendarAstro == NULL) { gChineseCalendarAstro = new CalendarAstronomer(); ucln_i18n_registerCleanup(UCLN_I18N_CHINESE_CALENDAR, calendar_chinese_cleanup); } gChineseCalendarAstro->setTime(daysToMillis(days)); UDate solarLongitude = gChineseCalendarAstro->getSunLongitude(); - umtx_unlock(astroLock()); + umtx_unlock(&astroLock); // Compute (floor(solarLongitude / (pi/6)) + 2) % 12 int32_t term = ( ((int32_t)(6 * solarLongitude / CalendarAstronomer::PI)) + 2 ) % 12; diff --git a/deps/icu-small/source/i18n/chnsecal.h b/deps/icu-small/source/i18n/chnsecal.h index 1b27d2d1bcc78b..c7c063738145e7 100644 --- a/deps/icu-small/source/i18n/chnsecal.h +++ b/deps/icu-small/source/i18n/chnsecal.h @@ -144,7 +144,7 @@ class U_I18N_API ChineseCalendar : public Calendar { virtual ~ChineseCalendar(); // clone - virtual Calendar* clone() const; + virtual ChineseCalendar* clone() const; private: diff --git a/deps/icu-small/source/i18n/choicfmt.cpp b/deps/icu-small/source/i18n/choicfmt.cpp index 1b846704bfe1e4..16880706d3f1dc 100644 --- a/deps/icu-small/source/i18n/choicfmt.cpp +++ b/deps/icu-small/source/i18n/choicfmt.cpp @@ -563,7 +563,7 @@ ChoiceFormat::matchStringUntilLimitPart( // ------------------------------------- -Format* +ChoiceFormat* ChoiceFormat::clone() const { ChoiceFormat *aCopy = new ChoiceFormat(*this); diff --git a/deps/icu-small/source/i18n/coll.cpp b/deps/icu-small/source/i18n/coll.cpp index 8bbe133664c2cd..984831e761bdd6 100644 --- a/deps/icu-small/source/i18n/coll.cpp +++ b/deps/icu-small/source/i18n/coll.cpp @@ -67,7 +67,7 @@ static int32_t availableLocaleListCount; static icu::ICULocaleService* gService = NULL; static icu::UInitOnce gServiceInitOnce = U_INITONCE_INITIALIZER; #endif -static icu::UInitOnce gAvailableLocaleListInitOnce; +static icu::UInitOnce gAvailableLocaleListInitOnce = U_INITONCE_INITIALIZER; /** * Release all static memory held by collator. diff --git a/deps/icu-small/source/i18n/collationiterator.cpp b/deps/icu-small/source/i18n/collationiterator.cpp index 961c9e9acef675..18ccf014f0a48c 100644 --- a/deps/icu-small/source/i18n/collationiterator.cpp +++ b/deps/icu-small/source/i18n/collationiterator.cpp @@ -872,7 +872,7 @@ CollationIterator::previousCE(UVector32 &offsets, UErrorCode &errorCode) { // consistent with forward iteration. while(offsets.size() <= ceBuffer.length) { offsets.addElement(limitOffset, errorCode); - }; + } } return ceBuffer.get(--ceBuffer.length); } else { @@ -932,7 +932,7 @@ CollationIterator::previousCEUnsafe(UChar32 c, UVector32 &offsets, UErrorCode &e offset = getOffset(); while(offsets.size() < ceBuffer.length) { offsets.addElement(offset, errorCode); - }; + } } U_ASSERT(offsets.size() == ceBuffer.length); // End offset corresponding to just after the unsafe-backwards segment. diff --git a/deps/icu-small/source/i18n/compactdecimalformat.cpp b/deps/icu-small/source/i18n/compactdecimalformat.cpp index 4dd2241b23d0a6..a4c9dad25c408f 100644 --- a/deps/icu-small/source/i18n/compactdecimalformat.cpp +++ b/deps/icu-small/source/i18n/compactdecimalformat.cpp @@ -30,9 +30,9 @@ CompactDecimalFormat::CompactDecimalFormat(const Locale& inLocale, UNumberCompac : DecimalFormat(new DecimalFormatSymbols(inLocale, status), status) { if (U_FAILURE(status)) return; // Minimal properties: let the non-shim code path do most of the logic for us. - fields->properties->compactStyle = style; - fields->properties->groupingSize = -2; // do not forward grouping information - fields->properties->minimumGroupingDigits = 2; + fields->properties.compactStyle = style; + fields->properties.groupingSize = -2; // do not forward grouping information + fields->properties.minimumGroupingDigits = 2; touch(status); } @@ -45,7 +45,7 @@ CompactDecimalFormat& CompactDecimalFormat::operator=(const CompactDecimalFormat return *this; } -Format* CompactDecimalFormat::clone() const { +CompactDecimalFormat* CompactDecimalFormat::clone() const { return new CompactDecimalFormat(*this); } diff --git a/deps/icu-small/source/i18n/coptccal.cpp b/deps/icu-small/source/i18n/coptccal.cpp index 39691217d0fcb5..229119bf164e80 100644 --- a/deps/icu-small/source/i18n/coptccal.cpp +++ b/deps/icu-small/source/i18n/coptccal.cpp @@ -40,7 +40,7 @@ CopticCalendar::~CopticCalendar() { } -Calendar* +CopticCalendar* CopticCalendar::clone() const { return new CopticCalendar(*this); diff --git a/deps/icu-small/source/i18n/coptccal.h b/deps/icu-small/source/i18n/coptccal.h index 0b82c36088fb0d..dc2d79c89e6c22 100644 --- a/deps/icu-small/source/i18n/coptccal.h +++ b/deps/icu-small/source/i18n/coptccal.h @@ -145,7 +145,7 @@ class CopticCalendar : public CECalendar { * @return return a polymorphic copy of this calendar. * @internal */ - virtual Calendar* clone(void) const; + virtual CopticCalendar* clone() const; /** * return the calendar type, "coptic" diff --git a/deps/icu-small/source/i18n/cpdtrans.cpp b/deps/icu-small/source/i18n/cpdtrans.cpp index a204de5a5352dd..624ae431d35aa6 100644 --- a/deps/icu-small/source/i18n/cpdtrans.cpp +++ b/deps/icu-small/source/i18n/cpdtrans.cpp @@ -323,7 +323,7 @@ CompoundTransliterator& CompoundTransliterator::operator=( /** * Transliterator API. */ -Transliterator* CompoundTransliterator::clone(void) const { +CompoundTransliterator* CompoundTransliterator::clone() const { return new CompoundTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/cpdtrans.h b/deps/icu-small/source/i18n/cpdtrans.h index 29f3ba83fc1d57..e51b209411f68b 100644 --- a/deps/icu-small/source/i18n/cpdtrans.h +++ b/deps/icu-small/source/i18n/cpdtrans.h @@ -98,7 +98,7 @@ class U_I18N_API CompoundTransliterator : public Transliterator { /** * Transliterator API. */ - virtual Transliterator* clone(void) const; + virtual CompoundTransliterator* clone() const; /** * Returns the number of transliterators in this chain. diff --git a/deps/icu-small/source/i18n/csdetect.cpp b/deps/icu-small/source/i18n/csdetect.cpp index ad3565155dd382..566333fec667ad 100644 --- a/deps/icu-small/source/i18n/csdetect.cpp +++ b/deps/icu-small/source/i18n/csdetect.cpp @@ -47,7 +47,7 @@ struct CSRecognizerInfo : public UMemory { U_NAMESPACE_END static icu::CSRecognizerInfo **fCSRecognizers = NULL; -static icu::UInitOnce gCSRecognizersInitOnce; +static icu::UInitOnce gCSRecognizersInitOnce = U_INITONCE_INITIALIZER; static int32_t fCSRecognizers_size = 0; U_CDECL_BEGIN diff --git a/deps/icu-small/source/i18n/curramt.cpp b/deps/icu-small/source/i18n/curramt.cpp index 019c17df8e3379..69ab42ace9d9ec 100644 --- a/deps/icu-small/source/i18n/curramt.cpp +++ b/deps/icu-small/source/i18n/curramt.cpp @@ -38,7 +38,7 @@ CurrencyAmount& CurrencyAmount::operator=(const CurrencyAmount& other) { return *this; } -UObject* CurrencyAmount::clone() const { +CurrencyAmount* CurrencyAmount::clone() const { return new CurrencyAmount(*this); } diff --git a/deps/icu-small/source/i18n/currfmt.cpp b/deps/icu-small/source/i18n/currfmt.cpp index 8f20f783d25031..0ad0492ee7afbc 100644 --- a/deps/icu-small/source/i18n/currfmt.cpp +++ b/deps/icu-small/source/i18n/currfmt.cpp @@ -33,7 +33,7 @@ CurrencyFormat::CurrencyFormat(const CurrencyFormat& other) : CurrencyFormat::~CurrencyFormat() { } -Format* CurrencyFormat::clone() const { +CurrencyFormat* CurrencyFormat::clone() const { return new CurrencyFormat(*this); } diff --git a/deps/icu-small/source/i18n/currfmt.h b/deps/icu-small/source/i18n/currfmt.h index cc9bb3c1bacd05..69a031957bcea9 100644 --- a/deps/icu-small/source/i18n/currfmt.h +++ b/deps/icu-small/source/i18n/currfmt.h @@ -57,7 +57,7 @@ class CurrencyFormat : public MeasureFormat { /** * Override Format API. */ - virtual Format* clone() const; + virtual CurrencyFormat* clone() const; using MeasureFormat::format; diff --git a/deps/icu-small/source/i18n/currunit.cpp b/deps/icu-small/source/i18n/currunit.cpp index 39c49e468d117d..03347604a4c1fc 100644 --- a/deps/icu-small/source/i18n/currunit.cpp +++ b/deps/icu-small/source/i18n/currunit.cpp @@ -109,7 +109,7 @@ CurrencyUnit& CurrencyUnit::operator=(const CurrencyUnit& other) { return *this; } -UObject* CurrencyUnit::clone() const { +CurrencyUnit* CurrencyUnit::clone() const { return new CurrencyUnit(*this); } diff --git a/deps/icu-small/source/i18n/dangical.cpp b/deps/icu-small/source/i18n/dangical.cpp index bc3951f210ec45..54e2e99fa66711 100644 --- a/deps/icu-small/source/i18n/dangical.cpp +++ b/deps/icu-small/source/i18n/dangical.cpp @@ -65,7 +65,7 @@ DangiCalendar::~DangiCalendar() { } -Calendar* +DangiCalendar* DangiCalendar::clone() const { return new DangiCalendar(*this); diff --git a/deps/icu-small/source/i18n/dangical.h b/deps/icu-small/source/i18n/dangical.h index 1a1e06b9020295..4f2cf384f57664 100644 --- a/deps/icu-small/source/i18n/dangical.h +++ b/deps/icu-small/source/i18n/dangical.h @@ -66,7 +66,7 @@ class DangiCalendar : public ChineseCalendar { * Clone. * @internal */ - virtual Calendar* clone() const; + virtual DangiCalendar* clone() const; //---------------------------------------------------------------------- // Internal methods & astronomical calculations diff --git a/deps/icu-small/source/i18n/datefmt.cpp b/deps/icu-small/source/i18n/datefmt.cpp index 039f5bc226bb0a..413139db84c50d 100644 --- a/deps/icu-small/source/i18n/datefmt.cpp +++ b/deps/icu-small/source/i18n/datefmt.cpp @@ -154,7 +154,7 @@ DateFormat& DateFormat::operator=(const DateFormat& other) fCalendar = NULL; } if(other.fNumberFormat) { - fNumberFormat = (NumberFormat*)other.fNumberFormat->clone(); + fNumberFormat = other.fNumberFormat->clone(); } else { fNumberFormat = NULL; } @@ -598,7 +598,7 @@ DateFormat::adoptNumberFormat(NumberFormat* newNumberFormat) void DateFormat::setNumberFormat(const NumberFormat& newNumberFormat) { - NumberFormat* newNumFmtClone = (NumberFormat*)newNumberFormat.clone(); + NumberFormat* newNumFmtClone = newNumberFormat.clone(); if (newNumFmtClone != NULL) { adoptNumberFormat(newNumFmtClone); } diff --git a/deps/icu-small/source/i18n/decNumberLocal.h b/deps/icu-small/source/i18n/decNumberLocal.h index f6c291a9ad3359..e8d1b38653eb9d 100644 --- a/deps/icu-small/source/i18n/decNumberLocal.h +++ b/deps/icu-small/source/i18n/decNumberLocal.h @@ -259,7 +259,7 @@ /* 2,000,000,000 (as is needed for negative exponents of */ /* subnormals). The unsigned integer pow is used as a temporary */ /* variable. */ - #define TODIGIT(u, cut, c, pow) { \ + #define TODIGIT(u, cut, c, pow) UPRV_BLOCK_MACRO_BEGIN { \ *(c)='0'; \ pow=DECPOWERS[cut]*2; \ if ((u)>pow) { \ @@ -272,7 +272,7 @@ if ((u)>=pow) {(u)-=pow; *(c)+=2;} \ pow/=2; \ if ((u)>=pow) {(u)-=pow; *(c)+=1;} \ - } + } UPRV_BLOCK_MACRO_END /* ---------------------------------------------------------------- */ /* Definitions for fixed-precision modules (only valid after */ diff --git a/deps/icu-small/source/i18n/decimfmt.cpp b/deps/icu-small/source/i18n/decimfmt.cpp index 2a1e9347fa10d0..6a69c9d7a300e6 100644 --- a/deps/icu-small/source/i18n/decimfmt.cpp +++ b/deps/icu-small/source/i18n/decimfmt.cpp @@ -95,7 +95,7 @@ DecimalFormat::DecimalFormat(const UnicodeString& pattern, DecimalFormatSymbols* new CurrencyPluralInfo(fields->symbols->getLocale(), status), status); if (U_FAILURE(status)) { return; } - fields->properties->currencyPluralInfo.fPtr.adoptInstead(cpi.orphan()); + fields->properties.currencyPluralInfo.fPtr.adoptInstead(cpi.orphan()); } touch(status); } @@ -111,21 +111,14 @@ DecimalFormat::DecimalFormat(const DecimalFormatSymbols* symbolsToAdopt, UErrorC status = U_MEMORY_ALLOCATION_ERROR; return; } - fields->formatter.adoptInsteadAndCheckErrorCode(new LocalizedNumberFormatter(), status); - fields->properties.adoptInsteadAndCheckErrorCode(new DecimalFormatProperties(), status); - fields->exportedProperties.adoptInsteadAndCheckErrorCode(new DecimalFormatProperties(), status); if (adoptedSymbols.isNull()) { fields->symbols.adoptInsteadAndCheckErrorCode(new DecimalFormatSymbols(status), status); } else { fields->symbols.adoptInsteadAndCheckErrorCode(adoptedSymbols.orphan(), status); } - // In order to simplify error handling logic in the various getters/setters/etc, we do not allow - // any partially populated DecimalFormatFields object. We must have a fully complete fields object - // or else we set it to nullptr. - if (fields->formatter.isNull() || fields->properties.isNull() || fields->exportedProperties.isNull() || fields->symbols.isNull()) { + if (U_FAILURE(status)) { delete fields; fields = nullptr; - status = U_MEMORY_ALLOCATION_ERROR; } } @@ -133,8 +126,8 @@ DecimalFormat::DecimalFormat(const DecimalFormatSymbols* symbolsToAdopt, UErrorC void DecimalFormat::setParseAllInput(UNumberFormatAttributeValue value) { if (fields == nullptr) { return; } - if (value == fields->properties->parseAllInput) { return; } - fields->properties->parseAllInput = value; + if (value == fields->properties.parseAllInput) { return; } + fields->properties.parseAllInput = value; } #endif @@ -379,9 +372,9 @@ void DecimalFormat::setGroupingUsed(UBool enabled) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(enabled) == fields->properties->groupingUsed) { return; } + if (UBOOL_TO_BOOL(enabled) == fields->properties.groupingUsed) { return; } NumberFormat::setGroupingUsed(enabled); // to set field for compatibility - fields->properties->groupingUsed = enabled; + fields->properties.groupingUsed = enabled; touchNoError(); } @@ -389,9 +382,9 @@ void DecimalFormat::setParseIntegerOnly(UBool value) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(value) == fields->properties->parseIntegerOnly) { return; } + if (UBOOL_TO_BOOL(value) == fields->properties.parseIntegerOnly) { return; } NumberFormat::setParseIntegerOnly(value); // to set field for compatibility - fields->properties->parseIntegerOnly = value; + fields->properties.parseIntegerOnly = value; touchNoError(); } @@ -400,9 +393,9 @@ void DecimalFormat::setLenient(UBool enable) { return; } ParseMode mode = enable ? PARSE_MODE_LENIENT : PARSE_MODE_STRICT; - if (!fields->properties->parseMode.isNull() && mode == fields->properties->parseMode.getNoError()) { return; } + if (!fields->properties.parseMode.isNull() && mode == fields->properties.parseMode.getNoError()) { return; } NumberFormat::setLenient(enable); // to set field for compatibility - fields->properties->parseMode = mode; + fields->properties.parseMode = mode; touchNoError(); } @@ -441,19 +434,16 @@ DecimalFormat::DecimalFormat(const DecimalFormat& source) : NumberFormat(source) // Note: it is not safe to copy fields->formatter or fWarehouse directly because fields->formatter might have // dangling pointers to fields inside fWarehouse. The safe thing is to re-construct fields->formatter from // the property bag, despite being somewhat slower. - fields = new DecimalFormatFields(); + fields = new DecimalFormatFields(source.fields->properties); if (fields == nullptr) { return; // no way to report an error. } UErrorCode status = U_ZERO_ERROR; - fields->formatter.adoptInsteadAndCheckErrorCode(new LocalizedNumberFormatter(), status); - fields->properties.adoptInsteadAndCheckErrorCode(new DecimalFormatProperties(*source.fields->properties), status); fields->symbols.adoptInsteadAndCheckErrorCode(new DecimalFormatSymbols(*source.fields->symbols), status); - fields->exportedProperties.adoptInsteadAndCheckErrorCode(new DecimalFormatProperties(), status); // In order to simplify error handling logic in the various getters/setters/etc, we do not allow // any partially populated DecimalFormatFields object. We must have a fully complete fields object // or else we set it to nullptr. - if (fields->formatter.isNull() || fields->properties.isNull() || fields->exportedProperties.isNull() || fields->symbols.isNull()) { + if (U_FAILURE(status)) { delete fields; fields = nullptr; return; @@ -470,8 +460,8 @@ DecimalFormat& DecimalFormat::operator=(const DecimalFormat& rhs) { if (fields == nullptr || rhs.fields == nullptr) { return *this; // unfortunately, no way to report an error. } - *fields->properties = *rhs.fields->properties; - fields->exportedProperties->clear(); + fields->properties = rhs.fields->properties; + fields->exportedProperties.clear(); UErrorCode status = U_ZERO_ERROR; LocalPointer dfs(new DecimalFormatSymbols(*rhs.fields->symbols), status); if (U_FAILURE(status)) { @@ -495,7 +485,7 @@ DecimalFormat::~DecimalFormat() { delete fields; } -Format* DecimalFormat::clone() const { +DecimalFormat* DecimalFormat::clone() const { // can only clone valid objects. if (fields == nullptr) { return nullptr; @@ -517,7 +507,7 @@ UBool DecimalFormat::operator==(const Format& other) const { if (fields == nullptr || otherDF->fields == nullptr) { return false; } - return *fields->properties == *otherDF->fields->properties && *fields->symbols == *otherDF->fields->symbols; + return fields->properties == otherDF->fields->properties && *fields->symbols == *otherDF->fields->symbols; } UnicodeString& DecimalFormat::format(double number, UnicodeString& appendTo, FieldPosition& pos) const { @@ -529,7 +519,7 @@ UnicodeString& DecimalFormat::format(double number, UnicodeString& appendTo, Fie return appendTo; } UErrorCode localStatus = U_ZERO_ERROR; - FormattedNumber output = fields->formatter->formatDouble(number, localStatus); + FormattedNumber output = fields->formatter.formatDouble(number, localStatus); fieldPositionHelper(output, pos, appendTo.length(), localStatus); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, localStatus); @@ -550,7 +540,7 @@ UnicodeString& DecimalFormat::format(double number, UnicodeString& appendTo, Fie if (pos.getField() == FieldPosition::DONT_CARE && fastFormatDouble(number, appendTo)) { return appendTo; } - FormattedNumber output = fields->formatter->formatDouble(number, status); + FormattedNumber output = fields->formatter.formatDouble(number, status); fieldPositionHelper(output, pos, appendTo.length(), status); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, status); @@ -572,7 +562,7 @@ DecimalFormat::format(double number, UnicodeString& appendTo, FieldPositionItera if (posIter == nullptr && fastFormatDouble(number, appendTo)) { return appendTo; } - FormattedNumber output = fields->formatter->formatDouble(number, status); + FormattedNumber output = fields->formatter.formatDouble(number, status); fieldPositionIteratorHelper(output, posIter, appendTo.length(), status); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, status); @@ -603,7 +593,7 @@ UnicodeString& DecimalFormat::format(int64_t number, UnicodeString& appendTo, Fi return appendTo; } UErrorCode localStatus = U_ZERO_ERROR; - FormattedNumber output = fields->formatter->formatInt(number, localStatus); + FormattedNumber output = fields->formatter.formatInt(number, localStatus); fieldPositionHelper(output, pos, appendTo.length(), localStatus); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, localStatus); @@ -624,7 +614,7 @@ UnicodeString& DecimalFormat::format(int64_t number, UnicodeString& appendTo, Fi if (pos.getField() == FieldPosition::DONT_CARE && fastFormatInt64(number, appendTo)) { return appendTo; } - FormattedNumber output = fields->formatter->formatInt(number, status); + FormattedNumber output = fields->formatter.formatInt(number, status); fieldPositionHelper(output, pos, appendTo.length(), status); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, status); @@ -646,7 +636,7 @@ DecimalFormat::format(int64_t number, UnicodeString& appendTo, FieldPositionIter if (posIter == nullptr && fastFormatInt64(number, appendTo)) { return appendTo; } - FormattedNumber output = fields->formatter->formatInt(number, status); + FormattedNumber output = fields->formatter.formatInt(number, status); fieldPositionIteratorHelper(output, posIter, appendTo.length(), status); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, status); @@ -665,7 +655,7 @@ DecimalFormat::format(StringPiece number, UnicodeString& appendTo, FieldPosition appendTo.setToBogus(); return appendTo; } - FormattedNumber output = fields->formatter->formatDecimal(number, status); + FormattedNumber output = fields->formatter.formatDecimal(number, status); fieldPositionIteratorHelper(output, posIter, appendTo.length(), status); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, status); @@ -683,7 +673,7 @@ UnicodeString& DecimalFormat::format(const DecimalQuantity& number, UnicodeStrin appendTo.setToBogus(); return appendTo; } - FormattedNumber output = fields->formatter->formatDecimalQuantity(number, status); + FormattedNumber output = fields->formatter.formatDecimalQuantity(number, status); fieldPositionIteratorHelper(output, posIter, appendTo.length(), status); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, status); @@ -702,7 +692,7 @@ DecimalFormat::format(const DecimalQuantity& number, UnicodeString& appendTo, Fi appendTo.setToBogus(); return appendTo; } - FormattedNumber output = fields->formatter->formatDecimalQuantity(number, status); + FormattedNumber output = fields->formatter.formatDecimalQuantity(number, status); fieldPositionHelper(output, pos, appendTo.length(), status); auto appendable = UnicodeStringAppendable(appendTo); output.appendTo(appendable, status); @@ -823,7 +813,7 @@ const CurrencyPluralInfo* DecimalFormat::getCurrencyPluralInfo(void) const { if (fields == nullptr) { return nullptr; } - return fields->properties->currencyPluralInfo.fPtr.getAlias(); + return fields->properties.currencyPluralInfo.fPtr.getAlias(); } void DecimalFormat::adoptCurrencyPluralInfo(CurrencyPluralInfo* toAdopt) { @@ -833,7 +823,7 @@ void DecimalFormat::adoptCurrencyPluralInfo(CurrencyPluralInfo* toAdopt) { if (fields == nullptr) { return; } - fields->properties->currencyPluralInfo.fPtr.adoptInstead(cpi.orphan()); + fields->properties.currencyPluralInfo.fPtr.adoptInstead(cpi.orphan()); touchNoError(); } @@ -841,11 +831,11 @@ void DecimalFormat::setCurrencyPluralInfo(const CurrencyPluralInfo& info) { if (fields == nullptr) { return; } - if (fields->properties->currencyPluralInfo.fPtr.isNull()) { + if (fields->properties.currencyPluralInfo.fPtr.isNull()) { // Note: clone() can fail with OOM error, but we have no way to report it. :( - fields->properties->currencyPluralInfo.fPtr.adoptInstead(info.clone()); + fields->properties.currencyPluralInfo.fPtr.adoptInstead(info.clone()); } else { - *fields->properties->currencyPluralInfo.fPtr = info; // copy-assignment operator + *fields->properties.currencyPluralInfo.fPtr = info; // copy-assignment operator } touchNoError(); } @@ -856,7 +846,7 @@ UnicodeString& DecimalFormat::getPositivePrefix(UnicodeString& result) const { return result; } UErrorCode status = U_ZERO_ERROR; - fields->formatter->getAffixImpl(true, false, result, status); + fields->formatter.getAffixImpl(true, false, result, status); if (U_FAILURE(status)) { result.setToBogus(); } return result; } @@ -865,8 +855,8 @@ void DecimalFormat::setPositivePrefix(const UnicodeString& newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->positivePrefix) { return; } - fields->properties->positivePrefix = newValue; + if (newValue == fields->properties.positivePrefix) { return; } + fields->properties.positivePrefix = newValue; touchNoError(); } @@ -876,7 +866,7 @@ UnicodeString& DecimalFormat::getNegativePrefix(UnicodeString& result) const { return result; } UErrorCode status = U_ZERO_ERROR; - fields->formatter->getAffixImpl(true, true, result, status); + fields->formatter.getAffixImpl(true, true, result, status); if (U_FAILURE(status)) { result.setToBogus(); } return result; } @@ -885,8 +875,8 @@ void DecimalFormat::setNegativePrefix(const UnicodeString& newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->negativePrefix) { return; } - fields->properties->negativePrefix = newValue; + if (newValue == fields->properties.negativePrefix) { return; } + fields->properties.negativePrefix = newValue; touchNoError(); } @@ -896,7 +886,7 @@ UnicodeString& DecimalFormat::getPositiveSuffix(UnicodeString& result) const { return result; } UErrorCode status = U_ZERO_ERROR; - fields->formatter->getAffixImpl(false, false, result, status); + fields->formatter.getAffixImpl(false, false, result, status); if (U_FAILURE(status)) { result.setToBogus(); } return result; } @@ -905,8 +895,8 @@ void DecimalFormat::setPositiveSuffix(const UnicodeString& newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->positiveSuffix) { return; } - fields->properties->positiveSuffix = newValue; + if (newValue == fields->properties.positiveSuffix) { return; } + fields->properties.positiveSuffix = newValue; touchNoError(); } @@ -916,7 +906,7 @@ UnicodeString& DecimalFormat::getNegativeSuffix(UnicodeString& result) const { return result; } UErrorCode status = U_ZERO_ERROR; - fields->formatter->getAffixImpl(false, true, result, status); + fields->formatter.getAffixImpl(false, true, result, status); if (U_FAILURE(status)) { result.setToBogus(); } return result; } @@ -925,8 +915,8 @@ void DecimalFormat::setNegativeSuffix(const UnicodeString& newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->negativeSuffix) { return; } - fields->properties->negativeSuffix = newValue; + if (newValue == fields->properties.negativeSuffix) { return; } + fields->properties.negativeSuffix = newValue; touchNoError(); } @@ -935,13 +925,13 @@ UBool DecimalFormat::isSignAlwaysShown() const { if (fields == nullptr) { return DecimalFormatProperties::getDefault().signAlwaysShown; } - return fields->properties->signAlwaysShown; + return fields->properties.signAlwaysShown; } void DecimalFormat::setSignAlwaysShown(UBool value) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(value) == fields->properties->signAlwaysShown) { return; } - fields->properties->signAlwaysShown = value; + if (UBOOL_TO_BOOL(value) == fields->properties.signAlwaysShown) { return; } + fields->properties.signAlwaysShown = value; touchNoError(); } @@ -952,7 +942,7 @@ int32_t DecimalFormat::getMultiplier(void) const { // Fallback to using the default instance of DecimalFormatProperties. dfp = &(DecimalFormatProperties::getDefault()); } else { - dfp = fields->properties.getAlias(); + dfp = &fields->properties; } if (dfp->multiplier != 1) { return dfp->multiplier; @@ -984,11 +974,11 @@ void DecimalFormat::setMultiplier(int32_t multiplier) { value = temp; } if (delta != -1) { - fields->properties->magnitudeMultiplier = delta; - fields->properties->multiplier = 1; + fields->properties.magnitudeMultiplier = delta; + fields->properties.multiplier = 1; } else { - fields->properties->magnitudeMultiplier = 0; - fields->properties->multiplier = multiplier; + fields->properties.magnitudeMultiplier = 0; + fields->properties.multiplier = multiplier; } touchNoError(); } @@ -999,13 +989,13 @@ int32_t DecimalFormat::getMultiplierScale() const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().multiplierScale; } - return fields->properties->multiplierScale; + return fields->properties.multiplierScale; } void DecimalFormat::setMultiplierScale(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->multiplierScale) { return; } - fields->properties->multiplierScale = newValue; + if (newValue == fields->properties.multiplierScale) { return; } + fields->properties.multiplierScale = newValue; touchNoError(); } @@ -1015,13 +1005,13 @@ double DecimalFormat::getRoundingIncrement(void) const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().roundingIncrement; } - return fields->exportedProperties->roundingIncrement; + return fields->exportedProperties.roundingIncrement; } void DecimalFormat::setRoundingIncrement(double newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->roundingIncrement) { return; } - fields->properties->roundingIncrement = newValue; + if (newValue == fields->properties.roundingIncrement) { return; } + fields->properties.roundingIncrement = newValue; touchNoError(); } @@ -1032,17 +1022,17 @@ ERoundingMode DecimalFormat::getRoundingMode(void) const { return static_cast(DecimalFormatProperties::getDefault().roundingMode.getNoError()); } // UNumberFormatRoundingMode and ERoundingMode have the same values. - return static_cast(fields->exportedProperties->roundingMode.getNoError()); + return static_cast(fields->exportedProperties.roundingMode.getNoError()); } void DecimalFormat::setRoundingMode(ERoundingMode roundingMode) { if (fields == nullptr) { return; } auto uRoundingMode = static_cast(roundingMode); - if (!fields->properties->roundingMode.isNull() && uRoundingMode == fields->properties->roundingMode.getNoError()) { + if (!fields->properties.roundingMode.isNull() && uRoundingMode == fields->properties.roundingMode.getNoError()) { return; } NumberFormat::setMaximumIntegerDigits(roundingMode); // to set field for compatibility - fields->properties->roundingMode = uRoundingMode; + fields->properties.roundingMode = uRoundingMode; touchNoError(); } @@ -1052,52 +1042,52 @@ int32_t DecimalFormat::getFormatWidth(void) const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().formatWidth; } - return fields->properties->formatWidth; + return fields->properties.formatWidth; } void DecimalFormat::setFormatWidth(int32_t width) { if (fields == nullptr) { return; } - if (width == fields->properties->formatWidth) { return; } - fields->properties->formatWidth = width; + if (width == fields->properties.formatWidth) { return; } + fields->properties.formatWidth = width; touchNoError(); } UnicodeString DecimalFormat::getPadCharacterString() const { - if (fields == nullptr || fields->properties->padString.isBogus()) { + if (fields == nullptr || fields->properties.padString.isBogus()) { // Readonly-alias the static string kFallbackPaddingString return {TRUE, kFallbackPaddingString, -1}; } else { - return fields->properties->padString; + return fields->properties.padString; } } void DecimalFormat::setPadCharacter(const UnicodeString& padChar) { if (fields == nullptr) { return; } - if (padChar == fields->properties->padString) { return; } + if (padChar == fields->properties.padString) { return; } if (padChar.length() > 0) { - fields->properties->padString = UnicodeString(padChar.char32At(0)); + fields->properties.padString = UnicodeString(padChar.char32At(0)); } else { - fields->properties->padString.setToBogus(); + fields->properties.padString.setToBogus(); } touchNoError(); } EPadPosition DecimalFormat::getPadPosition(void) const { - if (fields == nullptr || fields->properties->padPosition.isNull()) { + if (fields == nullptr || fields->properties.padPosition.isNull()) { return EPadPosition::kPadBeforePrefix; } else { // UNumberFormatPadPosition and EPadPosition have the same values. - return static_cast(fields->properties->padPosition.getNoError()); + return static_cast(fields->properties.padPosition.getNoError()); } } void DecimalFormat::setPadPosition(EPadPosition padPos) { if (fields == nullptr) { return; } auto uPadPos = static_cast(padPos); - if (!fields->properties->padPosition.isNull() && uPadPos == fields->properties->padPosition.getNoError()) { + if (!fields->properties.padPosition.isNull() && uPadPos == fields->properties.padPosition.getNoError()) { return; } - fields->properties->padPosition = uPadPos; + fields->properties.padPosition = uPadPos; touchNoError(); } @@ -1107,17 +1097,17 @@ UBool DecimalFormat::isScientificNotation(void) const { // Fallback to using the default instance of DecimalFormatProperties. return (DecimalFormatProperties::getDefault().minimumExponentDigits != -1); } - return (fields->properties->minimumExponentDigits != -1); + return (fields->properties.minimumExponentDigits != -1); } void DecimalFormat::setScientificNotation(UBool useScientific) { if (fields == nullptr) { return; } int32_t minExp = useScientific ? 1 : -1; - if (fields->properties->minimumExponentDigits == minExp) { return; } + if (fields->properties.minimumExponentDigits == minExp) { return; } if (useScientific) { - fields->properties->minimumExponentDigits = 1; + fields->properties.minimumExponentDigits = 1; } else { - fields->properties->minimumExponentDigits = -1; + fields->properties.minimumExponentDigits = -1; } touchNoError(); } @@ -1128,13 +1118,13 @@ int8_t DecimalFormat::getMinimumExponentDigits(void) const { // Fallback to using the default instance of DecimalFormatProperties. return static_cast(DecimalFormatProperties::getDefault().minimumExponentDigits); } - return static_cast(fields->properties->minimumExponentDigits); + return static_cast(fields->properties.minimumExponentDigits); } void DecimalFormat::setMinimumExponentDigits(int8_t minExpDig) { if (fields == nullptr) { return; } - if (minExpDig == fields->properties->minimumExponentDigits) { return; } - fields->properties->minimumExponentDigits = minExpDig; + if (minExpDig == fields->properties.minimumExponentDigits) { return; } + fields->properties.minimumExponentDigits = minExpDig; touchNoError(); } @@ -1144,13 +1134,13 @@ UBool DecimalFormat::isExponentSignAlwaysShown(void) const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().exponentSignAlwaysShown; } - return fields->properties->exponentSignAlwaysShown; + return fields->properties.exponentSignAlwaysShown; } void DecimalFormat::setExponentSignAlwaysShown(UBool expSignAlways) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(expSignAlways) == fields->properties->exponentSignAlwaysShown) { return; } - fields->properties->exponentSignAlwaysShown = expSignAlways; + if (UBOOL_TO_BOOL(expSignAlways) == fields->properties.exponentSignAlwaysShown) { return; } + fields->properties.exponentSignAlwaysShown = expSignAlways; touchNoError(); } @@ -1161,7 +1151,7 @@ int32_t DecimalFormat::getGroupingSize(void) const { // Fallback to using the default instance of DecimalFormatProperties. groupingSize = DecimalFormatProperties::getDefault().groupingSize; } else { - groupingSize = fields->properties->groupingSize; + groupingSize = fields->properties.groupingSize; } if (groupingSize < 0) { return 0; @@ -1171,8 +1161,8 @@ int32_t DecimalFormat::getGroupingSize(void) const { void DecimalFormat::setGroupingSize(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->groupingSize) { return; } - fields->properties->groupingSize = newValue; + if (newValue == fields->properties.groupingSize) { return; } + fields->properties.groupingSize = newValue; touchNoError(); } @@ -1183,7 +1173,7 @@ int32_t DecimalFormat::getSecondaryGroupingSize(void) const { // Fallback to using the default instance of DecimalFormatProperties. grouping2 = DecimalFormatProperties::getDefault().secondaryGroupingSize; } else { - grouping2 = fields->properties->secondaryGroupingSize; + grouping2 = fields->properties.secondaryGroupingSize; } if (grouping2 < 0) { return 0; @@ -1193,8 +1183,8 @@ int32_t DecimalFormat::getSecondaryGroupingSize(void) const { void DecimalFormat::setSecondaryGroupingSize(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->secondaryGroupingSize) { return; } - fields->properties->secondaryGroupingSize = newValue; + if (newValue == fields->properties.secondaryGroupingSize) { return; } + fields->properties.secondaryGroupingSize = newValue; touchNoError(); } @@ -1204,13 +1194,13 @@ int32_t DecimalFormat::getMinimumGroupingDigits() const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().minimumGroupingDigits; } - return fields->properties->minimumGroupingDigits; + return fields->properties.minimumGroupingDigits; } void DecimalFormat::setMinimumGroupingDigits(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->minimumGroupingDigits) { return; } - fields->properties->minimumGroupingDigits = newValue; + if (newValue == fields->properties.minimumGroupingDigits) { return; } + fields->properties.minimumGroupingDigits = newValue; touchNoError(); } @@ -1220,13 +1210,13 @@ UBool DecimalFormat::isDecimalSeparatorAlwaysShown(void) const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().decimalSeparatorAlwaysShown; } - return fields->properties->decimalSeparatorAlwaysShown; + return fields->properties.decimalSeparatorAlwaysShown; } void DecimalFormat::setDecimalSeparatorAlwaysShown(UBool newValue) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(newValue) == fields->properties->decimalSeparatorAlwaysShown) { return; } - fields->properties->decimalSeparatorAlwaysShown = newValue; + if (UBOOL_TO_BOOL(newValue) == fields->properties.decimalSeparatorAlwaysShown) { return; } + fields->properties.decimalSeparatorAlwaysShown = newValue; touchNoError(); } @@ -1236,13 +1226,13 @@ UBool DecimalFormat::isDecimalPatternMatchRequired(void) const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().decimalPatternMatchRequired; } - return fields->properties->decimalPatternMatchRequired; + return fields->properties.decimalPatternMatchRequired; } void DecimalFormat::setDecimalPatternMatchRequired(UBool newValue) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(newValue) == fields->properties->decimalPatternMatchRequired) { return; } - fields->properties->decimalPatternMatchRequired = newValue; + if (UBOOL_TO_BOOL(newValue) == fields->properties.decimalPatternMatchRequired) { return; } + fields->properties.decimalPatternMatchRequired = newValue; touchNoError(); } @@ -1252,13 +1242,13 @@ UBool DecimalFormat::isParseNoExponent() const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().parseNoExponent; } - return fields->properties->parseNoExponent; + return fields->properties.parseNoExponent; } void DecimalFormat::setParseNoExponent(UBool value) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(value) == fields->properties->parseNoExponent) { return; } - fields->properties->parseNoExponent = value; + if (UBOOL_TO_BOOL(value) == fields->properties.parseNoExponent) { return; } + fields->properties.parseNoExponent = value; touchNoError(); } @@ -1268,13 +1258,13 @@ UBool DecimalFormat::isParseCaseSensitive() const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().parseCaseSensitive; } - return fields->properties->parseCaseSensitive; + return fields->properties.parseCaseSensitive; } void DecimalFormat::setParseCaseSensitive(UBool value) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(value) == fields->properties->parseCaseSensitive) { return; } - fields->properties->parseCaseSensitive = value; + if (UBOOL_TO_BOOL(value) == fields->properties.parseCaseSensitive) { return; } + fields->properties.parseCaseSensitive = value; touchNoError(); } @@ -1284,13 +1274,13 @@ UBool DecimalFormat::isFormatFailIfMoreThanMaxDigits() const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().formatFailIfMoreThanMaxDigits; } - return fields->properties->formatFailIfMoreThanMaxDigits; + return fields->properties.formatFailIfMoreThanMaxDigits; } void DecimalFormat::setFormatFailIfMoreThanMaxDigits(UBool value) { if (fields == nullptr) { return; } - if (UBOOL_TO_BOOL(value) == fields->properties->formatFailIfMoreThanMaxDigits) { return; } - fields->properties->formatFailIfMoreThanMaxDigits = value; + if (UBOOL_TO_BOOL(value) == fields->properties.formatFailIfMoreThanMaxDigits) { return; } + fields->properties.formatFailIfMoreThanMaxDigits = value; touchNoError(); } @@ -1305,7 +1295,7 @@ UnicodeString& DecimalFormat::toPattern(UnicodeString& result) const { // so that CurrencyUsage is reflected properly. // TODO: Consider putting this logic in number_patternstring.cpp instead. ErrorCode localStatus; - DecimalFormatProperties tprops(*fields->properties); + DecimalFormatProperties tprops(fields->properties); bool useCurrency = ( !tprops.currency.isNull() || !tprops.currencyPluralInfo.fPtr.isNull() || @@ -1315,9 +1305,9 @@ UnicodeString& DecimalFormat::toPattern(UnicodeString& result) const { AffixUtils::hasCurrencySymbols(tprops.negativePrefixPattern, localStatus) || AffixUtils::hasCurrencySymbols(tprops.negativeSuffixPattern, localStatus)); if (useCurrency) { - tprops.minimumFractionDigits = fields->exportedProperties->minimumFractionDigits; - tprops.maximumFractionDigits = fields->exportedProperties->maximumFractionDigits; - tprops.roundingIncrement = fields->exportedProperties->roundingIncrement; + tprops.minimumFractionDigits = fields->exportedProperties.minimumFractionDigits; + tprops.maximumFractionDigits = fields->exportedProperties.maximumFractionDigits; + tprops.roundingIncrement = fields->exportedProperties.roundingIncrement; } result = PatternStringUtils::propertiesToPatternString(tprops, localStatus); return result; @@ -1373,49 +1363,53 @@ void DecimalFormat::applyLocalizedPattern(const UnicodeString& localizedPattern, void DecimalFormat::setMaximumIntegerDigits(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->maximumIntegerDigits) { return; } + if (newValue == fields->properties.maximumIntegerDigits) { return; } // For backwards compatibility, conflicting min/max need to keep the most recent setting. - int32_t min = fields->properties->minimumIntegerDigits; + int32_t min = fields->properties.minimumIntegerDigits; if (min >= 0 && min > newValue) { - fields->properties->minimumIntegerDigits = newValue; + fields->properties.minimumIntegerDigits = newValue; } - fields->properties->maximumIntegerDigits = newValue; + fields->properties.maximumIntegerDigits = newValue; touchNoError(); } void DecimalFormat::setMinimumIntegerDigits(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->minimumIntegerDigits) { return; } + if (newValue == fields->properties.minimumIntegerDigits) { return; } // For backwards compatibility, conflicting min/max need to keep the most recent setting. - int32_t max = fields->properties->maximumIntegerDigits; + int32_t max = fields->properties.maximumIntegerDigits; if (max >= 0 && max < newValue) { - fields->properties->maximumIntegerDigits = newValue; + fields->properties.maximumIntegerDigits = newValue; } - fields->properties->minimumIntegerDigits = newValue; + fields->properties.minimumIntegerDigits = newValue; touchNoError(); } void DecimalFormat::setMaximumFractionDigits(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->maximumFractionDigits) { return; } + if (newValue == fields->properties.maximumFractionDigits) { return; } + // cap for backward compatibility, formerly 340, now 999 + if (newValue > kMaxIntFracSig) { + newValue = kMaxIntFracSig; + } // For backwards compatibility, conflicting min/max need to keep the most recent setting. - int32_t min = fields->properties->minimumFractionDigits; + int32_t min = fields->properties.minimumFractionDigits; if (min >= 0 && min > newValue) { - fields->properties->minimumFractionDigits = newValue; + fields->properties.minimumFractionDigits = newValue; } - fields->properties->maximumFractionDigits = newValue; + fields->properties.maximumFractionDigits = newValue; touchNoError(); } void DecimalFormat::setMinimumFractionDigits(int32_t newValue) { if (fields == nullptr) { return; } - if (newValue == fields->properties->minimumFractionDigits) { return; } + if (newValue == fields->properties.minimumFractionDigits) { return; } // For backwards compatibility, conflicting min/max need to keep the most recent setting. - int32_t max = fields->properties->maximumFractionDigits; + int32_t max = fields->properties.maximumFractionDigits; if (max >= 0 && max < newValue) { - fields->properties->maximumFractionDigits = newValue; + fields->properties.maximumFractionDigits = newValue; } - fields->properties->minimumFractionDigits = newValue; + fields->properties.minimumFractionDigits = newValue; touchNoError(); } @@ -1425,7 +1419,7 @@ int32_t DecimalFormat::getMinimumSignificantDigits() const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().minimumSignificantDigits; } - return fields->exportedProperties->minimumSignificantDigits; + return fields->exportedProperties.minimumSignificantDigits; } int32_t DecimalFormat::getMaximumSignificantDigits() const { @@ -1434,28 +1428,28 @@ int32_t DecimalFormat::getMaximumSignificantDigits() const { // Fallback to using the default instance of DecimalFormatProperties. return DecimalFormatProperties::getDefault().maximumSignificantDigits; } - return fields->exportedProperties->maximumSignificantDigits; + return fields->exportedProperties.maximumSignificantDigits; } void DecimalFormat::setMinimumSignificantDigits(int32_t value) { if (fields == nullptr) { return; } - if (value == fields->properties->minimumSignificantDigits) { return; } - int32_t max = fields->properties->maximumSignificantDigits; + if (value == fields->properties.minimumSignificantDigits) { return; } + int32_t max = fields->properties.maximumSignificantDigits; if (max >= 0 && max < value) { - fields->properties->maximumSignificantDigits = value; + fields->properties.maximumSignificantDigits = value; } - fields->properties->minimumSignificantDigits = value; + fields->properties.minimumSignificantDigits = value; touchNoError(); } void DecimalFormat::setMaximumSignificantDigits(int32_t value) { if (fields == nullptr) { return; } - if (value == fields->properties->maximumSignificantDigits) { return; } - int32_t min = fields->properties->minimumSignificantDigits; + if (value == fields->properties.maximumSignificantDigits) { return; } + int32_t min = fields->properties.minimumSignificantDigits; if (min >= 0 && min > value) { - fields->properties->minimumSignificantDigits = value; + fields->properties.minimumSignificantDigits = value; } - fields->properties->maximumSignificantDigits = value; + fields->properties.maximumSignificantDigits = value; touchNoError(); } @@ -1466,7 +1460,7 @@ UBool DecimalFormat::areSignificantDigitsUsed() const { // Fallback to using the default instance of DecimalFormatProperties. dfp = &(DecimalFormatProperties::getDefault()); } else { - dfp = fields->properties.getAlias(); + dfp = &fields->properties; } return dfp->minimumSignificantDigits != -1 || dfp->maximumSignificantDigits != -1; } @@ -1476,20 +1470,20 @@ void DecimalFormat::setSignificantDigitsUsed(UBool useSignificantDigits) { // These are the default values from the old implementation. if (useSignificantDigits) { - if (fields->properties->minimumSignificantDigits != -1 || - fields->properties->maximumSignificantDigits != -1) { + if (fields->properties.minimumSignificantDigits != -1 || + fields->properties.maximumSignificantDigits != -1) { return; } } else { - if (fields->properties->minimumSignificantDigits == -1 && - fields->properties->maximumSignificantDigits == -1) { + if (fields->properties.minimumSignificantDigits == -1 && + fields->properties.maximumSignificantDigits == -1) { return; } } int32_t minSig = useSignificantDigits ? 1 : -1; int32_t maxSig = useSignificantDigits ? 6 : -1; - fields->properties->minimumSignificantDigits = minSig; - fields->properties->maximumSignificantDigits = maxSig; + fields->properties.minimumSignificantDigits = minSig; + fields->properties.maximumSignificantDigits = maxSig; touchNoError(); } @@ -1503,11 +1497,11 @@ void DecimalFormat::setCurrency(const char16_t* theCurrency, UErrorCode& ec) { } CurrencyUnit currencyUnit(theCurrency, ec); if (U_FAILURE(ec)) { return; } - if (!fields->properties->currency.isNull() && fields->properties->currency.getNoError() == currencyUnit) { + if (!fields->properties.currency.isNull() && fields->properties.currency.getNoError() == currencyUnit) { return; } NumberFormat::setCurrency(theCurrency, ec); // to set field for compatibility - fields->properties->currency = currencyUnit; + fields->properties.currency = currencyUnit; // TODO: Set values in fields->symbols, too? touchNoError(); } @@ -1525,20 +1519,20 @@ void DecimalFormat::setCurrencyUsage(UCurrencyUsage newUsage, UErrorCode* ec) { *ec = U_MEMORY_ALLOCATION_ERROR; return; } - if (!fields->properties->currencyUsage.isNull() && newUsage == fields->properties->currencyUsage.getNoError()) { + if (!fields->properties.currencyUsage.isNull() && newUsage == fields->properties.currencyUsage.getNoError()) { return; } - fields->properties->currencyUsage = newUsage; + fields->properties.currencyUsage = newUsage; touch(*ec); } UCurrencyUsage DecimalFormat::getCurrencyUsage() const { // CurrencyUsage is not exported, so we have to get it from the input property bag. // TODO: Should we export CurrencyUsage instead? - if (fields == nullptr || fields->properties->currencyUsage.isNull()) { + if (fields == nullptr || fields->properties.currencyUsage.isNull()) { return UCURR_USAGE_STANDARD; } - return fields->properties->currencyUsage.getNoError(); + return fields->properties.currencyUsage.getNoError(); } void @@ -1550,7 +1544,7 @@ DecimalFormat::formatToDecimalQuantity(double number, DecimalQuantity& output, U status = U_MEMORY_ALLOCATION_ERROR; return; } - fields->formatter->formatDouble(number, status).getDecimalQuantity(output, status); + fields->formatter.formatDouble(number, status).getDecimalQuantity(output, status); } void DecimalFormat::formatToDecimalQuantity(const Formattable& number, DecimalQuantity& output, @@ -1564,7 +1558,7 @@ void DecimalFormat::formatToDecimalQuantity(const Formattable& number, DecimalQu } UFormattedNumberData obj; number.populateDecimalQuantity(obj.quantity, status); - fields->formatter->formatImpl(&obj, status); + fields->formatter.formatImpl(&obj, status); output = std::move(obj.quantity); } @@ -1576,12 +1570,7 @@ const number::LocalizedNumberFormatter* DecimalFormat::toNumberFormatter(UErrorC status = U_MEMORY_ALLOCATION_ERROR; return nullptr; } - return &*fields->formatter; -} - -const number::LocalizedNumberFormatter& DecimalFormat::toNumberFormatter() const { - UErrorCode localStatus = U_ZERO_ERROR; - return *toNumberFormatter(localStatus); + return &fields->formatter; } /** Rebuilds the formatter object from the property bag. */ @@ -1608,9 +1597,9 @@ void DecimalFormat::touch(UErrorCode& status) { // Since memory has already been allocated for the formatter, we can move assign a stack-allocated object // and don't need to call new. (Which is slower and could possibly fail). - *fields->formatter = NumberPropertyMapper::create( - *fields->properties, *fields->symbols, fields->warehouse, *fields->exportedProperties, status).locale( - locale); + fields->formatter = NumberPropertyMapper::create( + fields->properties, *fields->symbols, fields->warehouse, fields->exportedProperties, status + ).locale(locale); // Do this after fields->exportedProperties are set up setupFastFormat(); @@ -1620,13 +1609,13 @@ void DecimalFormat::touch(UErrorCode& status) { delete fields->atomicCurrencyParser.exchange(nullptr); // In order for the getters to work, we need to populate some fields in NumberFormat. - NumberFormat::setCurrency(fields->exportedProperties->currency.get(status).getISOCurrency(), status); - NumberFormat::setMaximumIntegerDigits(fields->exportedProperties->maximumIntegerDigits); - NumberFormat::setMinimumIntegerDigits(fields->exportedProperties->minimumIntegerDigits); - NumberFormat::setMaximumFractionDigits(fields->exportedProperties->maximumFractionDigits); - NumberFormat::setMinimumFractionDigits(fields->exportedProperties->minimumFractionDigits); + NumberFormat::setCurrency(fields->exportedProperties.currency.get(status).getISOCurrency(), status); + NumberFormat::setMaximumIntegerDigits(fields->exportedProperties.maximumIntegerDigits); + NumberFormat::setMinimumIntegerDigits(fields->exportedProperties.minimumIntegerDigits); + NumberFormat::setMaximumFractionDigits(fields->exportedProperties.maximumFractionDigits); + NumberFormat::setMinimumFractionDigits(fields->exportedProperties.minimumFractionDigits); // fImpl->properties, not fields->exportedProperties, since this information comes from the pattern: - NumberFormat::setGroupingUsed(fields->properties->groupingUsed); + NumberFormat::setGroupingUsed(fields->properties.groupingUsed); } void DecimalFormat::touchNoError() { @@ -1639,7 +1628,7 @@ void DecimalFormat::setPropertiesFromPattern(const UnicodeString& pattern, int32 if (U_SUCCESS(status)) { // Cast workaround to get around putting the enum in the public header file auto actualIgnoreRounding = static_cast(ignoreRounding); - PatternParser::parseToExistingProperties(pattern, *fields->properties, actualIgnoreRounding, status); + PatternParser::parseToExistingProperties(pattern, fields->properties, actualIgnoreRounding, status); } } @@ -1658,7 +1647,7 @@ const numparse::impl::NumberParserImpl* DecimalFormat::getParser(UErrorCode& sta } // Try computing the parser on our own - auto* temp = NumberParserImpl::createParserFromProperties(*fields->properties, *fields->symbols, false, status); + auto* temp = NumberParserImpl::createParserFromProperties(fields->properties, *fields->symbols, false, status); if (U_FAILURE(status)) { return nullptr; } @@ -1691,7 +1680,7 @@ const numparse::impl::NumberParserImpl* DecimalFormat::getCurrencyParser(UErrorC } // Try computing the parser on our own - auto* temp = NumberParserImpl::createParserFromProperties(*fields->properties, *fields->symbols, true, status); + auto* temp = NumberParserImpl::createParserFromProperties(fields->properties, *fields->symbols, true, status); if (temp == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; // although we may still dereference, call sites should be guarded @@ -1739,7 +1728,7 @@ DecimalFormat::fieldPositionIteratorHelper(const number::FormattedNumber& format void DecimalFormat::setupFastFormat() { // Check the majority of properties: - if (!fields->properties->equalsDefaultExceptFastFormat()) { + if (!fields->properties.equalsDefaultExceptFastFormat()) { trace("no fast format: equality\n"); fields->canUseFastFormat = false; return; @@ -1747,12 +1736,12 @@ void DecimalFormat::setupFastFormat() { // Now check the remaining properties. // Nontrivial affixes: - UBool trivialPP = fields->properties->positivePrefixPattern.isEmpty(); - UBool trivialPS = fields->properties->positiveSuffixPattern.isEmpty(); - UBool trivialNP = fields->properties->negativePrefixPattern.isBogus() || ( - fields->properties->negativePrefixPattern.length() == 1 && - fields->properties->negativePrefixPattern.charAt(0) == u'-'); - UBool trivialNS = fields->properties->negativeSuffixPattern.isEmpty(); + UBool trivialPP = fields->properties.positivePrefixPattern.isEmpty(); + UBool trivialPS = fields->properties.positiveSuffixPattern.isEmpty(); + UBool trivialNP = fields->properties.negativePrefixPattern.isBogus() || ( + fields->properties.negativePrefixPattern.length() == 1 && + fields->properties.negativePrefixPattern.charAt(0) == u'-'); + UBool trivialNS = fields->properties.negativeSuffixPattern.isEmpty(); if (!trivialPP || !trivialPS || !trivialNP || !trivialNS) { trace("no fast format: affixes\n"); fields->canUseFastFormat = false; @@ -1760,8 +1749,8 @@ void DecimalFormat::setupFastFormat() { } // Grouping (secondary grouping is forbidden in equalsDefaultExceptFastFormat): - bool groupingUsed = fields->properties->groupingUsed; - int32_t groupingSize = fields->properties->groupingSize; + bool groupingUsed = fields->properties.groupingUsed; + int32_t groupingSize = fields->properties.groupingSize; bool unusualGroupingSize = groupingSize > 0 && groupingSize != 3; const UnicodeString& groupingString = fields->symbols->getConstSymbol(DecimalFormatSymbols::kGroupingSeparatorSymbol); if (groupingUsed && (unusualGroupingSize || groupingString.length() != 1)) { @@ -1771,8 +1760,8 @@ void DecimalFormat::setupFastFormat() { } // Integer length: - int32_t minInt = fields->exportedProperties->minimumIntegerDigits; - int32_t maxInt = fields->exportedProperties->maximumIntegerDigits; + int32_t minInt = fields->exportedProperties.minimumIntegerDigits; + int32_t maxInt = fields->exportedProperties.maximumIntegerDigits; // Fastpath supports up to only 10 digits (length of INT32_MIN) if (minInt > 10) { trace("no fast format: integer\n"); @@ -1781,7 +1770,7 @@ void DecimalFormat::setupFastFormat() { } // Fraction length (no fraction part allowed in fast path): - int32_t minFrac = fields->exportedProperties->minimumFractionDigits; + int32_t minFrac = fields->exportedProperties.minimumFractionDigits; if (minFrac > 0) { trace("no fast format: fraction\n"); fields->canUseFastFormat = false; diff --git a/deps/icu-small/source/i18n/double-conversion-bignum-dtoa.cpp b/deps/icu-small/source/i18n/double-conversion-bignum-dtoa.cpp index 2add399f87c91f..a95910df0421d1 100644 --- a/deps/icu-small/source/i18n/double-conversion-bignum-dtoa.cpp +++ b/deps/icu-small/source/i18n/double-conversion-bignum-dtoa.cpp @@ -49,7 +49,7 @@ U_NAMESPACE_BEGIN namespace double_conversion { static int NormalizedExponent(uint64_t significand, int exponent) { - ASSERT(significand != 0); + DOUBLE_CONVERSION_ASSERT(significand != 0); while ((significand & Double::kHiddenBit) == 0) { significand = significand << 1; exponent = exponent - 1; @@ -90,26 +90,26 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, // Generates 'requested_digits' after the decimal point. static void BignumToFixed(int requested_digits, int* decimal_point, Bignum* numerator, Bignum* denominator, - Vector(buffer), int* length); + Vector buffer, int* length); // Generates 'count' digits of numerator/denominator. // Once 'count' digits have been produced rounds the result depending on the // remainder (remainders of exactly .5 round upwards). Might update the // decimal_point when rounding up (for example for 0.9999). static void GenerateCountedDigits(int count, int* decimal_point, Bignum* numerator, Bignum* denominator, - Vector(buffer), int* length); + Vector buffer, int* length); void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits, Vector buffer, int* length, int* decimal_point) { - ASSERT(v > 0); - ASSERT(!Double(v).IsSpecial()); + DOUBLE_CONVERSION_ASSERT(v > 0); + DOUBLE_CONVERSION_ASSERT(!Double(v).IsSpecial()); uint64_t significand; int exponent; bool lower_boundary_is_closer; if (mode == BIGNUM_DTOA_SHORTEST_SINGLE) { float f = static_cast(v); - ASSERT(f == v); + DOUBLE_CONVERSION_ASSERT(f == v); significand = Single(f).Significand(); exponent = Single(f).Exponent(); lower_boundary_is_closer = Single(f).LowerBoundaryIsCloser(); @@ -148,7 +148,7 @@ void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits, // 4e-324. In this case the denominator needs fewer than 324*4 binary digits. // The maximum double is 1.7976931348623157e308 which needs fewer than // 308*4 binary digits. - ASSERT(Bignum::kMaxSignificantBits >= 324*4); + DOUBLE_CONVERSION_ASSERT(Bignum::kMaxSignificantBits >= 324*4); InitialScaledStartValues(significand, exponent, lower_boundary_is_closer, estimated_power, need_boundary_deltas, &numerator, &denominator, @@ -177,7 +177,7 @@ void BignumDtoa(double v, BignumDtoaMode mode, int requested_digits, buffer, length); break; default: - UNREACHABLE(); + DOUBLE_CONVERSION_UNREACHABLE(); } buffer[*length] = '\0'; } @@ -209,7 +209,7 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, for (;;) { uint16_t digit; digit = numerator->DivideModuloIntBignum(*denominator); - ASSERT(digit <= 9); // digit is a uint16_t and therefore always positive. + DOUBLE_CONVERSION_ASSERT(digit <= 9); // digit is a uint16_t and therefore always positive. // digit = numerator / denominator (integer division). // numerator = numerator % denominator. buffer[(*length)++] = static_cast(digit + '0'); @@ -255,7 +255,7 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, // loop would have stopped earlier. // We still have an assert here in case the preconditions were not // satisfied. - ASSERT(buffer[(*length) - 1] != '9'); + DOUBLE_CONVERSION_ASSERT(buffer[(*length) - 1] != '9'); buffer[(*length) - 1]++; } else { // Halfway case. @@ -266,7 +266,7 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, if ((buffer[(*length) - 1] - '0') % 2 == 0) { // Round down => Do nothing. } else { - ASSERT(buffer[(*length) - 1] != '9'); + DOUBLE_CONVERSION_ASSERT(buffer[(*length) - 1] != '9'); buffer[(*length) - 1]++; } } @@ -278,9 +278,9 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, // Round up. // Note again that the last digit could not be '9' since this would have // stopped the loop earlier. - // We still have an ASSERT here, in case the preconditions were not + // We still have an DOUBLE_CONVERSION_ASSERT here, in case the preconditions were not // satisfied. - ASSERT(buffer[(*length) -1] != '9'); + DOUBLE_CONVERSION_ASSERT(buffer[(*length) -1] != '9'); buffer[(*length) - 1]++; return; } @@ -297,11 +297,11 @@ static void GenerateShortestDigits(Bignum* numerator, Bignum* denominator, static void GenerateCountedDigits(int count, int* decimal_point, Bignum* numerator, Bignum* denominator, Vector buffer, int* length) { - ASSERT(count >= 0); + DOUBLE_CONVERSION_ASSERT(count >= 0); for (int i = 0; i < count - 1; ++i) { uint16_t digit; digit = numerator->DivideModuloIntBignum(*denominator); - ASSERT(digit <= 9); // digit is a uint16_t and therefore always positive. + DOUBLE_CONVERSION_ASSERT(digit <= 9); // digit is a uint16_t and therefore always positive. // digit = numerator / denominator (integer division). // numerator = numerator % denominator. buffer[i] = static_cast(digit + '0'); @@ -314,7 +314,7 @@ static void GenerateCountedDigits(int count, int* decimal_point, if (Bignum::PlusCompare(*numerator, *numerator, *denominator) >= 0) { digit++; } - ASSERT(digit <= 10); + DOUBLE_CONVERSION_ASSERT(digit <= 10); buffer[count - 1] = static_cast(digit + '0'); // Correct bad digits (in case we had a sequence of '9's). Propagate the // carry until we hat a non-'9' or til we reach the first digit. @@ -339,7 +339,7 @@ static void GenerateCountedDigits(int count, int* decimal_point, // Input verifies: 1 <= (numerator + delta) / denominator < 10. static void BignumToFixed(int requested_digits, int* decimal_point, Bignum* numerator, Bignum* denominator, - Vector(buffer), int* length) { + Vector buffer, int* length) { // Note that we have to look at more than just the requested_digits, since // a number could be rounded up. Example: v=0.5 with requested_digits=0. // Even though the power of v equals 0 we can't just stop here. @@ -355,7 +355,7 @@ static void BignumToFixed(int requested_digits, int* decimal_point, } else if (-(*decimal_point) == requested_digits) { // We only need to verify if the number rounds down or up. // Ex: 0.04 and 0.06 with requested_digits == 1. - ASSERT(*decimal_point == -requested_digits); + DOUBLE_CONVERSION_ASSERT(*decimal_point == -requested_digits); // Initially the fraction lies in range (1, 10]. Multiply the denominator // by 10 so that we can compare more easily. denominator->Times10(); @@ -434,7 +434,7 @@ static void InitialScaledStartValuesPositiveExponent( Bignum* numerator, Bignum* denominator, Bignum* delta_minus, Bignum* delta_plus) { // A positive exponent implies a positive power. - ASSERT(estimated_power >= 0); + DOUBLE_CONVERSION_ASSERT(estimated_power >= 0); // Since the estimated_power is positive we simply multiply the denominator // by 10^estimated_power. @@ -520,7 +520,7 @@ static void InitialScaledStartValuesNegativeExponentNegativePower( // numerator = v * 10^-estimated_power * 2 * 2^-exponent. // Remember: numerator has been abused as power_ten. So no need to assign it // to itself. - ASSERT(numerator == power_ten); + DOUBLE_CONVERSION_ASSERT(numerator == power_ten); numerator->MultiplyByUInt64(significand); // denominator = 2 * 2^-exponent with exponent < 0. diff --git a/deps/icu-small/source/i18n/double-conversion-bignum.cpp b/deps/icu-small/source/i18n/double-conversion-bignum.cpp index 5356923921c3c1..996d75c9f60a14 100644 --- a/deps/icu-small/source/i18n/double-conversion-bignum.cpp +++ b/deps/icu-small/source/i18n/double-conversion-bignum.cpp @@ -34,6 +34,9 @@ #include "unicode/utypes.h" #if !UCONFIG_NO_FORMATTING +#include +#include + // ICU PATCH: Customize header file paths for ICU. #include "double-conversion-bignum.h" @@ -44,136 +47,129 @@ U_NAMESPACE_BEGIN namespace double_conversion { -Bignum::Bignum() - : bigits_buffer_(), bigits_(bigits_buffer_, kBigitCapacity), used_digits_(0), exponent_(0) { - for (int i = 0; i < kBigitCapacity; ++i) { - bigits_[i] = 0; - } +Bignum::Chunk& Bignum::RawBigit(const int index) { + DOUBLE_CONVERSION_ASSERT(static_cast(index) < kBigitCapacity); + return bigits_buffer_[index]; +} + + +const Bignum::Chunk& Bignum::RawBigit(const int index) const { + DOUBLE_CONVERSION_ASSERT(static_cast(index) < kBigitCapacity); + return bigits_buffer_[index]; } template -static int BitSize(S value) { +static int BitSize(const S value) { (void) value; // Mark variable as used. return 8 * sizeof(value); } // Guaranteed to lie in one Bigit. -void Bignum::AssignUInt16(uint16_t value) { - ASSERT(kBigitSize >= BitSize(value)); +void Bignum::AssignUInt16(const uint16_t value) { + DOUBLE_CONVERSION_ASSERT(kBigitSize >= BitSize(value)); Zero(); - if (value == 0) return; - - EnsureCapacity(1); - bigits_[0] = value; - used_digits_ = 1; + if (value > 0) { + RawBigit(0) = value; + used_bigits_ = 1; + } } void Bignum::AssignUInt64(uint64_t value) { - const int kUInt64Size = 64; - Zero(); - if (value == 0) return; - - int needed_bigits = kUInt64Size / kBigitSize + 1; - EnsureCapacity(needed_bigits); - for (int i = 0; i < needed_bigits; ++i) { - bigits_[i] = value & kBigitMask; - value = value >> kBigitSize; + for(int i = 0; value > 0; ++i) { + RawBigit(i) = value & kBigitMask; + value >>= kBigitSize; + ++used_bigits_; } - used_digits_ = needed_bigits; - Clamp(); } void Bignum::AssignBignum(const Bignum& other) { exponent_ = other.exponent_; - for (int i = 0; i < other.used_digits_; ++i) { - bigits_[i] = other.bigits_[i]; + for (int i = 0; i < other.used_bigits_; ++i) { + RawBigit(i) = other.RawBigit(i); } - // Clear the excess digits (if there were any). - for (int i = other.used_digits_; i < used_digits_; ++i) { - bigits_[i] = 0; - } - used_digits_ = other.used_digits_; + used_bigits_ = other.used_bigits_; } -static uint64_t ReadUInt64(Vector buffer, - int from, - int digits_to_read) { +static uint64_t ReadUInt64(const Vector buffer, + const int from, + const int digits_to_read) { uint64_t result = 0; for (int i = from; i < from + digits_to_read; ++i) { - int digit = buffer[i] - '0'; - ASSERT(0 <= digit && digit <= 9); + const int digit = buffer[i] - '0'; + DOUBLE_CONVERSION_ASSERT(0 <= digit && digit <= 9); result = result * 10 + digit; } return result; } -void Bignum::AssignDecimalString(Vector value) { +void Bignum::AssignDecimalString(const Vector value) { // 2^64 = 18446744073709551616 > 10^19 - const int kMaxUint64DecimalDigits = 19; + static const int kMaxUint64DecimalDigits = 19; Zero(); int length = value.length(); - unsigned int pos = 0; + unsigned pos = 0; // Let's just say that each digit needs 4 bits. while (length >= kMaxUint64DecimalDigits) { - uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits); + const uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits); pos += kMaxUint64DecimalDigits; length -= kMaxUint64DecimalDigits; MultiplyByPowerOfTen(kMaxUint64DecimalDigits); AddUInt64(digits); } - uint64_t digits = ReadUInt64(value, pos, length); + const uint64_t digits = ReadUInt64(value, pos, length); MultiplyByPowerOfTen(length); AddUInt64(digits); Clamp(); } -static int HexCharValue(char c) { - if ('0' <= c && c <= '9') return c - '0'; - if ('a' <= c && c <= 'f') return 10 + c - 'a'; - ASSERT('A' <= c && c <= 'F'); +static uint64_t HexCharValue(const int c) { + if ('0' <= c && c <= '9') { + return c - '0'; + } + if ('a' <= c && c <= 'f') { + return 10 + c - 'a'; + } + DOUBLE_CONVERSION_ASSERT('A' <= c && c <= 'F'); return 10 + c - 'A'; } +// Unlike AssignDecimalString(), this function is "only" used +// for unit-tests and therefore not performance critical. void Bignum::AssignHexString(Vector value) { Zero(); - int length = value.length(); - - int needed_bigits = length * 4 / kBigitSize + 1; - EnsureCapacity(needed_bigits); - int string_index = length - 1; - for (int i = 0; i < needed_bigits - 1; ++i) { - // These bigits are guaranteed to be "full". - Chunk current_bigit = 0; - for (int j = 0; j < kBigitSize / 4; j++) { - current_bigit += HexCharValue(value[string_index--]) << (j * 4); + // Required capacity could be reduced by ignoring leading zeros. + EnsureCapacity(((value.length() * 4) + kBigitSize - 1) / kBigitSize); + DOUBLE_CONVERSION_ASSERT(sizeof(uint64_t) * 8 >= kBigitSize + 4); // TODO: static_assert + // Accumulates converted hex digits until at least kBigitSize bits. + // Works with non-factor-of-four kBigitSizes. + uint64_t tmp = 0; // Accumulates converted hex digits until at least + for (int cnt = 0; !value.is_empty(); value.pop_back()) { + tmp |= (HexCharValue(value.last()) << cnt); + if ((cnt += 4) >= kBigitSize) { + RawBigit(used_bigits_++) = (tmp & kBigitMask); + cnt -= kBigitSize; + tmp >>= kBigitSize; } - bigits_[i] = current_bigit; - } - used_digits_ = needed_bigits - 1; - - Chunk most_significant_bigit = 0; // Could be = 0; - for (int j = 0; j <= string_index; ++j) { - most_significant_bigit <<= 4; - most_significant_bigit += HexCharValue(value[j]); } - if (most_significant_bigit != 0) { - bigits_[used_digits_] = most_significant_bigit; - used_digits_++; + if (tmp > 0) { + RawBigit(used_bigits_++) = tmp; } Clamp(); } -void Bignum::AddUInt64(uint64_t operand) { - if (operand == 0) return; +void Bignum::AddUInt64(const uint64_t operand) { + if (operand == 0) { + return; + } Bignum other; other.AssignUInt64(operand); AddBignum(other); @@ -181,8 +177,8 @@ void Bignum::AddUInt64(uint64_t operand) { void Bignum::AddBignum(const Bignum& other) { - ASSERT(IsClamped()); - ASSERT(other.IsClamped()); + DOUBLE_CONVERSION_ASSERT(IsClamped()); + DOUBLE_CONVERSION_ASSERT(other.IsClamped()); // If this has a greater exponent than other append zero-bigits to this. // After this call exponent_ <= other.exponent_. @@ -200,48 +196,52 @@ void Bignum::AddBignum(const Bignum& other) { // cccccccccccc 0000 // In both cases we might need a carry bigit. - EnsureCapacity(1 + Max(BigitLength(), other.BigitLength()) - exponent_); + EnsureCapacity(1 + (std::max)(BigitLength(), other.BigitLength()) - exponent_); Chunk carry = 0; int bigit_pos = other.exponent_ - exponent_; - ASSERT(bigit_pos >= 0); - for (int i = 0; i < other.used_digits_; ++i) { - Chunk sum = bigits_[bigit_pos] + other.bigits_[i] + carry; - bigits_[bigit_pos] = sum & kBigitMask; + DOUBLE_CONVERSION_ASSERT(bigit_pos >= 0); + for (int i = used_bigits_; i < bigit_pos; ++i) { + RawBigit(i) = 0; + } + for (int i = 0; i < other.used_bigits_; ++i) { + const Chunk my = (bigit_pos < used_bigits_) ? RawBigit(bigit_pos) : 0; + const Chunk sum = my + other.RawBigit(i) + carry; + RawBigit(bigit_pos) = sum & kBigitMask; carry = sum >> kBigitSize; - bigit_pos++; + ++bigit_pos; } - while (carry != 0) { - Chunk sum = bigits_[bigit_pos] + carry; - bigits_[bigit_pos] = sum & kBigitMask; + const Chunk my = (bigit_pos < used_bigits_) ? RawBigit(bigit_pos) : 0; + const Chunk sum = my + carry; + RawBigit(bigit_pos) = sum & kBigitMask; carry = sum >> kBigitSize; - bigit_pos++; + ++bigit_pos; } - used_digits_ = Max(bigit_pos, used_digits_); - ASSERT(IsClamped()); + used_bigits_ = (std::max)(bigit_pos, static_cast(used_bigits_)); + DOUBLE_CONVERSION_ASSERT(IsClamped()); } void Bignum::SubtractBignum(const Bignum& other) { - ASSERT(IsClamped()); - ASSERT(other.IsClamped()); + DOUBLE_CONVERSION_ASSERT(IsClamped()); + DOUBLE_CONVERSION_ASSERT(other.IsClamped()); // We require this to be bigger than other. - ASSERT(LessEqual(other, *this)); + DOUBLE_CONVERSION_ASSERT(LessEqual(other, *this)); Align(other); - int offset = other.exponent_ - exponent_; + const int offset = other.exponent_ - exponent_; Chunk borrow = 0; int i; - for (i = 0; i < other.used_digits_; ++i) { - ASSERT((borrow == 0) || (borrow == 1)); - Chunk difference = bigits_[i + offset] - other.bigits_[i] - borrow; - bigits_[i + offset] = difference & kBigitMask; + for (i = 0; i < other.used_bigits_; ++i) { + DOUBLE_CONVERSION_ASSERT((borrow == 0) || (borrow == 1)); + const Chunk difference = RawBigit(i + offset) - other.RawBigit(i) - borrow; + RawBigit(i + offset) = difference & kBigitMask; borrow = difference >> (kChunkSize - 1); } while (borrow != 0) { - Chunk difference = bigits_[i + offset] - borrow; - bigits_[i + offset] = difference & kBigitMask; + const Chunk difference = RawBigit(i + offset) - borrow; + RawBigit(i + offset) = difference & kBigitMask; borrow = difference >> (kChunkSize - 1); ++i; } @@ -249,91 +249,105 @@ void Bignum::SubtractBignum(const Bignum& other) { } -void Bignum::ShiftLeft(int shift_amount) { - if (used_digits_ == 0) return; - exponent_ += shift_amount / kBigitSize; - int local_shift = shift_amount % kBigitSize; - EnsureCapacity(used_digits_ + 1); +void Bignum::ShiftLeft(const int shift_amount) { + if (used_bigits_ == 0) { + return; + } + exponent_ += (shift_amount / kBigitSize); + const int local_shift = shift_amount % kBigitSize; + EnsureCapacity(used_bigits_ + 1); BigitsShiftLeft(local_shift); } -void Bignum::MultiplyByUInt32(uint32_t factor) { - if (factor == 1) return; +void Bignum::MultiplyByUInt32(const uint32_t factor) { + if (factor == 1) { + return; + } if (factor == 0) { Zero(); return; } - if (used_digits_ == 0) return; - + if (used_bigits_ == 0) { + return; + } // The product of a bigit with the factor is of size kBigitSize + 32. // Assert that this number + 1 (for the carry) fits into double chunk. - ASSERT(kDoubleChunkSize >= kBigitSize + 32 + 1); + DOUBLE_CONVERSION_ASSERT(kDoubleChunkSize >= kBigitSize + 32 + 1); DoubleChunk carry = 0; - for (int i = 0; i < used_digits_; ++i) { - DoubleChunk product = static_cast(factor) * bigits_[i] + carry; - bigits_[i] = static_cast(product & kBigitMask); + for (int i = 0; i < used_bigits_; ++i) { + const DoubleChunk product = static_cast(factor) * RawBigit(i) + carry; + RawBigit(i) = static_cast(product & kBigitMask); carry = (product >> kBigitSize); } while (carry != 0) { - EnsureCapacity(used_digits_ + 1); - bigits_[used_digits_] = carry & kBigitMask; - used_digits_++; + EnsureCapacity(used_bigits_ + 1); + RawBigit(used_bigits_) = carry & kBigitMask; + used_bigits_++; carry >>= kBigitSize; } } -void Bignum::MultiplyByUInt64(uint64_t factor) { - if (factor == 1) return; +void Bignum::MultiplyByUInt64(const uint64_t factor) { + if (factor == 1) { + return; + } if (factor == 0) { Zero(); return; } - ASSERT(kBigitSize < 32); + if (used_bigits_ == 0) { + return; + } + DOUBLE_CONVERSION_ASSERT(kBigitSize < 32); uint64_t carry = 0; - uint64_t low = factor & 0xFFFFFFFF; - uint64_t high = factor >> 32; - for (int i = 0; i < used_digits_; ++i) { - uint64_t product_low = low * bigits_[i]; - uint64_t product_high = high * bigits_[i]; - uint64_t tmp = (carry & kBigitMask) + product_low; - bigits_[i] = tmp & kBigitMask; + const uint64_t low = factor & 0xFFFFFFFF; + const uint64_t high = factor >> 32; + for (int i = 0; i < used_bigits_; ++i) { + const uint64_t product_low = low * RawBigit(i); + const uint64_t product_high = high * RawBigit(i); + const uint64_t tmp = (carry & kBigitMask) + product_low; + RawBigit(i) = tmp & kBigitMask; carry = (carry >> kBigitSize) + (tmp >> kBigitSize) + (product_high << (32 - kBigitSize)); } while (carry != 0) { - EnsureCapacity(used_digits_ + 1); - bigits_[used_digits_] = carry & kBigitMask; - used_digits_++; + EnsureCapacity(used_bigits_ + 1); + RawBigit(used_bigits_) = carry & kBigitMask; + used_bigits_++; carry >>= kBigitSize; } } -void Bignum::MultiplyByPowerOfTen(int exponent) { - const uint64_t kFive27 = UINT64_2PART_C(0x6765c793, fa10079d); - const uint16_t kFive1 = 5; - const uint16_t kFive2 = kFive1 * 5; - const uint16_t kFive3 = kFive2 * 5; - const uint16_t kFive4 = kFive3 * 5; - const uint16_t kFive5 = kFive4 * 5; - const uint16_t kFive6 = kFive5 * 5; - const uint32_t kFive7 = kFive6 * 5; - const uint32_t kFive8 = kFive7 * 5; - const uint32_t kFive9 = kFive8 * 5; - const uint32_t kFive10 = kFive9 * 5; - const uint32_t kFive11 = kFive10 * 5; - const uint32_t kFive12 = kFive11 * 5; - const uint32_t kFive13 = kFive12 * 5; - const uint32_t kFive1_to_12[] = +void Bignum::MultiplyByPowerOfTen(const int exponent) { + static const uint64_t kFive27 = DOUBLE_CONVERSION_UINT64_2PART_C(0x6765c793, fa10079d); + static const uint16_t kFive1 = 5; + static const uint16_t kFive2 = kFive1 * 5; + static const uint16_t kFive3 = kFive2 * 5; + static const uint16_t kFive4 = kFive3 * 5; + static const uint16_t kFive5 = kFive4 * 5; + static const uint16_t kFive6 = kFive5 * 5; + static const uint32_t kFive7 = kFive6 * 5; + static const uint32_t kFive8 = kFive7 * 5; + static const uint32_t kFive9 = kFive8 * 5; + static const uint32_t kFive10 = kFive9 * 5; + static const uint32_t kFive11 = kFive10 * 5; + static const uint32_t kFive12 = kFive11 * 5; + static const uint32_t kFive13 = kFive12 * 5; + static const uint32_t kFive1_to_12[] = { kFive1, kFive2, kFive3, kFive4, kFive5, kFive6, kFive7, kFive8, kFive9, kFive10, kFive11, kFive12 }; - ASSERT(exponent >= 0); - if (exponent == 0) return; - if (used_digits_ == 0) return; + DOUBLE_CONVERSION_ASSERT(exponent >= 0); + if (exponent == 0) { + return; + } + if (used_bigits_ == 0) { + return; + } // We shift by exponent at the end just before returning. int remaining_exponent = exponent; while (remaining_exponent >= 27) { @@ -352,8 +366,8 @@ void Bignum::MultiplyByPowerOfTen(int exponent) { void Bignum::Square() { - ASSERT(IsClamped()); - int product_length = 2 * used_digits_; + DOUBLE_CONVERSION_ASSERT(IsClamped()); + const int product_length = 2 * used_bigits_; EnsureCapacity(product_length); // Comba multiplication: compute each column separately. @@ -368,64 +382,64 @@ void Bignum::Square() { // // Assert that the additional number of bits in a DoubleChunk are enough to // sum up used_digits of Bigit*Bigit. - if ((1 << (2 * (kChunkSize - kBigitSize))) <= used_digits_) { - UNIMPLEMENTED(); + if ((1 << (2 * (kChunkSize - kBigitSize))) <= used_bigits_) { + DOUBLE_CONVERSION_UNIMPLEMENTED(); } DoubleChunk accumulator = 0; // First shift the digits so we don't overwrite them. - int copy_offset = used_digits_; - for (int i = 0; i < used_digits_; ++i) { - bigits_[copy_offset + i] = bigits_[i]; + const int copy_offset = used_bigits_; + for (int i = 0; i < used_bigits_; ++i) { + RawBigit(copy_offset + i) = RawBigit(i); } // We have two loops to avoid some 'if's in the loop. - for (int i = 0; i < used_digits_; ++i) { + for (int i = 0; i < used_bigits_; ++i) { // Process temporary digit i with power i. // The sum of the two indices must be equal to i. int bigit_index1 = i; int bigit_index2 = 0; // Sum all of the sub-products. while (bigit_index1 >= 0) { - Chunk chunk1 = bigits_[copy_offset + bigit_index1]; - Chunk chunk2 = bigits_[copy_offset + bigit_index2]; + const Chunk chunk1 = RawBigit(copy_offset + bigit_index1); + const Chunk chunk2 = RawBigit(copy_offset + bigit_index2); accumulator += static_cast(chunk1) * chunk2; bigit_index1--; bigit_index2++; } - bigits_[i] = static_cast(accumulator) & kBigitMask; + RawBigit(i) = static_cast(accumulator) & kBigitMask; accumulator >>= kBigitSize; } - for (int i = used_digits_; i < product_length; ++i) { - int bigit_index1 = used_digits_ - 1; + for (int i = used_bigits_; i < product_length; ++i) { + int bigit_index1 = used_bigits_ - 1; int bigit_index2 = i - bigit_index1; // Invariant: sum of both indices is again equal to i. // Inner loop runs 0 times on last iteration, emptying accumulator. - while (bigit_index2 < used_digits_) { - Chunk chunk1 = bigits_[copy_offset + bigit_index1]; - Chunk chunk2 = bigits_[copy_offset + bigit_index2]; + while (bigit_index2 < used_bigits_) { + const Chunk chunk1 = RawBigit(copy_offset + bigit_index1); + const Chunk chunk2 = RawBigit(copy_offset + bigit_index2); accumulator += static_cast(chunk1) * chunk2; bigit_index1--; bigit_index2++; } - // The overwritten bigits_[i] will never be read in further loop iterations, + // The overwritten RawBigit(i) will never be read in further loop iterations, // because bigit_index1 and bigit_index2 are always greater - // than i - used_digits_. - bigits_[i] = static_cast(accumulator) & kBigitMask; + // than i - used_bigits_. + RawBigit(i) = static_cast(accumulator) & kBigitMask; accumulator >>= kBigitSize; } // Since the result was guaranteed to lie inside the number the // accumulator must be 0 now. - ASSERT(accumulator == 0); + DOUBLE_CONVERSION_ASSERT(accumulator == 0); // Don't forget to update the used_digits and the exponent. - used_digits_ = product_length; + used_bigits_ = product_length; exponent_ *= 2; Clamp(); } -void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) { - ASSERT(base != 0); - ASSERT(power_exponent >= 0); +void Bignum::AssignPowerUInt16(uint16_t base, const int power_exponent) { + DOUBLE_CONVERSION_ASSERT(base != 0); + DOUBLE_CONVERSION_ASSERT(power_exponent >= 0); if (power_exponent == 0) { AssignUInt16(1); return; @@ -445,7 +459,7 @@ void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) { tmp_base >>= 1; bit_size++; } - int final_size = bit_size * power_exponent; + const int final_size = bit_size * power_exponent; // 1 extra bigit for the shifting, and one for rounded final_size. EnsureCapacity(final_size / kBigitSize + 2); @@ -466,10 +480,10 @@ void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) { // Verify that there is enough space in this_value to perform the // multiplication. The first bit_size bits must be 0. if ((power_exponent & mask) != 0) { - ASSERT(bit_size > 0); - uint64_t base_bits_mask = - ~((static_cast(1) << (64 - bit_size)) - 1); - bool high_bits_zero = (this_value & base_bits_mask) == 0; + DOUBLE_CONVERSION_ASSERT(bit_size > 0); + const uint64_t base_bits_mask = + ~((static_cast(1) << (64 - bit_size)) - 1); + const bool high_bits_zero = (this_value & base_bits_mask) == 0; if (high_bits_zero) { this_value *= base; } else { @@ -499,9 +513,9 @@ void Bignum::AssignPowerUInt16(uint16_t base, int power_exponent) { // Precondition: this/other < 16bit. uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) { - ASSERT(IsClamped()); - ASSERT(other.IsClamped()); - ASSERT(other.used_digits_ > 0); + DOUBLE_CONVERSION_ASSERT(IsClamped()); + DOUBLE_CONVERSION_ASSERT(other.IsClamped()); + DOUBLE_CONVERSION_ASSERT(other.used_bigits_ > 0); // Easy case: if we have less digits than the divisor than the result is 0. // Note: this handles the case where this == 0, too. @@ -519,34 +533,34 @@ uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) { // This naive approach is extremely inefficient if `this` divided by other // is big. This function is implemented for doubleToString where // the result should be small (less than 10). - ASSERT(other.bigits_[other.used_digits_ - 1] >= ((1 << kBigitSize) / 16)); - ASSERT(bigits_[used_digits_ - 1] < 0x10000); + DOUBLE_CONVERSION_ASSERT(other.RawBigit(other.used_bigits_ - 1) >= ((1 << kBigitSize) / 16)); + DOUBLE_CONVERSION_ASSERT(RawBigit(used_bigits_ - 1) < 0x10000); // Remove the multiples of the first digit. // Example this = 23 and other equals 9. -> Remove 2 multiples. - result += static_cast(bigits_[used_digits_ - 1]); - SubtractTimes(other, bigits_[used_digits_ - 1]); + result += static_cast(RawBigit(used_bigits_ - 1)); + SubtractTimes(other, RawBigit(used_bigits_ - 1)); } - ASSERT(BigitLength() == other.BigitLength()); + DOUBLE_CONVERSION_ASSERT(BigitLength() == other.BigitLength()); // Both bignums are at the same length now. // Since other has more than 0 digits we know that the access to - // bigits_[used_digits_ - 1] is safe. - Chunk this_bigit = bigits_[used_digits_ - 1]; - Chunk other_bigit = other.bigits_[other.used_digits_ - 1]; + // RawBigit(used_bigits_ - 1) is safe. + const Chunk this_bigit = RawBigit(used_bigits_ - 1); + const Chunk other_bigit = other.RawBigit(other.used_bigits_ - 1); - if (other.used_digits_ == 1) { + if (other.used_bigits_ == 1) { // Shortcut for easy (and common) case. int quotient = this_bigit / other_bigit; - bigits_[used_digits_ - 1] = this_bigit - other_bigit * quotient; - ASSERT(quotient < 0x10000); + RawBigit(used_bigits_ - 1) = this_bigit - other_bigit * quotient; + DOUBLE_CONVERSION_ASSERT(quotient < 0x10000); result += static_cast(quotient); Clamp(); return result; } - int division_estimate = this_bigit / (other_bigit + 1); - ASSERT(division_estimate < 0x10000); + const int division_estimate = this_bigit / (other_bigit + 1); + DOUBLE_CONVERSION_ASSERT(division_estimate < 0x10000); result += static_cast(division_estimate); SubtractTimes(other, division_estimate); @@ -566,7 +580,7 @@ uint16_t Bignum::DivideModuloIntBignum(const Bignum& other) { template static int SizeInHexChars(S number) { - ASSERT(number > 0); + DOUBLE_CONVERSION_ASSERT(number > 0); int result = 0; while (number != 0) { number >>= 4; @@ -576,29 +590,35 @@ static int SizeInHexChars(S number) { } -static char HexCharOfValue(int value) { - ASSERT(0 <= value && value <= 16); - if (value < 10) return static_cast(value + '0'); +static char HexCharOfValue(const int value) { + DOUBLE_CONVERSION_ASSERT(0 <= value && value <= 16); + if (value < 10) { + return static_cast(value + '0'); + } return static_cast(value - 10 + 'A'); } -bool Bignum::ToHexString(char* buffer, int buffer_size) const { - ASSERT(IsClamped()); +bool Bignum::ToHexString(char* buffer, const int buffer_size) const { + DOUBLE_CONVERSION_ASSERT(IsClamped()); // Each bigit must be printable as separate hex-character. - ASSERT(kBigitSize % 4 == 0); - const int kHexCharsPerBigit = kBigitSize / 4; + DOUBLE_CONVERSION_ASSERT(kBigitSize % 4 == 0); + static const int kHexCharsPerBigit = kBigitSize / 4; - if (used_digits_ == 0) { - if (buffer_size < 2) return false; + if (used_bigits_ == 0) { + if (buffer_size < 2) { + return false; + } buffer[0] = '0'; buffer[1] = '\0'; return true; } // We add 1 for the terminating '\0' character. - int needed_chars = (BigitLength() - 1) * kHexCharsPerBigit + - SizeInHexChars(bigits_[used_digits_ - 1]) + 1; - if (needed_chars > buffer_size) return false; + const int needed_chars = (BigitLength() - 1) * kHexCharsPerBigit + + SizeInHexChars(RawBigit(used_bigits_ - 1)) + 1; + if (needed_chars > buffer_size) { + return false; + } int string_index = needed_chars - 1; buffer[string_index--] = '\0'; for (int i = 0; i < exponent_; ++i) { @@ -606,15 +626,15 @@ bool Bignum::ToHexString(char* buffer, int buffer_size) const { buffer[string_index--] = '0'; } } - for (int i = 0; i < used_digits_ - 1; ++i) { - Chunk current_bigit = bigits_[i]; + for (int i = 0; i < used_bigits_ - 1; ++i) { + Chunk current_bigit = RawBigit(i); for (int j = 0; j < kHexCharsPerBigit; ++j) { buffer[string_index--] = HexCharOfValue(current_bigit & 0xF); current_bigit >>= 4; } } // And finally the last bigit. - Chunk most_significant_bigit = bigits_[used_digits_ - 1]; + Chunk most_significant_bigit = RawBigit(used_bigits_ - 1); while (most_significant_bigit != 0) { buffer[string_index--] = HexCharOfValue(most_significant_bigit & 0xF); most_significant_bigit >>= 4; @@ -623,25 +643,37 @@ bool Bignum::ToHexString(char* buffer, int buffer_size) const { } -Bignum::Chunk Bignum::BigitAt(int index) const { - if (index >= BigitLength()) return 0; - if (index < exponent_) return 0; - return bigits_[index - exponent_]; +Bignum::Chunk Bignum::BigitOrZero(const int index) const { + if (index >= BigitLength()) { + return 0; + } + if (index < exponent_) { + return 0; + } + return RawBigit(index - exponent_); } int Bignum::Compare(const Bignum& a, const Bignum& b) { - ASSERT(a.IsClamped()); - ASSERT(b.IsClamped()); - int bigit_length_a = a.BigitLength(); - int bigit_length_b = b.BigitLength(); - if (bigit_length_a < bigit_length_b) return -1; - if (bigit_length_a > bigit_length_b) return +1; - for (int i = bigit_length_a - 1; i >= Min(a.exponent_, b.exponent_); --i) { - Chunk bigit_a = a.BigitAt(i); - Chunk bigit_b = b.BigitAt(i); - if (bigit_a < bigit_b) return -1; - if (bigit_a > bigit_b) return +1; + DOUBLE_CONVERSION_ASSERT(a.IsClamped()); + DOUBLE_CONVERSION_ASSERT(b.IsClamped()); + const int bigit_length_a = a.BigitLength(); + const int bigit_length_b = b.BigitLength(); + if (bigit_length_a < bigit_length_b) { + return -1; + } + if (bigit_length_a > bigit_length_b) { + return +1; + } + for (int i = bigit_length_a - 1; i >= (std::min)(a.exponent_, b.exponent_); --i) { + const Chunk bigit_a = a.BigitOrZero(i); + const Chunk bigit_b = b.BigitOrZero(i); + if (bigit_a < bigit_b) { + return -1; + } + if (bigit_a > bigit_b) { + return +1; + } // Otherwise they are equal up to this digit. Try the next digit. } return 0; @@ -649,14 +681,18 @@ int Bignum::Compare(const Bignum& a, const Bignum& b) { int Bignum::PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c) { - ASSERT(a.IsClamped()); - ASSERT(b.IsClamped()); - ASSERT(c.IsClamped()); + DOUBLE_CONVERSION_ASSERT(a.IsClamped()); + DOUBLE_CONVERSION_ASSERT(b.IsClamped()); + DOUBLE_CONVERSION_ASSERT(c.IsClamped()); if (a.BigitLength() < b.BigitLength()) { return PlusCompare(b, a, c); } - if (a.BigitLength() + 1 < c.BigitLength()) return -1; - if (a.BigitLength() > c.BigitLength()) return +1; + if (a.BigitLength() + 1 < c.BigitLength()) { + return -1; + } + if (a.BigitLength() > c.BigitLength()) { + return +1; + } // The exponent encodes 0-bigits. So if there are more 0-digits in 'a' than // 'b' has digits, then the bigit-length of 'a'+'b' must be equal to the one // of 'a'. @@ -666,92 +702,83 @@ int Bignum::PlusCompare(const Bignum& a, const Bignum& b, const Bignum& c) { Chunk borrow = 0; // Starting at min_exponent all digits are == 0. So no need to compare them. - int min_exponent = Min(Min(a.exponent_, b.exponent_), c.exponent_); + const int min_exponent = (std::min)((std::min)(a.exponent_, b.exponent_), c.exponent_); for (int i = c.BigitLength() - 1; i >= min_exponent; --i) { - Chunk chunk_a = a.BigitAt(i); - Chunk chunk_b = b.BigitAt(i); - Chunk chunk_c = c.BigitAt(i); - Chunk sum = chunk_a + chunk_b; + const Chunk chunk_a = a.BigitOrZero(i); + const Chunk chunk_b = b.BigitOrZero(i); + const Chunk chunk_c = c.BigitOrZero(i); + const Chunk sum = chunk_a + chunk_b; if (sum > chunk_c + borrow) { return +1; } else { borrow = chunk_c + borrow - sum; - if (borrow > 1) return -1; + if (borrow > 1) { + return -1; + } borrow <<= kBigitSize; } } - if (borrow == 0) return 0; + if (borrow == 0) { + return 0; + } return -1; } void Bignum::Clamp() { - while (used_digits_ > 0 && bigits_[used_digits_ - 1] == 0) { - used_digits_--; + while (used_bigits_ > 0 && RawBigit(used_bigits_ - 1) == 0) { + used_bigits_--; } - if (used_digits_ == 0) { + if (used_bigits_ == 0) { // Zero. exponent_ = 0; } } -bool Bignum::IsClamped() const { - return used_digits_ == 0 || bigits_[used_digits_ - 1] != 0; -} - - -void Bignum::Zero() { - for (int i = 0; i < used_digits_; ++i) { - bigits_[i] = 0; - } - used_digits_ = 0; - exponent_ = 0; -} - - void Bignum::Align(const Bignum& other) { if (exponent_ > other.exponent_) { - // If "X" represents a "hidden" digit (by the exponent) then we are in the + // If "X" represents a "hidden" bigit (by the exponent) then we are in the // following case (a == this, b == other): // a: aaaaaaXXXX or a: aaaaaXXX // b: bbbbbbX b: bbbbbbbbXX // We replace some of the hidden digits (X) of a with 0 digits. // a: aaaaaa000X or a: aaaaa0XX - int zero_digits = exponent_ - other.exponent_; - EnsureCapacity(used_digits_ + zero_digits); - for (int i = used_digits_ - 1; i >= 0; --i) { - bigits_[i + zero_digits] = bigits_[i]; + const int zero_bigits = exponent_ - other.exponent_; + EnsureCapacity(used_bigits_ + zero_bigits); + for (int i = used_bigits_ - 1; i >= 0; --i) { + RawBigit(i + zero_bigits) = RawBigit(i); } - for (int i = 0; i < zero_digits; ++i) { - bigits_[i] = 0; + for (int i = 0; i < zero_bigits; ++i) { + RawBigit(i) = 0; } - used_digits_ += zero_digits; - exponent_ -= zero_digits; - ASSERT(used_digits_ >= 0); - ASSERT(exponent_ >= 0); + used_bigits_ += zero_bigits; + exponent_ -= zero_bigits; + + DOUBLE_CONVERSION_ASSERT(used_bigits_ >= 0); + DOUBLE_CONVERSION_ASSERT(exponent_ >= 0); } } -void Bignum::BigitsShiftLeft(int shift_amount) { - ASSERT(shift_amount < kBigitSize); - ASSERT(shift_amount >= 0); +void Bignum::BigitsShiftLeft(const int shift_amount) { + DOUBLE_CONVERSION_ASSERT(shift_amount < kBigitSize); + DOUBLE_CONVERSION_ASSERT(shift_amount >= 0); Chunk carry = 0; - for (int i = 0; i < used_digits_; ++i) { - Chunk new_carry = bigits_[i] >> (kBigitSize - shift_amount); - bigits_[i] = ((bigits_[i] << shift_amount) + carry) & kBigitMask; + for (int i = 0; i < used_bigits_; ++i) { + const Chunk new_carry = RawBigit(i) >> (kBigitSize - shift_amount); + RawBigit(i) = ((RawBigit(i) << shift_amount) + carry) & kBigitMask; carry = new_carry; } if (carry != 0) { - bigits_[used_digits_] = carry; - used_digits_++; + RawBigit(used_bigits_) = carry; + used_bigits_++; } } -void Bignum::SubtractTimes(const Bignum& other, int factor) { - ASSERT(exponent_ <= other.exponent_); +void Bignum::SubtractTimes(const Bignum& other, const int factor) { + DOUBLE_CONVERSION_ASSERT(exponent_ <= other.exponent_); if (factor < 3) { for (int i = 0; i < factor; ++i) { SubtractBignum(other); @@ -759,19 +786,21 @@ void Bignum::SubtractTimes(const Bignum& other, int factor) { return; } Chunk borrow = 0; - int exponent_diff = other.exponent_ - exponent_; - for (int i = 0; i < other.used_digits_; ++i) { - DoubleChunk product = static_cast(factor) * other.bigits_[i]; - DoubleChunk remove = borrow + product; - Chunk difference = bigits_[i + exponent_diff] - (remove & kBigitMask); - bigits_[i + exponent_diff] = difference & kBigitMask; + const int exponent_diff = other.exponent_ - exponent_; + for (int i = 0; i < other.used_bigits_; ++i) { + const DoubleChunk product = static_cast(factor) * other.RawBigit(i); + const DoubleChunk remove = borrow + product; + const Chunk difference = RawBigit(i + exponent_diff) - (remove & kBigitMask); + RawBigit(i + exponent_diff) = difference & kBigitMask; borrow = static_cast((difference >> (kChunkSize - 1)) + (remove >> kBigitSize)); } - for (int i = other.used_digits_ + exponent_diff; i < used_digits_; ++i) { - if (borrow == 0) return; - Chunk difference = bigits_[i] - borrow; - bigits_[i] = difference & kBigitMask; + for (int i = other.used_bigits_ + exponent_diff; i < used_bigits_; ++i) { + if (borrow == 0) { + return; + } + const Chunk difference = RawBigit(i) - borrow; + RawBigit(i) = difference & kBigitMask; borrow = difference >> (kChunkSize - 1); } Clamp(); diff --git a/deps/icu-small/source/i18n/double-conversion-bignum.h b/deps/icu-small/source/i18n/double-conversion-bignum.h index d39a3dee010d8b..bae900a15a7420 100644 --- a/deps/icu-small/source/i18n/double-conversion-bignum.h +++ b/deps/icu-small/source/i18n/double-conversion-bignum.h @@ -53,26 +53,27 @@ class Bignum { // exponent. static const int kMaxSignificantBits = 3584; - Bignum(); - void AssignUInt16(uint16_t value); + Bignum() : used_bigits_(0), exponent_(0) {} + + void AssignUInt16(const uint16_t value); void AssignUInt64(uint64_t value); void AssignBignum(const Bignum& other); - void AssignDecimalString(Vector value); - void AssignHexString(Vector value); + void AssignDecimalString(const Vector value); + void AssignHexString(const Vector value); - void AssignPowerUInt16(uint16_t base, int exponent); + void AssignPowerUInt16(uint16_t base, const int exponent); - void AddUInt64(uint64_t operand); + void AddUInt64(const uint64_t operand); void AddBignum(const Bignum& other); // Precondition: this >= other. void SubtractBignum(const Bignum& other); void Square(); - void ShiftLeft(int shift_amount); - void MultiplyByUInt32(uint32_t factor); - void MultiplyByUInt64(uint64_t factor); - void MultiplyByPowerOfTen(int exponent); + void ShiftLeft(const int shift_amount); + void MultiplyByUInt32(const uint32_t factor); + void MultiplyByUInt64(const uint64_t factor); + void MultiplyByPowerOfTen(const int exponent); void Times10() { return MultiplyByUInt32(10); } // Pseudocode: // int result = this / other; @@ -80,7 +81,7 @@ class Bignum { // In the worst case this function is in O(this/other). uint16_t DivideModuloIntBignum(const Bignum& other); - bool ToHexString(char* buffer, int buffer_size) const; + bool ToHexString(char* buffer, const int buffer_size) const; // Returns // -1 if a < b, @@ -124,33 +125,40 @@ class Bignum { // grow. There are no checks if the stack-allocated space is sufficient. static const int kBigitCapacity = kMaxSignificantBits / kBigitSize; - void EnsureCapacity(int size) { + static void EnsureCapacity(const int size) { if (size > kBigitCapacity) { - UNREACHABLE(); + DOUBLE_CONVERSION_UNREACHABLE(); } } void Align(const Bignum& other); void Clamp(); - bool IsClamped() const; - void Zero(); + bool IsClamped() const { + return used_bigits_ == 0 || RawBigit(used_bigits_ - 1) != 0; + } + void Zero() { + used_bigits_ = 0; + exponent_ = 0; + } // Requires this to have enough capacity (no tests done). - // Updates used_digits_ if necessary. + // Updates used_bigits_ if necessary. // shift_amount must be < kBigitSize. - void BigitsShiftLeft(int shift_amount); - // BigitLength includes the "hidden" digits encoded in the exponent. - int BigitLength() const { return used_digits_ + exponent_; } - Chunk BigitAt(int index) const; - void SubtractTimes(const Bignum& other, int factor); - + void BigitsShiftLeft(const int shift_amount); + // BigitLength includes the "hidden" bigits encoded in the exponent. + int BigitLength() const { return used_bigits_ + exponent_; } + Chunk& RawBigit(const int index); + const Chunk& RawBigit(const int index) const; + Chunk BigitOrZero(const int index) const; + void SubtractTimes(const Bignum& other, const int factor); + + // The Bignum's value is value(bigits_buffer_) * 2^(exponent_ * kBigitSize), + // where the value of the buffer consists of the lower kBigitSize bits of + // the first used_bigits_ Chunks in bigits_buffer_, first chunk has lowest + // significant bits. + int16_t used_bigits_; + int16_t exponent_; Chunk bigits_buffer_[kBigitCapacity]; - // A vector backed by bigits_buffer_. This way accesses to the array are - // checked for out-of-bounds errors. - Vector bigits_; - int used_digits_; - // The Bignum's value equals value(bigits_) * 2^(exponent_ * kBigitSize). - int exponent_; - - DC_DISALLOW_COPY_AND_ASSIGN(Bignum); + + DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(Bignum); }; } // namespace double_conversion diff --git a/deps/icu-small/source/i18n/double-conversion-cached-powers.cpp b/deps/icu-small/source/i18n/double-conversion-cached-powers.cpp index e1b66d2c65c82e..3bc35c8aaf81dc 100644 --- a/deps/icu-small/source/i18n/double-conversion-cached-powers.cpp +++ b/deps/icu-small/source/i18n/double-conversion-cached-powers.cpp @@ -49,6 +49,8 @@ U_NAMESPACE_BEGIN namespace double_conversion { +namespace PowersOfTenCache { + struct CachedPower { uint64_t significand; int16_t binary_exponent; @@ -56,103 +58,99 @@ struct CachedPower { }; static const CachedPower kCachedPowers[] = { - {UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348}, - {UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340}, - {UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332}, - {UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324}, - {UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316}, - {UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308}, - {UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300}, - {UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292}, - {UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284}, - {UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276}, - {UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268}, - {UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260}, - {UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252}, - {UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244}, - {UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236}, - {UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228}, - {UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220}, - {UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212}, - {UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204}, - {UINT64_2PART_C(0xef340a98, 172aace5), -715, -196}, - {UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188}, - {UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180}, - {UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172}, - {UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164}, - {UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156}, - {UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148}, - {UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140}, - {UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132}, - {UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124}, - {UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116}, - {UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108}, - {UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100}, - {UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92}, - {UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84}, - {UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76}, - {UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68}, - {UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60}, - {UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52}, - {UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44}, - {UINT64_2PART_C(0xaa242499, 697392d3), -183, -36}, - {UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28}, - {UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20}, - {UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12}, - {UINT64_2PART_C(0xd1b71758, e219652c), -77, -4}, - {UINT64_2PART_C(0x9c400000, 00000000), -50, 4}, - {UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12}, - {UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20}, - {UINT64_2PART_C(0x813f3978, f8940984), 30, 28}, - {UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36}, - {UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44}, - {UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52}, - {UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60}, - {UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68}, - {UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76}, - {UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84}, - {UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92}, - {UINT64_2PART_C(0x924d692c, a61be758), 269, 100}, - {UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108}, - {UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116}, - {UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124}, - {UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132}, - {UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140}, - {UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148}, - {UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156}, - {UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164}, - {UINT64_2PART_C(0xa59bc234, db398c25), 508, 172}, - {UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180}, - {UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188}, - {UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196}, - {UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204}, - {UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212}, - {UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220}, - {UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228}, - {UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236}, - {UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244}, - {UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252}, - {UINT64_2PART_C(0xd01fef10, a657842c), 800, 260}, - {UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268}, - {UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276}, - {UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284}, - {UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292}, - {UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300}, - {UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308}, - {UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316}, - {UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324}, - {UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332}, - {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xef340a98, 172aace5), -715, -196}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xaa242499, 697392d3), -183, -36}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xd1b71758, e219652c), -77, -4}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x9c400000, 00000000), -50, 4}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x813f3978, f8940984), 30, 28}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x924d692c, a61be758), 269, 100}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xa59bc234, db398c25), 508, 172}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xd01fef10, a657842c), 800, 260}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332}, + {DOUBLE_CONVERSION_UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340}, }; static const int kCachedPowersOffset = 348; // -1 * the first decimal_exponent. static const double kD_1_LOG2_10 = 0.30102999566398114; // 1 / lg(10) -// Difference between the decimal exponents in the table above. -const int PowersOfTenCache::kDecimalExponentDistance = 8; -const int PowersOfTenCache::kMinDecimalExponent = -348; -const int PowersOfTenCache::kMaxDecimalExponent = 340; -void PowersOfTenCache::GetCachedPowerForBinaryExponentRange( +void GetCachedPowerForBinaryExponentRange( int min_exponent, int max_exponent, DiyFp* power, @@ -162,30 +160,32 @@ void PowersOfTenCache::GetCachedPowerForBinaryExponentRange( int foo = kCachedPowersOffset; int index = (foo + static_cast(k) - 1) / kDecimalExponentDistance + 1; - ASSERT(0 <= index && index < static_cast(ARRAY_SIZE(kCachedPowers))); + DOUBLE_CONVERSION_ASSERT(0 <= index && index < static_cast(DOUBLE_CONVERSION_ARRAY_SIZE(kCachedPowers))); CachedPower cached_power = kCachedPowers[index]; - ASSERT(min_exponent <= cached_power.binary_exponent); + DOUBLE_CONVERSION_ASSERT(min_exponent <= cached_power.binary_exponent); (void) max_exponent; // Mark variable as used. - ASSERT(cached_power.binary_exponent <= max_exponent); + DOUBLE_CONVERSION_ASSERT(cached_power.binary_exponent <= max_exponent); *decimal_exponent = cached_power.decimal_exponent; *power = DiyFp(cached_power.significand, cached_power.binary_exponent); } -void PowersOfTenCache::GetCachedPowerForDecimalExponent(int requested_exponent, - DiyFp* power, - int* found_exponent) { - ASSERT(kMinDecimalExponent <= requested_exponent); - ASSERT(requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance); +void GetCachedPowerForDecimalExponent(int requested_exponent, + DiyFp* power, + int* found_exponent) { + DOUBLE_CONVERSION_ASSERT(kMinDecimalExponent <= requested_exponent); + DOUBLE_CONVERSION_ASSERT(requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance); int index = (requested_exponent + kCachedPowersOffset) / kDecimalExponentDistance; CachedPower cached_power = kCachedPowers[index]; *power = DiyFp(cached_power.significand, cached_power.binary_exponent); *found_exponent = cached_power.decimal_exponent; - ASSERT(*found_exponent <= requested_exponent); - ASSERT(requested_exponent < *found_exponent + kDecimalExponentDistance); + DOUBLE_CONVERSION_ASSERT(*found_exponent <= requested_exponent); + DOUBLE_CONVERSION_ASSERT(requested_exponent < *found_exponent + kDecimalExponentDistance); } +} // namespace PowersOfTenCache + } // namespace double_conversion // ICU PATCH: Close ICU namespace diff --git a/deps/icu-small/source/i18n/double-conversion-cached-powers.h b/deps/icu-small/source/i18n/double-conversion-cached-powers.h index 438746b143293f..ade27baef8b0c7 100644 --- a/deps/icu-small/source/i18n/double-conversion-cached-powers.h +++ b/deps/icu-small/source/i18n/double-conversion-cached-powers.h @@ -46,32 +46,32 @@ U_NAMESPACE_BEGIN namespace double_conversion { -class PowersOfTenCache { - public: +namespace PowersOfTenCache { // Not all powers of ten are cached. The decimal exponent of two neighboring // cached numbers will differ by kDecimalExponentDistance. - static const int kDecimalExponentDistance; + static const int kDecimalExponentDistance = 8; - static const int kMinDecimalExponent; - static const int kMaxDecimalExponent; + static const int kMinDecimalExponent = -348; + static const int kMaxDecimalExponent = 340; // Returns a cached power-of-ten with a binary exponent in the range // [min_exponent; max_exponent] (boundaries included). - static void GetCachedPowerForBinaryExponentRange(int min_exponent, - int max_exponent, - DiyFp* power, - int* decimal_exponent); + void GetCachedPowerForBinaryExponentRange(int min_exponent, + int max_exponent, + DiyFp* power, + int* decimal_exponent); // Returns a cached power of ten x ~= 10^k such that // k <= decimal_exponent < k + kCachedPowersDecimalDistance. // The given decimal_exponent must satisfy // kMinDecimalExponent <= requested_exponent, and // requested_exponent < kMaxDecimalExponent + kDecimalExponentDistance. - static void GetCachedPowerForDecimalExponent(int requested_exponent, - DiyFp* power, - int* found_exponent); -}; + void GetCachedPowerForDecimalExponent(int requested_exponent, + DiyFp* power, + int* found_exponent); + +} // namespace PowersOfTenCache } // namespace double_conversion diff --git a/deps/icu-small/source/i18n/double-conversion-diy-fp.cpp b/deps/icu-small/source/i18n/double-conversion-diy-fp.cpp deleted file mode 100644 index f38430c6c3c90f..00000000000000 --- a/deps/icu-small/source/i18n/double-conversion-diy-fp.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// © 2018 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// -// From the double-conversion library. Original license: -// -// Copyright 2010 the V8 project authors. 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 Google Inc. 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 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 -// OWNER 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. - -// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" -#if !UCONFIG_NO_FORMATTING - -// ICU PATCH: Customize header file paths for ICU. - -#include "double-conversion-diy-fp.h" -#include "double-conversion-utils.h" - -// ICU PATCH: Wrap in ICU namespace -U_NAMESPACE_BEGIN - -namespace double_conversion { - -void DiyFp::Multiply(const DiyFp& other) { - // Simply "emulates" a 128 bit multiplication. - // However: the resulting number only contains 64 bits. The least - // significant 64 bits are only used for rounding the most significant 64 - // bits. - const uint64_t kM32 = 0xFFFFFFFFU; - uint64_t a = f_ >> 32; - uint64_t b = f_ & kM32; - uint64_t c = other.f_ >> 32; - uint64_t d = other.f_ & kM32; - uint64_t ac = a * c; - uint64_t bc = b * c; - uint64_t ad = a * d; - uint64_t bd = b * d; - uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32); - // By adding 1U << 31 to tmp we round the final result. - // Halfway cases will be round up. - tmp += 1U << 31; - uint64_t result_f = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32); - e_ += other.e_ + 64; - f_ = result_f; -} - -} // namespace double_conversion - -// ICU PATCH: Close ICU namespace -U_NAMESPACE_END -#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/deps/icu-small/source/i18n/double-conversion-diy-fp.h b/deps/icu-small/source/i18n/double-conversion-diy-fp.h index 21896851d22d32..5820abedf35405 100644 --- a/deps/icu-small/source/i18n/double-conversion-diy-fp.h +++ b/deps/icu-small/source/i18n/double-conversion-diy-fp.h @@ -50,36 +50,55 @@ namespace double_conversion { // with a uint64 significand and an int exponent. Normalized DiyFp numbers will // have the most significant bit of the significand set. // Multiplication and Subtraction do not normalize their results. -// DiyFp are not designed to contain special doubles (NaN and Infinity). +// DiyFp store only non-negative numbers and are not designed to contain special +// doubles (NaN and Infinity). class DiyFp { public: static const int kSignificandSize = 64; DiyFp() : f_(0), e_(0) {} - DiyFp(uint64_t significand, int exponent) : f_(significand), e_(exponent) {} + DiyFp(const uint64_t significand, const int32_t exponent) : f_(significand), e_(exponent) {} - // this = this - other. + // this -= other. // The exponents of both numbers must be the same and the significand of this - // must be bigger than the significand of other. + // must be greater or equal than the significand of other. // The result will not be normalized. void Subtract(const DiyFp& other) { - ASSERT(e_ == other.e_); - ASSERT(f_ >= other.f_); + DOUBLE_CONVERSION_ASSERT(e_ == other.e_); + DOUBLE_CONVERSION_ASSERT(f_ >= other.f_); f_ -= other.f_; } // Returns a - b. - // The exponents of both numbers must be the same and this must be bigger - // than other. The result will not be normalized. + // The exponents of both numbers must be the same and a must be greater + // or equal than b. The result will not be normalized. static DiyFp Minus(const DiyFp& a, const DiyFp& b) { DiyFp result = a; result.Subtract(b); return result; } - - // this = this * other. - void Multiply(const DiyFp& other); + // this *= other. + void Multiply(const DiyFp& other) { + // Simply "emulates" a 128 bit multiplication. + // However: the resulting number only contains 64 bits. The least + // significant 64 bits are only used for rounding the most significant 64 + // bits. + const uint64_t kM32 = 0xFFFFFFFFU; + const uint64_t a = f_ >> 32; + const uint64_t b = f_ & kM32; + const uint64_t c = other.f_ >> 32; + const uint64_t d = other.f_ & kM32; + const uint64_t ac = a * c; + const uint64_t bc = b * c; + const uint64_t ad = a * d; + const uint64_t bd = b * d; + // By adding 1U << 31 to tmp we round the final result. + // Halfway cases will be rounded up. + const uint64_t tmp = (bd >> 32) + (ad & kM32) + (bc & kM32) + (1U << 31); + e_ += other.e_ + 64; + f_ = ac + (ad >> 32) + (bc >> 32) + (tmp >> 32); + } // returns a * b; static DiyFp Times(const DiyFp& a, const DiyFp& b) { @@ -89,13 +108,13 @@ class DiyFp { } void Normalize() { - ASSERT(f_ != 0); + DOUBLE_CONVERSION_ASSERT(f_ != 0); uint64_t significand = f_; - int exponent = e_; + int32_t exponent = e_; - // This method is mainly called for normalizing boundaries. In general - // boundaries need to be shifted by 10 bits. We thus optimize for this case. - const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000); + // This method is mainly called for normalizing boundaries. In general, + // boundaries need to be shifted by 10 bits, and we optimize for this case. + const uint64_t k10MSBits = DOUBLE_CONVERSION_UINT64_2PART_C(0xFFC00000, 00000000); while ((significand & k10MSBits) == 0) { significand <<= 10; exponent -= 10; @@ -115,16 +134,16 @@ class DiyFp { } uint64_t f() const { return f_; } - int e() const { return e_; } + int32_t e() const { return e_; } void set_f(uint64_t new_value) { f_ = new_value; } - void set_e(int new_value) { e_ = new_value; } + void set_e(int32_t new_value) { e_ = new_value; } private: - static const uint64_t kUint64MSB = UINT64_2PART_C(0x80000000, 00000000); + static const uint64_t kUint64MSB = DOUBLE_CONVERSION_UINT64_2PART_C(0x80000000, 00000000); uint64_t f_; - int e_; + int32_t e_; }; } // namespace double_conversion diff --git a/deps/icu-small/source/i18n/double-conversion-double-to-string.cpp b/deps/icu-small/source/i18n/double-conversion-double-to-string.cpp new file mode 100644 index 00000000000000..44c176f4f9c958 --- /dev/null +++ b/deps/icu-small/source/i18n/double-conversion-double-to-string.cpp @@ -0,0 +1,450 @@ +// © 2018 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// +// From the double-conversion library. Original license: +// +// Copyright 2010 the V8 project authors. 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 Google Inc. 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 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 +// OWNER 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. + +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + +#include +#include +#include + +// ICU PATCH: Customize header file paths for ICU. +// The file fixed-dtoa.h is not needed. + +#include "double-conversion-double-to-string.h" + +#include "double-conversion-bignum-dtoa.h" +#include "double-conversion-fast-dtoa.h" +#include "double-conversion-ieee.h" +#include "double-conversion-utils.h" + +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + +namespace double_conversion { + +#if 0 // not needed for ICU +const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() { + int flags = UNIQUE_ZERO | EMIT_POSITIVE_EXPONENT_SIGN; + static DoubleToStringConverter converter(flags, + "Infinity", + "NaN", + 'e', + -6, 21, + 6, 0); + return converter; +} + + +bool DoubleToStringConverter::HandleSpecialValues( + double value, + StringBuilder* result_builder) const { + Double double_inspect(value); + if (double_inspect.IsInfinite()) { + if (infinity_symbol_ == NULL) return false; + if (value < 0) { + result_builder->AddCharacter('-'); + } + result_builder->AddString(infinity_symbol_); + return true; + } + if (double_inspect.IsNan()) { + if (nan_symbol_ == NULL) return false; + result_builder->AddString(nan_symbol_); + return true; + } + return false; +} + + +void DoubleToStringConverter::CreateExponentialRepresentation( + const char* decimal_digits, + int length, + int exponent, + StringBuilder* result_builder) const { + DOUBLE_CONVERSION_ASSERT(length != 0); + result_builder->AddCharacter(decimal_digits[0]); + if (length != 1) { + result_builder->AddCharacter('.'); + result_builder->AddSubstring(&decimal_digits[1], length-1); + } + result_builder->AddCharacter(exponent_character_); + if (exponent < 0) { + result_builder->AddCharacter('-'); + exponent = -exponent; + } else { + if ((flags_ & EMIT_POSITIVE_EXPONENT_SIGN) != 0) { + result_builder->AddCharacter('+'); + } + } + if (exponent == 0) { + result_builder->AddCharacter('0'); + return; + } + DOUBLE_CONVERSION_ASSERT(exponent < 1e4); + // Changing this constant requires updating the comment of DoubleToStringConverter constructor + const int kMaxExponentLength = 5; + char buffer[kMaxExponentLength + 1]; + buffer[kMaxExponentLength] = '\0'; + int first_char_pos = kMaxExponentLength; + while (exponent > 0) { + buffer[--first_char_pos] = '0' + (exponent % 10); + exponent /= 10; + } + // Add prefix '0' to make exponent width >= min(min_exponent_with_, kMaxExponentLength) + // For example: convert 1e+9 -> 1e+09, if min_exponent_with_ is set to 2 + while(kMaxExponentLength - first_char_pos < std::min(min_exponent_width_, kMaxExponentLength)) { + buffer[--first_char_pos] = '0'; + } + result_builder->AddSubstring(&buffer[first_char_pos], + kMaxExponentLength - first_char_pos); +} + + +void DoubleToStringConverter::CreateDecimalRepresentation( + const char* decimal_digits, + int length, + int decimal_point, + int digits_after_point, + StringBuilder* result_builder) const { + // Create a representation that is padded with zeros if needed. + if (decimal_point <= 0) { + // "0.00000decimal_rep" or "0.000decimal_rep00". + result_builder->AddCharacter('0'); + if (digits_after_point > 0) { + result_builder->AddCharacter('.'); + result_builder->AddPadding('0', -decimal_point); + DOUBLE_CONVERSION_ASSERT(length <= digits_after_point - (-decimal_point)); + result_builder->AddSubstring(decimal_digits, length); + int remaining_digits = digits_after_point - (-decimal_point) - length; + result_builder->AddPadding('0', remaining_digits); + } + } else if (decimal_point >= length) { + // "decimal_rep0000.00000" or "decimal_rep.0000". + result_builder->AddSubstring(decimal_digits, length); + result_builder->AddPadding('0', decimal_point - length); + if (digits_after_point > 0) { + result_builder->AddCharacter('.'); + result_builder->AddPadding('0', digits_after_point); + } + } else { + // "decima.l_rep000". + DOUBLE_CONVERSION_ASSERT(digits_after_point > 0); + result_builder->AddSubstring(decimal_digits, decimal_point); + result_builder->AddCharacter('.'); + DOUBLE_CONVERSION_ASSERT(length - decimal_point <= digits_after_point); + result_builder->AddSubstring(&decimal_digits[decimal_point], + length - decimal_point); + int remaining_digits = digits_after_point - (length - decimal_point); + result_builder->AddPadding('0', remaining_digits); + } + if (digits_after_point == 0) { + if ((flags_ & EMIT_TRAILING_DECIMAL_POINT) != 0) { + result_builder->AddCharacter('.'); + } + if ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) { + result_builder->AddCharacter('0'); + } + } +} + + +bool DoubleToStringConverter::ToShortestIeeeNumber( + double value, + StringBuilder* result_builder, + DoubleToStringConverter::DtoaMode mode) const { + DOUBLE_CONVERSION_ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE); + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + int decimal_point; + bool sign; + const int kDecimalRepCapacity = kBase10MaximalLength + 1; + char decimal_rep[kDecimalRepCapacity]; + int decimal_rep_length; + + DoubleToAscii(value, mode, 0, decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + + bool unique_zero = (flags_ & UNIQUE_ZERO) != 0; + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + int exponent = decimal_point - 1; + if ((decimal_in_shortest_low_ <= exponent) && + (exponent < decimal_in_shortest_high_)) { + CreateDecimalRepresentation(decimal_rep, decimal_rep_length, + decimal_point, + (std::max)(0, decimal_rep_length - decimal_point), + result_builder); + } else { + CreateExponentialRepresentation(decimal_rep, decimal_rep_length, exponent, + result_builder); + } + return true; +} + + +bool DoubleToStringConverter::ToFixed(double value, + int requested_digits, + StringBuilder* result_builder) const { + DOUBLE_CONVERSION_ASSERT(kMaxFixedDigitsBeforePoint == 60); + const double kFirstNonFixed = 1e60; + + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + if (requested_digits > kMaxFixedDigitsAfterPoint) return false; + if (value >= kFirstNonFixed || value <= -kFirstNonFixed) return false; + + // Find a sufficiently precise decimal representation of n. + int decimal_point; + bool sign; + // Add space for the '\0' byte. + const int kDecimalRepCapacity = + kMaxFixedDigitsBeforePoint + kMaxFixedDigitsAfterPoint + 1; + char decimal_rep[kDecimalRepCapacity]; + int decimal_rep_length; + DoubleToAscii(value, FIXED, requested_digits, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + + bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point, + requested_digits, result_builder); + return true; +} + + +bool DoubleToStringConverter::ToExponential( + double value, + int requested_digits, + StringBuilder* result_builder) const { + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + if (requested_digits < -1) return false; + if (requested_digits > kMaxExponentialDigits) return false; + + int decimal_point; + bool sign; + // Add space for digit before the decimal point and the '\0' character. + const int kDecimalRepCapacity = kMaxExponentialDigits + 2; + DOUBLE_CONVERSION_ASSERT(kDecimalRepCapacity > kBase10MaximalLength); + char decimal_rep[kDecimalRepCapacity]; +#ifndef NDEBUG + // Problem: there is an assert in StringBuilder::AddSubstring() that + // will pass this buffer to strlen(), and this buffer is not generally + // null-terminated. + memset(decimal_rep, 0, sizeof(decimal_rep)); +#endif + int decimal_rep_length; + + if (requested_digits == -1) { + DoubleToAscii(value, SHORTEST, 0, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + } else { + DoubleToAscii(value, PRECISION, requested_digits + 1, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + DOUBLE_CONVERSION_ASSERT(decimal_rep_length <= requested_digits + 1); + + for (int i = decimal_rep_length; i < requested_digits + 1; ++i) { + decimal_rep[i] = '0'; + } + decimal_rep_length = requested_digits + 1; + } + + bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + int exponent = decimal_point - 1; + CreateExponentialRepresentation(decimal_rep, + decimal_rep_length, + exponent, + result_builder); + return true; +} + + +bool DoubleToStringConverter::ToPrecision(double value, + int precision, + StringBuilder* result_builder) const { + if (Double(value).IsSpecial()) { + return HandleSpecialValues(value, result_builder); + } + + if (precision < kMinPrecisionDigits || precision > kMaxPrecisionDigits) { + return false; + } + + // Find a sufficiently precise decimal representation of n. + int decimal_point; + bool sign; + // Add one for the terminating null character. + const int kDecimalRepCapacity = kMaxPrecisionDigits + 1; + char decimal_rep[kDecimalRepCapacity]; + int decimal_rep_length; + + DoubleToAscii(value, PRECISION, precision, + decimal_rep, kDecimalRepCapacity, + &sign, &decimal_rep_length, &decimal_point); + DOUBLE_CONVERSION_ASSERT(decimal_rep_length <= precision); + + bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); + if (sign && (value != 0.0 || !unique_zero)) { + result_builder->AddCharacter('-'); + } + + // The exponent if we print the number as x.xxeyyy. That is with the + // decimal point after the first digit. + int exponent = decimal_point - 1; + + int extra_zero = ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) ? 1 : 0; + if ((-decimal_point + 1 > max_leading_padding_zeroes_in_precision_mode_) || + (decimal_point - precision + extra_zero > + max_trailing_padding_zeroes_in_precision_mode_)) { + // Fill buffer to contain 'precision' digits. + // Usually the buffer is already at the correct length, but 'DoubleToAscii' + // is allowed to return less characters. + for (int i = decimal_rep_length; i < precision; ++i) { + decimal_rep[i] = '0'; + } + + CreateExponentialRepresentation(decimal_rep, + precision, + exponent, + result_builder); + } else { + CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point, + (std::max)(0, precision - decimal_point), + result_builder); + } + return true; +} +#endif // not needed for ICU + + +static BignumDtoaMode DtoaToBignumDtoaMode( + DoubleToStringConverter::DtoaMode dtoa_mode) { + switch (dtoa_mode) { + case DoubleToStringConverter::SHORTEST: return BIGNUM_DTOA_SHORTEST; + case DoubleToStringConverter::SHORTEST_SINGLE: + return BIGNUM_DTOA_SHORTEST_SINGLE; + case DoubleToStringConverter::FIXED: return BIGNUM_DTOA_FIXED; + case DoubleToStringConverter::PRECISION: return BIGNUM_DTOA_PRECISION; + default: + DOUBLE_CONVERSION_UNREACHABLE(); + } +} + + +void DoubleToStringConverter::DoubleToAscii(double v, + DtoaMode mode, + int requested_digits, + char* buffer, + int buffer_length, + bool* sign, + int* length, + int* point) { + Vector vector(buffer, buffer_length); + DOUBLE_CONVERSION_ASSERT(!Double(v).IsSpecial()); + DOUBLE_CONVERSION_ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE || requested_digits >= 0); + + if (Double(v).Sign() < 0) { + *sign = true; + v = -v; + } else { + *sign = false; + } + + if (mode == PRECISION && requested_digits == 0) { + vector[0] = '\0'; + *length = 0; + return; + } + + if (v == 0) { + vector[0] = '0'; + vector[1] = '\0'; + *length = 1; + *point = 1; + return; + } + + bool fast_worked; + switch (mode) { + case SHORTEST: + fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST, 0, vector, length, point); + break; +#if 0 // not needed for ICU + case SHORTEST_SINGLE: + fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST_SINGLE, 0, + vector, length, point); + break; + case FIXED: + fast_worked = FastFixedDtoa(v, requested_digits, vector, length, point); + break; + case PRECISION: + fast_worked = FastDtoa(v, FAST_DTOA_PRECISION, requested_digits, + vector, length, point); + break; +#endif // not needed for ICU + default: + fast_worked = false; + DOUBLE_CONVERSION_UNREACHABLE(); + } + if (fast_worked) return; + + // If the fast dtoa didn't succeed use the slower bignum version. + BignumDtoaMode bignum_mode = DtoaToBignumDtoaMode(mode); + BignumDtoa(v, bignum_mode, requested_digits, vector, length, point); + vector[*length] = '\0'; +} + +} // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/deps/icu-small/source/i18n/double-conversion-double-to-string.h b/deps/icu-small/source/i18n/double-conversion-double-to-string.h new file mode 100644 index 00000000000000..27bd86784895f8 --- /dev/null +++ b/deps/icu-small/source/i18n/double-conversion-double-to-string.h @@ -0,0 +1,419 @@ +// © 2018 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// +// From the double-conversion library. Original license: +// +// Copyright 2012 the V8 project authors. 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 Google Inc. 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 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 +// OWNER 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. + +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + +#ifndef DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ +#define DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ + +// ICU PATCH: Customize header file paths for ICU. + +#include "double-conversion-utils.h" + +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + +namespace double_conversion { + +class DoubleToStringConverter { + public: +#if 0 // not needed for ICU + // When calling ToFixed with a double > 10^kMaxFixedDigitsBeforePoint + // or a requested_digits parameter > kMaxFixedDigitsAfterPoint then the + // function returns false. + static const int kMaxFixedDigitsBeforePoint = 60; + static const int kMaxFixedDigitsAfterPoint = 60; + + // When calling ToExponential with a requested_digits + // parameter > kMaxExponentialDigits then the function returns false. + static const int kMaxExponentialDigits = 120; + + // When calling ToPrecision with a requested_digits + // parameter < kMinPrecisionDigits or requested_digits > kMaxPrecisionDigits + // then the function returns false. + static const int kMinPrecisionDigits = 1; + static const int kMaxPrecisionDigits = 120; + + enum Flags { + NO_FLAGS = 0, + EMIT_POSITIVE_EXPONENT_SIGN = 1, + EMIT_TRAILING_DECIMAL_POINT = 2, + EMIT_TRAILING_ZERO_AFTER_POINT = 4, + UNIQUE_ZERO = 8 + }; + + // Flags should be a bit-or combination of the possible Flags-enum. + // - NO_FLAGS: no special flags. + // - EMIT_POSITIVE_EXPONENT_SIGN: when the number is converted into exponent + // form, emits a '+' for positive exponents. Example: 1.2e+2. + // - EMIT_TRAILING_DECIMAL_POINT: when the input number is an integer and is + // converted into decimal format then a trailing decimal point is appended. + // Example: 2345.0 is converted to "2345.". + // - EMIT_TRAILING_ZERO_AFTER_POINT: in addition to a trailing decimal point + // emits a trailing '0'-character. This flag requires the + // EXMIT_TRAILING_DECIMAL_POINT flag. + // Example: 2345.0 is converted to "2345.0". + // - UNIQUE_ZERO: "-0.0" is converted to "0.0". + // + // Infinity symbol and nan_symbol provide the string representation for these + // special values. If the string is NULL and the special value is encountered + // then the conversion functions return false. + // + // The exponent_character is used in exponential representations. It is + // usually 'e' or 'E'. + // + // When converting to the shortest representation the converter will + // represent input numbers in decimal format if they are in the interval + // [10^decimal_in_shortest_low; 10^decimal_in_shortest_high[ + // (lower boundary included, greater boundary excluded). + // Example: with decimal_in_shortest_low = -6 and + // decimal_in_shortest_high = 21: + // ToShortest(0.000001) -> "0.000001" + // ToShortest(0.0000001) -> "1e-7" + // ToShortest(111111111111111111111.0) -> "111111111111111110000" + // ToShortest(100000000000000000000.0) -> "100000000000000000000" + // ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21" + // + // When converting to precision mode the converter may add + // max_leading_padding_zeroes before returning the number in exponential + // format. + // Example with max_leading_padding_zeroes_in_precision_mode = 6. + // ToPrecision(0.0000012345, 2) -> "0.0000012" + // ToPrecision(0.00000012345, 2) -> "1.2e-7" + // Similarily the converter may add up to + // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid + // returning an exponential representation. A zero added by the + // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit. + // Examples for max_trailing_padding_zeroes_in_precision_mode = 1: + // ToPrecision(230.0, 2) -> "230" + // ToPrecision(230.0, 2) -> "230." with EMIT_TRAILING_DECIMAL_POINT. + // ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT. + // + // The min_exponent_width is used for exponential representations. + // The converter adds leading '0's to the exponent until the exponent + // is at least min_exponent_width digits long. + // The min_exponent_width is clamped to 5. + // As such, the exponent may never have more than 5 digits in total. + DoubleToStringConverter(int flags, + const char* infinity_symbol, + const char* nan_symbol, + char exponent_character, + int decimal_in_shortest_low, + int decimal_in_shortest_high, + int max_leading_padding_zeroes_in_precision_mode, + int max_trailing_padding_zeroes_in_precision_mode, + int min_exponent_width = 0) + : flags_(flags), + infinity_symbol_(infinity_symbol), + nan_symbol_(nan_symbol), + exponent_character_(exponent_character), + decimal_in_shortest_low_(decimal_in_shortest_low), + decimal_in_shortest_high_(decimal_in_shortest_high), + max_leading_padding_zeroes_in_precision_mode_( + max_leading_padding_zeroes_in_precision_mode), + max_trailing_padding_zeroes_in_precision_mode_( + max_trailing_padding_zeroes_in_precision_mode), + min_exponent_width_(min_exponent_width) { + // When 'trailing zero after the point' is set, then 'trailing point' + // must be set too. + DOUBLE_CONVERSION_ASSERT(((flags & EMIT_TRAILING_DECIMAL_POINT) != 0) || + !((flags & EMIT_TRAILING_ZERO_AFTER_POINT) != 0)); + } + + // Returns a converter following the EcmaScript specification. + static const DoubleToStringConverter& EcmaScriptConverter(); + + // Computes the shortest string of digits that correctly represent the input + // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high + // (see constructor) it then either returns a decimal representation, or an + // exponential representation. + // Example with decimal_in_shortest_low = -6, + // decimal_in_shortest_high = 21, + // EMIT_POSITIVE_EXPONENT_SIGN activated, and + // EMIT_TRAILING_DECIMAL_POINT deactived: + // ToShortest(0.000001) -> "0.000001" + // ToShortest(0.0000001) -> "1e-7" + // ToShortest(111111111111111111111.0) -> "111111111111111110000" + // ToShortest(100000000000000000000.0) -> "100000000000000000000" + // ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21" + // + // Note: the conversion may round the output if the returned string + // is accurate enough to uniquely identify the input-number. + // For example the most precise representation of the double 9e59 equals + // "899999999999999918767229449717619953810131273674690656206848", but + // the converter will return the shorter (but still correct) "9e59". + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except when the input value is special and no infinity_symbol or + // nan_symbol has been given to the constructor. + bool ToShortest(double value, StringBuilder* result_builder) const { + return ToShortestIeeeNumber(value, result_builder, SHORTEST); + } + + // Same as ToShortest, but for single-precision floats. + bool ToShortestSingle(float value, StringBuilder* result_builder) const { + return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE); + } + + + // Computes a decimal representation with a fixed number of digits after the + // decimal point. The last emitted digit is rounded. + // + // Examples: + // ToFixed(3.12, 1) -> "3.1" + // ToFixed(3.1415, 3) -> "3.142" + // ToFixed(1234.56789, 4) -> "1234.5679" + // ToFixed(1.23, 5) -> "1.23000" + // ToFixed(0.1, 4) -> "0.1000" + // ToFixed(1e30, 2) -> "1000000000000000019884624838656.00" + // ToFixed(0.1, 30) -> "0.100000000000000005551115123126" + // ToFixed(0.1, 17) -> "0.10000000000000001" + // + // If requested_digits equals 0, then the tail of the result depends on + // the EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT. + // Examples, for requested_digits == 0, + // let EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT be + // - false and false: then 123.45 -> 123 + // 0.678 -> 1 + // - true and false: then 123.45 -> 123. + // 0.678 -> 1. + // - true and true: then 123.45 -> 123.0 + // 0.678 -> 1.0 + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except for the following cases: + // - the input value is special and no infinity_symbol or nan_symbol has + // been provided to the constructor, + // - 'value' > 10^kMaxFixedDigitsBeforePoint, or + // - 'requested_digits' > kMaxFixedDigitsAfterPoint. + // The last two conditions imply that the result will never contain more than + // 1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters + // (one additional character for the sign, and one for the decimal point). + bool ToFixed(double value, + int requested_digits, + StringBuilder* result_builder) const; + + // Computes a representation in exponential format with requested_digits + // after the decimal point. The last emitted digit is rounded. + // If requested_digits equals -1, then the shortest exponential representation + // is computed. + // + // Examples with EMIT_POSITIVE_EXPONENT_SIGN deactivated, and + // exponent_character set to 'e'. + // ToExponential(3.12, 1) -> "3.1e0" + // ToExponential(5.0, 3) -> "5.000e0" + // ToExponential(0.001, 2) -> "1.00e-3" + // ToExponential(3.1415, -1) -> "3.1415e0" + // ToExponential(3.1415, 4) -> "3.1415e0" + // ToExponential(3.1415, 3) -> "3.142e0" + // ToExponential(123456789000000, 3) -> "1.235e14" + // ToExponential(1000000000000000019884624838656.0, -1) -> "1e30" + // ToExponential(1000000000000000019884624838656.0, 32) -> + // "1.00000000000000001988462483865600e30" + // ToExponential(1234, 0) -> "1e3" + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except for the following cases: + // - the input value is special and no infinity_symbol or nan_symbol has + // been provided to the constructor, + // - 'requested_digits' > kMaxExponentialDigits. + // The last condition implies that the result will never contain more than + // kMaxExponentialDigits + 8 characters (the sign, the digit before the + // decimal point, the decimal point, the exponent character, the + // exponent's sign, and at most 3 exponent digits). + bool ToExponential(double value, + int requested_digits, + StringBuilder* result_builder) const; + + // Computes 'precision' leading digits of the given 'value' and returns them + // either in exponential or decimal format, depending on + // max_{leading|trailing}_padding_zeroes_in_precision_mode (given to the + // constructor). + // The last computed digit is rounded. + // + // Example with max_leading_padding_zeroes_in_precision_mode = 6. + // ToPrecision(0.0000012345, 2) -> "0.0000012" + // ToPrecision(0.00000012345, 2) -> "1.2e-7" + // Similarily the converter may add up to + // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid + // returning an exponential representation. A zero added by the + // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit. + // Examples for max_trailing_padding_zeroes_in_precision_mode = 1: + // ToPrecision(230.0, 2) -> "230" + // ToPrecision(230.0, 2) -> "230." with EMIT_TRAILING_DECIMAL_POINT. + // ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT. + // Examples for max_trailing_padding_zeroes_in_precision_mode = 3, and no + // EMIT_TRAILING_ZERO_AFTER_POINT: + // ToPrecision(123450.0, 6) -> "123450" + // ToPrecision(123450.0, 5) -> "123450" + // ToPrecision(123450.0, 4) -> "123500" + // ToPrecision(123450.0, 3) -> "123000" + // ToPrecision(123450.0, 2) -> "1.2e5" + // + // Returns true if the conversion succeeds. The conversion always succeeds + // except for the following cases: + // - the input value is special and no infinity_symbol or nan_symbol has + // been provided to the constructor, + // - precision < kMinPericisionDigits + // - precision > kMaxPrecisionDigits + // The last condition implies that the result will never contain more than + // kMaxPrecisionDigits + 7 characters (the sign, the decimal point, the + // exponent character, the exponent's sign, and at most 3 exponent digits). + bool ToPrecision(double value, + int precision, + StringBuilder* result_builder) const; +#endif // not needed for ICU + + enum DtoaMode { + // Produce the shortest correct representation. + // For example the output of 0.299999999999999988897 is (the less accurate + // but correct) 0.3. + SHORTEST, + // Same as SHORTEST, but for single-precision floats. + SHORTEST_SINGLE, + // Produce a fixed number of digits after the decimal point. + // For instance fixed(0.1, 4) becomes 0.1000 + // If the input number is big, the output will be big. + FIXED, + // Fixed number of digits (independent of the decimal point). + PRECISION + }; + + // The maximal number of digits that are needed to emit a double in base 10. + // A higher precision can be achieved by using more digits, but the shortest + // accurate representation of any double will never use more digits than + // kBase10MaximalLength. + // Note that DoubleToAscii null-terminates its input. So the given buffer + // should be at least kBase10MaximalLength + 1 characters long. + static const int kBase10MaximalLength = 17; + + // Converts the given double 'v' to digit characters. 'v' must not be NaN, + // +Infinity, or -Infinity. In SHORTEST_SINGLE-mode this restriction also + // applies to 'v' after it has been casted to a single-precision float. That + // is, in this mode static_cast(v) must not be NaN, +Infinity or + // -Infinity. + // + // The result should be interpreted as buffer * 10^(point-length). + // + // The digits are written to the buffer in the platform's charset, which is + // often UTF-8 (with ASCII-range digits) but may be another charset, such + // as EBCDIC. + // + // The output depends on the given mode: + // - SHORTEST: produce the least amount of digits for which the internal + // identity requirement is still satisfied. If the digits are printed + // (together with the correct exponent) then reading this number will give + // 'v' again. The buffer will choose the representation that is closest to + // 'v'. If there are two at the same distance, than the one farther away + // from 0 is chosen (halfway cases - ending with 5 - are rounded up). + // In this mode the 'requested_digits' parameter is ignored. + // - SHORTEST_SINGLE: same as SHORTEST but with single-precision. + // - FIXED: produces digits necessary to print a given number with + // 'requested_digits' digits after the decimal point. The produced digits + // might be too short in which case the caller has to fill the remainder + // with '0's. + // Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2. + // Halfway cases are rounded towards +/-Infinity (away from 0). The call + // toFixed(0.15, 2) thus returns buffer="2", point=0. + // The returned buffer may contain digits that would be truncated from the + // shortest representation of the input. + // - PRECISION: produces 'requested_digits' where the first digit is not '0'. + // Even though the length of produced digits usually equals + // 'requested_digits', the function is allowed to return fewer digits, in + // which case the caller has to fill the missing digits with '0's. + // Halfway cases are again rounded away from 0. + // DoubleToAscii expects the given buffer to be big enough to hold all + // digits and a terminating null-character. In SHORTEST-mode it expects a + // buffer of at least kBase10MaximalLength + 1. In all other modes the + // requested_digits parameter and the padding-zeroes limit the size of the + // output. Don't forget the decimal point, the exponent character and the + // terminating null-character when computing the maximal output size. + // The given length is only used in debug mode to ensure the buffer is big + // enough. + // ICU PATCH: Export this as U_I18N_API for unit tests. + static void U_I18N_API DoubleToAscii(double v, + DtoaMode mode, + int requested_digits, + char* buffer, + int buffer_length, + bool* sign, + int* length, + int* point); + +#if 0 // not needed for ICU + private: + // Implementation for ToShortest and ToShortestSingle. + bool ToShortestIeeeNumber(double value, + StringBuilder* result_builder, + DtoaMode mode) const; + + // If the value is a special value (NaN or Infinity) constructs the + // corresponding string using the configured infinity/nan-symbol. + // If either of them is NULL or the value is not special then the + // function returns false. + bool HandleSpecialValues(double value, StringBuilder* result_builder) const; + // Constructs an exponential representation (i.e. 1.234e56). + // The given exponent assumes a decimal point after the first decimal digit. + void CreateExponentialRepresentation(const char* decimal_digits, + int length, + int exponent, + StringBuilder* result_builder) const; + // Creates a decimal representation (i.e 1234.5678). + void CreateDecimalRepresentation(const char* decimal_digits, + int length, + int decimal_point, + int digits_after_point, + StringBuilder* result_builder) const; + + const int flags_; + const char* const infinity_symbol_; + const char* const nan_symbol_; + const char exponent_character_; + const int decimal_in_shortest_low_; + const int decimal_in_shortest_high_; + const int max_leading_padding_zeroes_in_precision_mode_; + const int max_trailing_padding_zeroes_in_precision_mode_; + const int min_exponent_width_; +#endif // not needed for ICU + + DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(DoubleToStringConverter); +}; + +} // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + +#endif // DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/deps/icu-small/source/i18n/double-conversion-fast-dtoa.cpp b/deps/icu-small/source/i18n/double-conversion-fast-dtoa.cpp index 8d1499a79b4a2e..87a3d536bf111f 100644 --- a/deps/icu-small/source/i18n/double-conversion-fast-dtoa.cpp +++ b/deps/icu-small/source/i18n/double-conversion-fast-dtoa.cpp @@ -152,7 +152,7 @@ static bool RoundWeed(Vector buffer, // Conceptually rest ~= too_high - buffer // We need to do the following tests in this order to avoid over- and // underflows. - ASSERT(rest <= unsafe_interval); + DOUBLE_CONVERSION_ASSERT(rest <= unsafe_interval); while (rest < small_distance && // Negated condition 1 unsafe_interval - rest >= ten_kappa && // Negated condition 2 (rest + ten_kappa < small_distance || // buffer{-1} > w_high @@ -198,7 +198,7 @@ static bool RoundWeedCounted(Vector buffer, uint64_t ten_kappa, uint64_t unit, int* kappa) { - ASSERT(rest < ten_kappa); + DOUBLE_CONVERSION_ASSERT(rest < ten_kappa); // The following tests are done in a specific order to avoid overflows. They // will work correctly with any uint64 values of rest < ten_kappa and unit. // @@ -255,7 +255,7 @@ static void BiggestPowerTen(uint32_t number, int number_bits, uint32_t* power, int* exponent_plus_one) { - ASSERT(number < (1u << (number_bits + 1))); + DOUBLE_CONVERSION_ASSERT(number < (1u << (number_bits + 1))); // 1233/4096 is approximately 1/lg(10). int exponent_plus_one_guess = ((number_bits + 1) * 1233 >> 12); // We increment to skip over the first entry in the kPowersOf10 table. @@ -317,9 +317,9 @@ static bool DigitGen(DiyFp low, Vector buffer, int* length, int* kappa) { - ASSERT(low.e() == w.e() && w.e() == high.e()); - ASSERT(low.f() + 1 <= high.f() - 1); - ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent); + DOUBLE_CONVERSION_ASSERT(low.e() == w.e() && w.e() == high.e()); + DOUBLE_CONVERSION_ASSERT(low.f() + 1 <= high.f() - 1); + DOUBLE_CONVERSION_ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent); // low, w and high are imprecise, but by less than one ulp (unit in the last // place). // If we remove (resp. add) 1 ulp from low (resp. high) we are certain that @@ -361,7 +361,7 @@ static bool DigitGen(DiyFp low, // that is smaller than integrals. while (*kappa > 0) { int digit = integrals / divisor; - ASSERT(digit <= 9); + DOUBLE_CONVERSION_ASSERT(digit <= 9); buffer[*length] = static_cast('0' + digit); (*length)++; integrals %= divisor; @@ -388,16 +388,16 @@ static bool DigitGen(DiyFp low, // data (like the interval or 'unit'), too. // Note that the multiplication by 10 does not overflow, because w.e >= -60 // and thus one.e >= -60. - ASSERT(one.e() >= -60); - ASSERT(fractionals < one.f()); - ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f()); + DOUBLE_CONVERSION_ASSERT(one.e() >= -60); + DOUBLE_CONVERSION_ASSERT(fractionals < one.f()); + DOUBLE_CONVERSION_ASSERT(DOUBLE_CONVERSION_UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f()); for (;;) { fractionals *= 10; unit *= 10; unsafe_interval.set_f(unsafe_interval.f() * 10); // Integer division by one. int digit = static_cast(fractionals >> -one.e()); - ASSERT(digit <= 9); + DOUBLE_CONVERSION_ASSERT(digit <= 9); buffer[*length] = static_cast('0' + digit); (*length)++; fractionals &= one.f() - 1; // Modulo by one. @@ -444,9 +444,9 @@ static bool DigitGenCounted(DiyFp w, Vector buffer, int* length, int* kappa) { - ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent); - ASSERT(kMinimalTargetExponent >= -60); - ASSERT(kMaximalTargetExponent <= -32); + DOUBLE_CONVERSION_ASSERT(kMinimalTargetExponent <= w.e() && w.e() <= kMaximalTargetExponent); + DOUBLE_CONVERSION_ASSERT(kMinimalTargetExponent >= -60); + DOUBLE_CONVERSION_ASSERT(kMaximalTargetExponent <= -32); // w is assumed to have an error less than 1 unit. Whenever w is scaled we // also scale its error. uint64_t w_error = 1; @@ -472,7 +472,7 @@ static bool DigitGenCounted(DiyFp w, // that is smaller than 'integrals'. while (*kappa > 0) { int digit = integrals / divisor; - ASSERT(digit <= 9); + DOUBLE_CONVERSION_ASSERT(digit <= 9); buffer[*length] = static_cast('0' + digit); (*length)++; requested_digits--; @@ -498,15 +498,15 @@ static bool DigitGenCounted(DiyFp w, // data (the 'unit'), too. // Note that the multiplication by 10 does not overflow, because w.e >= -60 // and thus one.e >= -60. - ASSERT(one.e() >= -60); - ASSERT(fractionals < one.f()); - ASSERT(UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f()); + DOUBLE_CONVERSION_ASSERT(one.e() >= -60); + DOUBLE_CONVERSION_ASSERT(fractionals < one.f()); + DOUBLE_CONVERSION_ASSERT(DOUBLE_CONVERSION_UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF) / 10 >= one.f()); while (requested_digits > 0 && fractionals > w_error) { fractionals *= 10; w_error *= 10; // Integer division by one. int digit = static_cast(fractionals >> -one.e()); - ASSERT(digit <= 9); + DOUBLE_CONVERSION_ASSERT(digit <= 9); buffer[*length] = static_cast('0' + digit); (*length)++; requested_digits--; @@ -544,11 +544,11 @@ static bool Grisu3(double v, if (mode == FAST_DTOA_SHORTEST) { Double(v).NormalizedBoundaries(&boundary_minus, &boundary_plus); } else { - ASSERT(mode == FAST_DTOA_SHORTEST_SINGLE); + DOUBLE_CONVERSION_ASSERT(mode == FAST_DTOA_SHORTEST_SINGLE); float single_v = static_cast(v); Single(single_v).NormalizedBoundaries(&boundary_minus, &boundary_plus); } - ASSERT(boundary_plus.e() == w.e()); + DOUBLE_CONVERSION_ASSERT(boundary_plus.e() == w.e()); DiyFp ten_mk; // Cached power of ten: 10^-k int mk; // -k int ten_mk_minimal_binary_exponent = @@ -559,7 +559,7 @@ static bool Grisu3(double v, ten_mk_minimal_binary_exponent, ten_mk_maximal_binary_exponent, &ten_mk, &mk); - ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() + + DOUBLE_CONVERSION_ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() + DiyFp::kSignificandSize) && (kMaximalTargetExponent >= w.e() + ten_mk.e() + DiyFp::kSignificandSize)); @@ -573,7 +573,7 @@ static bool Grisu3(double v, // In other words: let f = scaled_w.f() and e = scaled_w.e(), then // (f-1) * 2^e < w*10^k < (f+1) * 2^e DiyFp scaled_w = DiyFp::Times(w, ten_mk); - ASSERT(scaled_w.e() == + DOUBLE_CONVERSION_ASSERT(scaled_w.e() == boundary_plus.e() + ten_mk.e() + DiyFp::kSignificandSize); // In theory it would be possible to avoid some recomputations by computing // the difference between w and boundary_minus/plus (a power of 2) and to @@ -618,7 +618,7 @@ static bool Grisu3Counted(double v, ten_mk_minimal_binary_exponent, ten_mk_maximal_binary_exponent, &ten_mk, &mk); - ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() + + DOUBLE_CONVERSION_ASSERT((kMinimalTargetExponent <= w.e() + ten_mk.e() + DiyFp::kSignificandSize) && (kMaximalTargetExponent >= w.e() + ten_mk.e() + DiyFp::kSignificandSize)); @@ -652,8 +652,8 @@ bool FastDtoa(double v, Vector buffer, int* length, int* decimal_point) { - ASSERT(v > 0); - ASSERT(!Double(v).IsSpecial()); + DOUBLE_CONVERSION_ASSERT(v > 0); + DOUBLE_CONVERSION_ASSERT(!Double(v).IsSpecial()); bool result = false; int decimal_exponent = 0; @@ -667,7 +667,7 @@ bool FastDtoa(double v, buffer, length, &decimal_exponent); break; default: - UNREACHABLE(); + DOUBLE_CONVERSION_UNREACHABLE(); } if (result) { *decimal_point = *length + decimal_exponent; diff --git a/deps/icu-small/source/i18n/double-conversion-ieee.h b/deps/icu-small/source/i18n/double-conversion-ieee.h index c83c8d9abbb46e..f4c62a9a9f8d99 100644 --- a/deps/icu-small/source/i18n/double-conversion-ieee.h +++ b/deps/icu-small/source/i18n/double-conversion-ieee.h @@ -55,12 +55,14 @@ static float uint32_to_float(uint32_t d32) { return BitCast(d32); } // Helper functions for doubles. class Double { public: - static const uint64_t kSignMask = UINT64_2PART_C(0x80000000, 00000000); - static const uint64_t kExponentMask = UINT64_2PART_C(0x7FF00000, 00000000); - static const uint64_t kSignificandMask = UINT64_2PART_C(0x000FFFFF, FFFFFFFF); - static const uint64_t kHiddenBit = UINT64_2PART_C(0x00100000, 00000000); + static const uint64_t kSignMask = DOUBLE_CONVERSION_UINT64_2PART_C(0x80000000, 00000000); + static const uint64_t kExponentMask = DOUBLE_CONVERSION_UINT64_2PART_C(0x7FF00000, 00000000); + static const uint64_t kSignificandMask = DOUBLE_CONVERSION_UINT64_2PART_C(0x000FFFFF, FFFFFFFF); + static const uint64_t kHiddenBit = DOUBLE_CONVERSION_UINT64_2PART_C(0x00100000, 00000000); static const int kPhysicalSignificandSize = 52; // Excludes the hidden bit. static const int kSignificandSize = 53; + static const int kExponentBias = 0x3FF + kPhysicalSignificandSize; + static const int kMaxExponent = 0x7FF - kExponentBias; Double() : d64_(0) {} explicit Double(double d) : d64_(double_to_uint64(d)) {} @@ -71,14 +73,14 @@ class Double { // The value encoded by this Double must be greater or equal to +0.0. // It must not be special (infinity, or NaN). DiyFp AsDiyFp() const { - ASSERT(Sign() > 0); - ASSERT(!IsSpecial()); + DOUBLE_CONVERSION_ASSERT(Sign() > 0); + DOUBLE_CONVERSION_ASSERT(!IsSpecial()); return DiyFp(Significand(), Exponent()); } // The value encoded by this Double must be strictly greater than 0. DiyFp AsNormalizedDiyFp() const { - ASSERT(value() > 0.0); + DOUBLE_CONVERSION_ASSERT(value() > 0.0); uint64_t f = Significand(); int e = Exponent(); @@ -174,7 +176,7 @@ class Double { // Precondition: the value encoded by this Double must be greater or equal // than +0.0. DiyFp UpperBoundary() const { - ASSERT(Sign() > 0); + DOUBLE_CONVERSION_ASSERT(Sign() > 0); return DiyFp(Significand() * 2 + 1, Exponent() - 1); } @@ -183,7 +185,7 @@ class Double { // exponent as m_plus. // Precondition: the value encoded by this Double must be greater than 0. void NormalizedBoundaries(DiyFp* out_m_minus, DiyFp* out_m_plus) const { - ASSERT(value() > 0.0); + DOUBLE_CONVERSION_ASSERT(value() > 0.0); DiyFp v = this->AsDiyFp(); DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1)); DiyFp m_minus; @@ -236,11 +238,9 @@ class Double { } private: - static const int kExponentBias = 0x3FF + kPhysicalSignificandSize; static const int kDenormalExponent = -kExponentBias + 1; - static const int kMaxExponent = 0x7FF - kExponentBias; - static const uint64_t kInfinity = UINT64_2PART_C(0x7FF00000, 00000000); - static const uint64_t kNaN = UINT64_2PART_C(0x7FF80000, 00000000); + static const uint64_t kInfinity = DOUBLE_CONVERSION_UINT64_2PART_C(0x7FF00000, 00000000); + static const uint64_t kNaN = DOUBLE_CONVERSION_UINT64_2PART_C(0x7FF80000, 00000000); const uint64_t d64_; @@ -271,7 +271,7 @@ class Double { (biased_exponent << kPhysicalSignificandSize); } - DC_DISALLOW_COPY_AND_ASSIGN(Double); + DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(Double); }; class Single { @@ -290,8 +290,8 @@ class Single { // The value encoded by this Single must be greater or equal to +0.0. // It must not be special (infinity, or NaN). DiyFp AsDiyFp() const { - ASSERT(Sign() > 0); - ASSERT(!IsSpecial()); + DOUBLE_CONVERSION_ASSERT(Sign() > 0); + DOUBLE_CONVERSION_ASSERT(!IsSpecial()); return DiyFp(Significand(), Exponent()); } @@ -354,7 +354,7 @@ class Single { // exponent as m_plus. // Precondition: the value encoded by this Single must be greater than 0. void NormalizedBoundaries(DiyFp* out_m_minus, DiyFp* out_m_plus) const { - ASSERT(value() > 0.0); + DOUBLE_CONVERSION_ASSERT(value() > 0.0); DiyFp v = this->AsDiyFp(); DiyFp m_plus = DiyFp::Normalize(DiyFp((v.f() << 1) + 1, v.e() - 1)); DiyFp m_minus; @@ -372,7 +372,7 @@ class Single { // Precondition: the value encoded by this Single must be greater or equal // than +0.0. DiyFp UpperBoundary() const { - ASSERT(Sign() > 0); + DOUBLE_CONVERSION_ASSERT(Sign() > 0); return DiyFp(Significand() * 2 + 1, Exponent() - 1); } @@ -408,7 +408,7 @@ class Single { const uint32_t d32_; - DC_DISALLOW_COPY_AND_ASSIGN(Single); + DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(Single); }; } // namespace double_conversion diff --git a/deps/icu-small/source/i18n/double-conversion.cpp b/deps/icu-small/source/i18n/double-conversion-string-to-double.cpp similarity index 63% rename from deps/icu-small/source/i18n/double-conversion.cpp rename to deps/icu-small/source/i18n/double-conversion-string-to-double.cpp index 1a60afbd64b6b7..946b2b26e77aa4 100644 --- a/deps/icu-small/source/i18n/double-conversion.cpp +++ b/deps/icu-small/source/i18n/double-conversion-string-to-double.cpp @@ -37,16 +37,13 @@ // ICU PATCH: Do not include std::locale. #include -//#include +// #include #include // ICU PATCH: Customize header file paths for ICU. -// The file fixed-dtoa.h is not needed. -#include "double-conversion.h" +#include "double-conversion-string-to-double.h" -#include "double-conversion-bignum-dtoa.h" -#include "double-conversion-fast-dtoa.h" #include "double-conversion-ieee.h" #include "double-conversion-strtod.h" #include "double-conversion-utils.h" @@ -56,385 +53,6 @@ U_NAMESPACE_BEGIN namespace double_conversion { -#if 0 // not needed for ICU -const DoubleToStringConverter& DoubleToStringConverter::EcmaScriptConverter() { - int flags = UNIQUE_ZERO | EMIT_POSITIVE_EXPONENT_SIGN; - static DoubleToStringConverter converter(flags, - "Infinity", - "NaN", - 'e', - -6, 21, - 6, 0); - return converter; -} - - -bool DoubleToStringConverter::HandleSpecialValues( - double value, - StringBuilder* result_builder) const { - Double double_inspect(value); - if (double_inspect.IsInfinite()) { - if (infinity_symbol_ == NULL) return false; - if (value < 0) { - result_builder->AddCharacter('-'); - } - result_builder->AddString(infinity_symbol_); - return true; - } - if (double_inspect.IsNan()) { - if (nan_symbol_ == NULL) return false; - result_builder->AddString(nan_symbol_); - return true; - } - return false; -} - - -void DoubleToStringConverter::CreateExponentialRepresentation( - const char* decimal_digits, - int length, - int exponent, - StringBuilder* result_builder) const { - ASSERT(length != 0); - result_builder->AddCharacter(decimal_digits[0]); - if (length != 1) { - result_builder->AddCharacter('.'); - result_builder->AddSubstring(&decimal_digits[1], length-1); - } - result_builder->AddCharacter(exponent_character_); - if (exponent < 0) { - result_builder->AddCharacter('-'); - exponent = -exponent; - } else { - if ((flags_ & EMIT_POSITIVE_EXPONENT_SIGN) != 0) { - result_builder->AddCharacter('+'); - } - } - if (exponent == 0) { - result_builder->AddCharacter('0'); - return; - } - ASSERT(exponent < 1e4); - const int kMaxExponentLength = 5; - char buffer[kMaxExponentLength + 1]; - buffer[kMaxExponentLength] = '\0'; - int first_char_pos = kMaxExponentLength; - while (exponent > 0) { - buffer[--first_char_pos] = '0' + (exponent % 10); - exponent /= 10; - } - result_builder->AddSubstring(&buffer[first_char_pos], - kMaxExponentLength - first_char_pos); -} - - -void DoubleToStringConverter::CreateDecimalRepresentation( - const char* decimal_digits, - int length, - int decimal_point, - int digits_after_point, - StringBuilder* result_builder) const { - // Create a representation that is padded with zeros if needed. - if (decimal_point <= 0) { - // "0.00000decimal_rep" or "0.000decimal_rep00". - result_builder->AddCharacter('0'); - if (digits_after_point > 0) { - result_builder->AddCharacter('.'); - result_builder->AddPadding('0', -decimal_point); - ASSERT(length <= digits_after_point - (-decimal_point)); - result_builder->AddSubstring(decimal_digits, length); - int remaining_digits = digits_after_point - (-decimal_point) - length; - result_builder->AddPadding('0', remaining_digits); - } - } else if (decimal_point >= length) { - // "decimal_rep0000.00000" or "decimal_rep.0000". - result_builder->AddSubstring(decimal_digits, length); - result_builder->AddPadding('0', decimal_point - length); - if (digits_after_point > 0) { - result_builder->AddCharacter('.'); - result_builder->AddPadding('0', digits_after_point); - } - } else { - // "decima.l_rep000". - ASSERT(digits_after_point > 0); - result_builder->AddSubstring(decimal_digits, decimal_point); - result_builder->AddCharacter('.'); - ASSERT(length - decimal_point <= digits_after_point); - result_builder->AddSubstring(&decimal_digits[decimal_point], - length - decimal_point); - int remaining_digits = digits_after_point - (length - decimal_point); - result_builder->AddPadding('0', remaining_digits); - } - if (digits_after_point == 0) { - if ((flags_ & EMIT_TRAILING_DECIMAL_POINT) != 0) { - result_builder->AddCharacter('.'); - } - if ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) { - result_builder->AddCharacter('0'); - } - } -} - - -bool DoubleToStringConverter::ToShortestIeeeNumber( - double value, - StringBuilder* result_builder, - DoubleToStringConverter::DtoaMode mode) const { - ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE); - if (Double(value).IsSpecial()) { - return HandleSpecialValues(value, result_builder); - } - - int decimal_point; - bool sign; - const int kDecimalRepCapacity = kBase10MaximalLength + 1; - char decimal_rep[kDecimalRepCapacity]; - int decimal_rep_length; - - DoubleToAscii(value, mode, 0, decimal_rep, kDecimalRepCapacity, - &sign, &decimal_rep_length, &decimal_point); - - bool unique_zero = (flags_ & UNIQUE_ZERO) != 0; - if (sign && (value != 0.0 || !unique_zero)) { - result_builder->AddCharacter('-'); - } - - int exponent = decimal_point - 1; - if ((decimal_in_shortest_low_ <= exponent) && - (exponent < decimal_in_shortest_high_)) { - CreateDecimalRepresentation(decimal_rep, decimal_rep_length, - decimal_point, - Max(0, decimal_rep_length - decimal_point), - result_builder); - } else { - CreateExponentialRepresentation(decimal_rep, decimal_rep_length, exponent, - result_builder); - } - return true; -} - - -bool DoubleToStringConverter::ToFixed(double value, - int requested_digits, - StringBuilder* result_builder) const { - ASSERT(kMaxFixedDigitsBeforePoint == 60); - const double kFirstNonFixed = 1e60; - - if (Double(value).IsSpecial()) { - return HandleSpecialValues(value, result_builder); - } - - if (requested_digits > kMaxFixedDigitsAfterPoint) return false; - if (value >= kFirstNonFixed || value <= -kFirstNonFixed) return false; - - // Find a sufficiently precise decimal representation of n. - int decimal_point; - bool sign; - // Add space for the '\0' byte. - const int kDecimalRepCapacity = - kMaxFixedDigitsBeforePoint + kMaxFixedDigitsAfterPoint + 1; - char decimal_rep[kDecimalRepCapacity]; - int decimal_rep_length; - DoubleToAscii(value, FIXED, requested_digits, - decimal_rep, kDecimalRepCapacity, - &sign, &decimal_rep_length, &decimal_point); - - bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); - if (sign && (value != 0.0 || !unique_zero)) { - result_builder->AddCharacter('-'); - } - - CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point, - requested_digits, result_builder); - return true; -} - - -bool DoubleToStringConverter::ToExponential( - double value, - int requested_digits, - StringBuilder* result_builder) const { - if (Double(value).IsSpecial()) { - return HandleSpecialValues(value, result_builder); - } - - if (requested_digits < -1) return false; - if (requested_digits > kMaxExponentialDigits) return false; - - int decimal_point; - bool sign; - // Add space for digit before the decimal point and the '\0' character. - const int kDecimalRepCapacity = kMaxExponentialDigits + 2; - ASSERT(kDecimalRepCapacity > kBase10MaximalLength); - char decimal_rep[kDecimalRepCapacity]; - int decimal_rep_length; - - if (requested_digits == -1) { - DoubleToAscii(value, SHORTEST, 0, - decimal_rep, kDecimalRepCapacity, - &sign, &decimal_rep_length, &decimal_point); - } else { - DoubleToAscii(value, PRECISION, requested_digits + 1, - decimal_rep, kDecimalRepCapacity, - &sign, &decimal_rep_length, &decimal_point); - ASSERT(decimal_rep_length <= requested_digits + 1); - - for (int i = decimal_rep_length; i < requested_digits + 1; ++i) { - decimal_rep[i] = '0'; - } - decimal_rep_length = requested_digits + 1; - } - - bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); - if (sign && (value != 0.0 || !unique_zero)) { - result_builder->AddCharacter('-'); - } - - int exponent = decimal_point - 1; - CreateExponentialRepresentation(decimal_rep, - decimal_rep_length, - exponent, - result_builder); - return true; -} - - -bool DoubleToStringConverter::ToPrecision(double value, - int precision, - StringBuilder* result_builder) const { - if (Double(value).IsSpecial()) { - return HandleSpecialValues(value, result_builder); - } - - if (precision < kMinPrecisionDigits || precision > kMaxPrecisionDigits) { - return false; - } - - // Find a sufficiently precise decimal representation of n. - int decimal_point; - bool sign; - // Add one for the terminating null character. - const int kDecimalRepCapacity = kMaxPrecisionDigits + 1; - char decimal_rep[kDecimalRepCapacity]; - int decimal_rep_length; - - DoubleToAscii(value, PRECISION, precision, - decimal_rep, kDecimalRepCapacity, - &sign, &decimal_rep_length, &decimal_point); - ASSERT(decimal_rep_length <= precision); - - bool unique_zero = ((flags_ & UNIQUE_ZERO) != 0); - if (sign && (value != 0.0 || !unique_zero)) { - result_builder->AddCharacter('-'); - } - - // The exponent if we print the number as x.xxeyyy. That is with the - // decimal point after the first digit. - int exponent = decimal_point - 1; - - int extra_zero = ((flags_ & EMIT_TRAILING_ZERO_AFTER_POINT) != 0) ? 1 : 0; - if ((-decimal_point + 1 > max_leading_padding_zeroes_in_precision_mode_) || - (decimal_point - precision + extra_zero > - max_trailing_padding_zeroes_in_precision_mode_)) { - // Fill buffer to contain 'precision' digits. - // Usually the buffer is already at the correct length, but 'DoubleToAscii' - // is allowed to return less characters. - for (int i = decimal_rep_length; i < precision; ++i) { - decimal_rep[i] = '0'; - } - - CreateExponentialRepresentation(decimal_rep, - precision, - exponent, - result_builder); - } else { - CreateDecimalRepresentation(decimal_rep, decimal_rep_length, decimal_point, - Max(0, precision - decimal_point), - result_builder); - } - return true; -} -#endif // not needed for ICU - - -static BignumDtoaMode DtoaToBignumDtoaMode( - DoubleToStringConverter::DtoaMode dtoa_mode) { - switch (dtoa_mode) { - case DoubleToStringConverter::SHORTEST: return BIGNUM_DTOA_SHORTEST; - case DoubleToStringConverter::SHORTEST_SINGLE: - return BIGNUM_DTOA_SHORTEST_SINGLE; - case DoubleToStringConverter::FIXED: return BIGNUM_DTOA_FIXED; - case DoubleToStringConverter::PRECISION: return BIGNUM_DTOA_PRECISION; - default: - UNREACHABLE(); - } -} - - -void DoubleToStringConverter::DoubleToAscii(double v, - DtoaMode mode, - int requested_digits, - char* buffer, - int buffer_length, - bool* sign, - int* length, - int* point) { - Vector vector(buffer, buffer_length); - ASSERT(!Double(v).IsSpecial()); - ASSERT(mode == SHORTEST || mode == SHORTEST_SINGLE || requested_digits >= 0); - - if (Double(v).Sign() < 0) { - *sign = true; - v = -v; - } else { - *sign = false; - } - - if (mode == PRECISION && requested_digits == 0) { - vector[0] = '\0'; - *length = 0; - return; - } - - if (v == 0) { - vector[0] = '0'; - vector[1] = '\0'; - *length = 1; - *point = 1; - return; - } - - bool fast_worked; - switch (mode) { - case SHORTEST: - fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST, 0, vector, length, point); - break; -#if 0 // not needed for ICU - case SHORTEST_SINGLE: - fast_worked = FastDtoa(v, FAST_DTOA_SHORTEST_SINGLE, 0, - vector, length, point); - break; - case FIXED: - fast_worked = FastFixedDtoa(v, requested_digits, vector, length, point); - break; - case PRECISION: - fast_worked = FastDtoa(v, FAST_DTOA_PRECISION, requested_digits, - vector, length, point); - break; -#endif // not needed for ICU - default: - fast_worked = false; - UNREACHABLE(); - } - if (fast_worked) return; - - // If the fast dtoa didn't succeed use the slower bignum version. - BignumDtoaMode bignum_mode = DtoaToBignumDtoaMode(mode); - BignumDtoa(v, bignum_mode, requested_digits, vector, length, point); - vector[*length] = '\0'; -} - - namespace { inline char ToLower(char ch) { @@ -444,7 +62,7 @@ inline char ToLower(char ch) { return cType.tolower(ch); #else (void)ch; - UNREACHABLE(); + DOUBLE_CONVERSION_UNREACHABLE(); #endif } @@ -457,7 +75,7 @@ static inline bool ConsumeSubStringImpl(Iterator* current, Iterator end, const char* substring, Converter converter) { - ASSERT(converter(**current) == *substring); + DOUBLE_CONVERSION_ASSERT(converter(**current) == *substring); for (substring++; *substring != '\0'; substring++) { ++*current; if (*current == end || converter(**current) != *substring) { @@ -474,8 +92,8 @@ template static bool ConsumeSubString(Iterator* current, Iterator end, const char* substring, - bool allow_case_insensibility) { - if (allow_case_insensibility) { + bool allow_case_insensitivity) { + if (allow_case_insensitivity) { return ConsumeSubStringImpl(current, end, substring, ToLower); } else { return ConsumeSubStringImpl(current, end, substring, Pass); @@ -485,8 +103,8 @@ static bool ConsumeSubString(Iterator* current, // Consumes first character of the str is equal to ch inline bool ConsumeFirstCharacter(char ch, const char* str, - bool case_insensibility) { - return case_insensibility ? ToLower(ch) == str[0] : ch == str[0]; + bool case_insensitivity) { + return case_insensitivity ? ToLower(ch) == str[0] : ch == str[0]; } } // namespace @@ -501,15 +119,14 @@ const int kMaxSignificantDigits = 772; static const char kWhitespaceTable7[] = { 32, 13, 10, 9, 11, 12 }; -static const int kWhitespaceTable7Length = ARRAY_SIZE(kWhitespaceTable7); +static const int kWhitespaceTable7Length = DOUBLE_CONVERSION_ARRAY_SIZE(kWhitespaceTable7); static const uc16 kWhitespaceTable16[] = { 160, 8232, 8233, 5760, 6158, 8192, 8193, 8194, 8195, 8196, 8197, 8198, 8199, 8200, 8201, 8202, 8239, 8287, 12288, 65279 }; -static const int kWhitespaceTable16Length = ARRAY_SIZE(kWhitespaceTable16); - +static const int kWhitespaceTable16Length = DOUBLE_CONVERSION_ARRAY_SIZE(kWhitespaceTable16); static bool isWhitespace(int x) { @@ -609,7 +226,7 @@ static bool IsHexFloatString(Iterator start, Iterator end, uc16 separator, bool allow_trailing_junk) { - ASSERT(start != end); + DOUBLE_CONVERSION_ASSERT(start != end); Iterator current = start; @@ -624,8 +241,8 @@ static bool IsHexFloatString(Iterator start, saw_digit = true; if (Advance(¤t, separator, 16, end)) return false; } - if (!saw_digit) return false; // Only the '.', but no digits. } + if (!saw_digit) return false; if (*current != 'p' && *current != 'P') return false; if (Advance(¤t, separator, 16, end)) return false; if (*current == '+' || *current == '-') { @@ -654,8 +271,8 @@ static double RadixStringToIeee(Iterator* current, double junk_string_value, bool read_as_double, bool* result_is_junk) { - ASSERT(*current != end); - ASSERT(!parse_as_hex_float || + DOUBLE_CONVERSION_ASSERT(*current != end); + DOUBLE_CONVERSION_ASSERT(!parse_as_hex_float || IsHexFloatString(*current, end, separator, allow_trailing_junk)); const int kDoubleSize = Double::kSignificandSize; @@ -693,7 +310,7 @@ static double RadixStringToIeee(Iterator* current, } else if (parse_as_hex_float && **current == '.') { post_decimal = true; Advance(current, separator, radix, end); - ASSERT(*current != end); + DOUBLE_CONVERSION_ASSERT(*current != end); continue; } else if (parse_as_hex_float && (**current == 'p' || **current == 'P')) { break; @@ -728,7 +345,7 @@ static double RadixStringToIeee(Iterator* current, // Just run over the '.'. We are just trying to see whether there is // a non-zero digit somewhere. Advance(current, separator, radix, end); - ASSERT(*current != end); + DOUBLE_CONVERSION_ASSERT(*current != end); post_decimal = true; } if (!isDigit(**current, radix)) break; @@ -763,27 +380,31 @@ static double RadixStringToIeee(Iterator* current, if (Advance(current, separator, radix, end)) break; } - ASSERT(number < ((int64_t)1 << kSignificandSize)); - ASSERT(static_cast(static_cast(number)) == number); + DOUBLE_CONVERSION_ASSERT(number < ((int64_t)1 << kSignificandSize)); + DOUBLE_CONVERSION_ASSERT(static_cast(static_cast(number)) == number); *result_is_junk = false; if (parse_as_hex_float) { - ASSERT(**current == 'p' || **current == 'P'); + DOUBLE_CONVERSION_ASSERT(**current == 'p' || **current == 'P'); Advance(current, separator, radix, end); - ASSERT(*current != end); + DOUBLE_CONVERSION_ASSERT(*current != end); bool is_negative = false; if (**current == '+') { Advance(current, separator, radix, end); - ASSERT(*current != end); + DOUBLE_CONVERSION_ASSERT(*current != end); } else if (**current == '-') { is_negative = true; Advance(current, separator, radix, end); - ASSERT(*current != end); + DOUBLE_CONVERSION_ASSERT(*current != end); } int written_exponent = 0; while (IsDecimalDigitForRadix(**current, 10)) { - written_exponent = 10 * written_exponent + **current - '0'; + // No need to read exponents if they are too big. That could potentially overflow + // the `written_exponent` variable. + if (abs(written_exponent) <= 100 * Double::kMaxExponent) { + written_exponent = 10 * written_exponent + **current - '0'; + } if (Advance(current, separator, radix, end)) break; } if (is_negative) written_exponent = -written_exponent; @@ -798,7 +419,7 @@ static double RadixStringToIeee(Iterator* current, return static_cast(number); } - ASSERT(number != 0); + DOUBLE_CONVERSION_ASSERT(number != 0); double result = Double(DiyFp(number, exponent)).value(); return sign ? -result : result; } @@ -818,7 +439,7 @@ double StringToDoubleConverter::StringToIeee( const bool allow_leading_spaces = (flags_ & ALLOW_LEADING_SPACES) != 0; const bool allow_trailing_spaces = (flags_ & ALLOW_TRAILING_SPACES) != 0; const bool allow_spaces_after_sign = (flags_ & ALLOW_SPACES_AFTER_SIGN) != 0; - const bool allow_case_insensibility = (flags_ & ALLOW_CASE_INSENSIBILITY) != 0; + const bool allow_case_insensitivity = (flags_ & ALLOW_CASE_INSENSITIVITY) != 0; // To make sure that iterator dereferencing is valid the following // convention is used: @@ -868,8 +489,8 @@ double StringToDoubleConverter::StringToIeee( } if (infinity_symbol_ != NULL) { - if (ConsumeFirstCharacter(*current, infinity_symbol_, allow_case_insensibility)) { - if (!ConsumeSubString(¤t, end, infinity_symbol_, allow_case_insensibility)) { + if (ConsumeFirstCharacter(*current, infinity_symbol_, allow_case_insensitivity)) { + if (!ConsumeSubString(¤t, end, infinity_symbol_, allow_case_insensitivity)) { return junk_string_value_; } @@ -880,15 +501,15 @@ double StringToDoubleConverter::StringToIeee( return junk_string_value_; } - ASSERT(buffer_pos == 0); + DOUBLE_CONVERSION_ASSERT(buffer_pos == 0); *processed_characters_count = static_cast(current - input); return sign ? -Double::Infinity() : Double::Infinity(); } } if (nan_symbol_ != NULL) { - if (ConsumeFirstCharacter(*current, nan_symbol_, allow_case_insensibility)) { - if (!ConsumeSubString(¤t, end, nan_symbol_, allow_case_insensibility)) { + if (ConsumeFirstCharacter(*current, nan_symbol_, allow_case_insensitivity)) { + if (!ConsumeSubString(¤t, end, nan_symbol_, allow_case_insensitivity)) { return junk_string_value_; } @@ -899,7 +520,7 @@ double StringToDoubleConverter::StringToIeee( return junk_string_value_; } - ASSERT(buffer_pos == 0); + DOUBLE_CONVERSION_ASSERT(buffer_pos == 0); *processed_characters_count = static_cast(current - input); return sign ? -Double::NaN() : Double::NaN(); } @@ -919,10 +540,11 @@ double StringToDoubleConverter::StringToIeee( (*current == 'x' || *current == 'X')) { ++current; + if (current == end) return junk_string_value_; // "0x" + bool parse_as_hex_float = (flags_ & ALLOW_HEX_FLOATS) && IsHexFloatString(current, end, separator_, allow_trailing_junk); - if (current == end) return junk_string_value_; // "0x" if (!parse_as_hex_float && !isDigit(*current, 16)) { return junk_string_value_; } @@ -958,7 +580,7 @@ double StringToDoubleConverter::StringToIeee( // Copy significant digits of the integer part (if any) to the buffer. while (*current >= '0' && *current <= '9') { if (significant_digits < kMaxSignificantDigits) { - ASSERT(buffer_pos < kBufferSize); + DOUBLE_CONVERSION_ASSERT(buffer_pos < kBufferSize); buffer[buffer_pos++] = static_cast(*current); significant_digits++; // Will later check if it's an octal in the buffer. @@ -1003,7 +625,7 @@ double StringToDoubleConverter::StringToIeee( // We don't emit a '.', but adjust the exponent instead. while (*current >= '0' && *current <= '9') { if (significant_digits < kMaxSignificantDigits) { - ASSERT(buffer_pos < kBufferSize); + DOUBLE_CONVERSION_ASSERT(buffer_pos < kBufferSize); buffer[buffer_pos++] = static_cast(*current); significant_digits++; exponent--; @@ -1061,7 +683,7 @@ double StringToDoubleConverter::StringToIeee( } const int max_exponent = INT_MAX / 2; - ASSERT(-max_exponent / 2 <= exponent && exponent <= max_exponent / 2); + DOUBLE_CONVERSION_ASSERT(-max_exponent / 2 <= exponent && exponent <= max_exponent / 2); int num = 0; do { // Check overflow. @@ -1104,7 +726,7 @@ double StringToDoubleConverter::StringToIeee( junk_string_value_, read_as_double, &result_is_junk); - ASSERT(!result_is_junk); + DOUBLE_CONVERSION_ASSERT(!result_is_junk); *processed_characters_count = static_cast(current - input); return result; } @@ -1114,7 +736,7 @@ double StringToDoubleConverter::StringToIeee( exponent--; } - ASSERT(buffer_pos < kBufferSize); + DOUBLE_CONVERSION_ASSERT(buffer_pos < kBufferSize); buffer[buffer_pos] = '\0'; double converted; diff --git a/deps/icu-small/source/i18n/double-conversion-string-to-double.h b/deps/icu-small/source/i18n/double-conversion-string-to-double.h new file mode 100644 index 00000000000000..2eb0c1f8979838 --- /dev/null +++ b/deps/icu-small/source/i18n/double-conversion-string-to-double.h @@ -0,0 +1,244 @@ +// © 2018 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// +// From the double-conversion library. Original license: +// +// Copyright 2012 the V8 project authors. 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 Google Inc. 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 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 +// OWNER 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. + +// ICU PATCH: ifdef around UCONFIG_NO_FORMATTING +#include "unicode/utypes.h" +#if !UCONFIG_NO_FORMATTING + +#ifndef DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ +#define DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ + +// ICU PATCH: Customize header file paths for ICU. + +#include "double-conversion-utils.h" + +// ICU PATCH: Wrap in ICU namespace +U_NAMESPACE_BEGIN + +namespace double_conversion { + +class StringToDoubleConverter { + public: + // Enumeration for allowing octals and ignoring junk when converting + // strings to numbers. + enum Flags { + NO_FLAGS = 0, + ALLOW_HEX = 1, + ALLOW_OCTALS = 2, + ALLOW_TRAILING_JUNK = 4, + ALLOW_LEADING_SPACES = 8, + ALLOW_TRAILING_SPACES = 16, + ALLOW_SPACES_AFTER_SIGN = 32, + ALLOW_CASE_INSENSITIVITY = 64, + ALLOW_CASE_INSENSIBILITY = 64, // Deprecated + ALLOW_HEX_FLOATS = 128, + }; + + static const uc16 kNoSeparator = '\0'; + + // Flags should be a bit-or combination of the possible Flags-enum. + // - NO_FLAGS: no special flags. + // - ALLOW_HEX: recognizes the prefix "0x". Hex numbers may only be integers. + // Ex: StringToDouble("0x1234") -> 4660.0 + // In StringToDouble("0x1234.56") the characters ".56" are trailing + // junk. The result of the call is hence dependent on + // the ALLOW_TRAILING_JUNK flag and/or the junk value. + // With this flag "0x" is a junk-string. Even with ALLOW_TRAILING_JUNK, + // the string will not be parsed as "0" followed by junk. + // + // - ALLOW_OCTALS: recognizes the prefix "0" for octals: + // If a sequence of octal digits starts with '0', then the number is + // read as octal integer. Octal numbers may only be integers. + // Ex: StringToDouble("01234") -> 668.0 + // StringToDouble("012349") -> 12349.0 // Not a sequence of octal + // // digits. + // In StringToDouble("01234.56") the characters ".56" are trailing + // junk. The result of the call is hence dependent on + // the ALLOW_TRAILING_JUNK flag and/or the junk value. + // In StringToDouble("01234e56") the characters "e56" are trailing + // junk, too. + // - ALLOW_TRAILING_JUNK: ignore trailing characters that are not part of + // a double literal. + // - ALLOW_LEADING_SPACES: skip over leading whitespace, including spaces, + // new-lines, and tabs. + // - ALLOW_TRAILING_SPACES: ignore trailing whitespace. + // - ALLOW_SPACES_AFTER_SIGN: ignore whitespace after the sign. + // Ex: StringToDouble("- 123.2") -> -123.2. + // StringToDouble("+ 123.2") -> 123.2 + // - ALLOW_CASE_INSENSITIVITY: ignore case of characters for special values: + // infinity and nan. + // - ALLOW_HEX_FLOATS: allows hexadecimal float literals. + // This *must* start with "0x" and separate the exponent with "p". + // Examples: 0x1.2p3 == 9.0 + // 0x10.1p0 == 16.0625 + // ALLOW_HEX and ALLOW_HEX_FLOATS are indendent. + // + // empty_string_value is returned when an empty string is given as input. + // If ALLOW_LEADING_SPACES or ALLOW_TRAILING_SPACES are set, then a string + // containing only spaces is converted to the 'empty_string_value', too. + // + // junk_string_value is returned when + // a) ALLOW_TRAILING_JUNK is not set, and a junk character (a character not + // part of a double-literal) is found. + // b) ALLOW_TRAILING_JUNK is set, but the string does not start with a + // double literal. + // + // infinity_symbol and nan_symbol are strings that are used to detect + // inputs that represent infinity and NaN. They can be null, in which case + // they are ignored. + // The conversion routine first reads any possible signs. Then it compares the + // following character of the input-string with the first character of + // the infinity, and nan-symbol. If either matches, the function assumes, that + // a match has been found, and expects the following input characters to match + // the remaining characters of the special-value symbol. + // This means that the following restrictions apply to special-value symbols: + // - they must not start with signs ('+', or '-'), + // - they must not have the same first character. + // - they must not start with digits. + // + // If the separator character is not kNoSeparator, then that specific + // character is ignored when in between two valid digits of the significant. + // It is not allowed to appear in the exponent. + // It is not allowed to lead or trail the number. + // It is not allowed to appear twice next to each other. + // + // Examples: + // flags = ALLOW_HEX | ALLOW_TRAILING_JUNK, + // empty_string_value = 0.0, + // junk_string_value = NaN, + // infinity_symbol = "infinity", + // nan_symbol = "nan": + // StringToDouble("0x1234") -> 4660.0. + // StringToDouble("0x1234K") -> 4660.0. + // StringToDouble("") -> 0.0 // empty_string_value. + // StringToDouble(" ") -> NaN // junk_string_value. + // StringToDouble(" 1") -> NaN // junk_string_value. + // StringToDouble("0x") -> NaN // junk_string_value. + // StringToDouble("-123.45") -> -123.45. + // StringToDouble("--123.45") -> NaN // junk_string_value. + // StringToDouble("123e45") -> 123e45. + // StringToDouble("123E45") -> 123e45. + // StringToDouble("123e+45") -> 123e45. + // StringToDouble("123E-45") -> 123e-45. + // StringToDouble("123e") -> 123.0 // trailing junk ignored. + // StringToDouble("123e-") -> 123.0 // trailing junk ignored. + // StringToDouble("+NaN") -> NaN // NaN string literal. + // StringToDouble("-infinity") -> -inf. // infinity literal. + // StringToDouble("Infinity") -> NaN // junk_string_value. + // + // flags = ALLOW_OCTAL | ALLOW_LEADING_SPACES, + // empty_string_value = 0.0, + // junk_string_value = NaN, + // infinity_symbol = NULL, + // nan_symbol = NULL: + // StringToDouble("0x1234") -> NaN // junk_string_value. + // StringToDouble("01234") -> 668.0. + // StringToDouble("") -> 0.0 // empty_string_value. + // StringToDouble(" ") -> 0.0 // empty_string_value. + // StringToDouble(" 1") -> 1.0 + // StringToDouble("0x") -> NaN // junk_string_value. + // StringToDouble("0123e45") -> NaN // junk_string_value. + // StringToDouble("01239E45") -> 1239e45. + // StringToDouble("-infinity") -> NaN // junk_string_value. + // StringToDouble("NaN") -> NaN // junk_string_value. + // + // flags = NO_FLAGS, + // separator = ' ': + // StringToDouble("1 2 3 4") -> 1234.0 + // StringToDouble("1 2") -> NaN // junk_string_value + // StringToDouble("1 000 000.0") -> 1000000.0 + // StringToDouble("1.000 000") -> 1.0 + // StringToDouble("1.0e1 000") -> NaN // junk_string_value + StringToDoubleConverter(int flags, + double empty_string_value, + double junk_string_value, + const char* infinity_symbol, + const char* nan_symbol, + uc16 separator = kNoSeparator) + : flags_(flags), + empty_string_value_(empty_string_value), + junk_string_value_(junk_string_value), + infinity_symbol_(infinity_symbol), + nan_symbol_(nan_symbol), + separator_(separator) { + } + + // Performs the conversion. + // The output parameter 'processed_characters_count' is set to the number + // of characters that have been processed to read the number. + // Spaces than are processed with ALLOW_{LEADING|TRAILING}_SPACES are included + // in the 'processed_characters_count'. Trailing junk is never included. + double StringToDouble(const char* buffer, + int length, + int* processed_characters_count) const; + + // Same as StringToDouble above but for 16 bit characters. + double StringToDouble(const uc16* buffer, + int length, + int* processed_characters_count) const; + + // Same as StringToDouble but reads a float. + // Note that this is not equivalent to static_cast(StringToDouble(...)) + // due to potential double-rounding. + float StringToFloat(const char* buffer, + int length, + int* processed_characters_count) const; + + // Same as StringToFloat above but for 16 bit characters. + float StringToFloat(const uc16* buffer, + int length, + int* processed_characters_count) const; + + private: + const int flags_; + const double empty_string_value_; + const double junk_string_value_; + const char* const infinity_symbol_; + const char* const nan_symbol_; + const uc16 separator_; + + template + double StringToIeee(Iterator start_pointer, + int length, + bool read_as_double, + int* processed_characters_count) const; + + DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(StringToDoubleConverter); +}; + +} // namespace double_conversion + +// ICU PATCH: Close ICU namespace +U_NAMESPACE_END + +#endif // DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ +#endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/deps/icu-small/source/i18n/double-conversion-strtod.cpp b/deps/icu-small/source/i18n/double-conversion-strtod.cpp index be9b0b3bce0e76..9cf4854426756c 100644 --- a/deps/icu-small/source/i18n/double-conversion-strtod.cpp +++ b/deps/icu-small/source/i18n/double-conversion-strtod.cpp @@ -34,16 +34,15 @@ #include "unicode/utypes.h" #if !UCONFIG_NO_FORMATTING -#include -#include +#include +#include // ICU PATCH: Customize header file paths for ICU. -// The file fixed-dtoa.h is not needed. -#include "double-conversion-strtod.h" #include "double-conversion-bignum.h" #include "double-conversion-cached-powers.h" #include "double-conversion-ieee.h" +#include "double-conversion-strtod.h" // ICU PATCH: Wrap in ICU namespace U_NAMESPACE_BEGIN @@ -67,7 +66,7 @@ static const int kMaxDecimalPower = 309; static const int kMinDecimalPower = -324; // 2^64 = 18446744073709551616 -static const uint64_t kMaxUint64 = UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF); +static const uint64_t kMaxUint64 = DOUBLE_CONVERSION_UINT64_2PART_C(0xFFFFFFFF, FFFFFFFF); static const double exact_powers_of_ten[] = { @@ -96,7 +95,7 @@ static const double exact_powers_of_ten[] = { // 10^22 = 0x21e19e0c9bab2400000 = 0x878678326eac9 * 2^22 10000000000000000000000.0 }; -static const int kExactPowersOfTenSize = ARRAY_SIZE(exact_powers_of_ten); +static const int kExactPowersOfTenSize = DOUBLE_CONVERSION_ARRAY_SIZE(exact_powers_of_ten); // Maximum number of significant digits in the decimal representation. // In fact the value is 772 (see conversions.cc), but to give us some margin @@ -132,7 +131,7 @@ static void CutToMaxSignificantDigits(Vector buffer, } // The input buffer has been trimmed. Therefore the last digit must be // different from '0'. - ASSERT(buffer[buffer.length() - 1] != '0'); + DOUBLE_CONVERSION_ASSERT(buffer[buffer.length() - 1] != '0'); // Set the last digit to be non-zero. This is sufficient to guarantee // correct rounding. significant_buffer[kMaxSignificantDecimalDigits - 1] = '1'; @@ -153,7 +152,7 @@ static void TrimAndCut(Vector buffer, int exponent, exponent += left_trimmed.length() - right_trimmed.length(); if (right_trimmed.length() > kMaxSignificantDecimalDigits) { (void) space_size; // Mark variable as used. - ASSERT(space_size >= kMaxSignificantDecimalDigits); + DOUBLE_CONVERSION_ASSERT(space_size >= kMaxSignificantDecimalDigits); CutToMaxSignificantDigits(right_trimmed, exponent, buffer_copy_space, updated_exponent); *trimmed = Vector(buffer_copy_space, @@ -176,7 +175,7 @@ static uint64_t ReadUint64(Vector buffer, int i = 0; while (i < buffer.length() && result <= (kMaxUint64 / 10 - 1)) { int digit = buffer[i++] - '0'; - ASSERT(0 <= digit && digit <= 9); + DOUBLE_CONVERSION_ASSERT(0 <= digit && digit <= 9); result = 10 * result + digit; } *number_of_read_digits = i; @@ -220,7 +219,7 @@ static bool DoubleStrtod(Vector trimmed, // Note that the ARM simulator is compiled for 32bits. It therefore exhibits // the same problem. return false; -#endif +#else if (trimmed.length() <= kMaxExactDoubleIntegerDecimalDigits) { int read_digits; // The trimmed input fits into a double. @@ -232,14 +231,14 @@ static bool DoubleStrtod(Vector trimmed, if (exponent < 0 && -exponent < kExactPowersOfTenSize) { // 10^-exponent fits into a double. *result = static_cast(ReadUint64(trimmed, &read_digits)); - ASSERT(read_digits == trimmed.length()); + DOUBLE_CONVERSION_ASSERT(read_digits == trimmed.length()); *result /= exact_powers_of_ten[-exponent]; return true; } if (0 <= exponent && exponent < kExactPowersOfTenSize) { // 10^exponent fits into a double. *result = static_cast(ReadUint64(trimmed, &read_digits)); - ASSERT(read_digits == trimmed.length()); + DOUBLE_CONVERSION_ASSERT(read_digits == trimmed.length()); *result *= exact_powers_of_ten[exponent]; return true; } @@ -251,34 +250,35 @@ static bool DoubleStrtod(Vector trimmed, // 10^remaining_digits. As a result the remaining exponent now fits // into a double too. *result = static_cast(ReadUint64(trimmed, &read_digits)); - ASSERT(read_digits == trimmed.length()); + DOUBLE_CONVERSION_ASSERT(read_digits == trimmed.length()); *result *= exact_powers_of_ten[remaining_digits]; *result *= exact_powers_of_ten[exponent - remaining_digits]; return true; } } return false; +#endif } // Returns 10^exponent as an exact DiyFp. // The given exponent must be in the range [1; kDecimalExponentDistance[. static DiyFp AdjustmentPowerOfTen(int exponent) { - ASSERT(0 < exponent); - ASSERT(exponent < PowersOfTenCache::kDecimalExponentDistance); + DOUBLE_CONVERSION_ASSERT(0 < exponent); + DOUBLE_CONVERSION_ASSERT(exponent < PowersOfTenCache::kDecimalExponentDistance); // Simply hardcode the remaining powers for the given decimal exponent // distance. - ASSERT(PowersOfTenCache::kDecimalExponentDistance == 8); + DOUBLE_CONVERSION_ASSERT(PowersOfTenCache::kDecimalExponentDistance == 8); switch (exponent) { - case 1: return DiyFp(UINT64_2PART_C(0xa0000000, 00000000), -60); - case 2: return DiyFp(UINT64_2PART_C(0xc8000000, 00000000), -57); - case 3: return DiyFp(UINT64_2PART_C(0xfa000000, 00000000), -54); - case 4: return DiyFp(UINT64_2PART_C(0x9c400000, 00000000), -50); - case 5: return DiyFp(UINT64_2PART_C(0xc3500000, 00000000), -47); - case 6: return DiyFp(UINT64_2PART_C(0xf4240000, 00000000), -44); - case 7: return DiyFp(UINT64_2PART_C(0x98968000, 00000000), -40); + case 1: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xa0000000, 00000000), -60); + case 2: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xc8000000, 00000000), -57); + case 3: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xfa000000, 00000000), -54); + case 4: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0x9c400000, 00000000), -50); + case 5: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xc3500000, 00000000), -47); + case 6: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0xf4240000, 00000000), -44); + case 7: return DiyFp(DOUBLE_CONVERSION_UINT64_2PART_C(0x98968000, 00000000), -40); default: - UNREACHABLE(); + DOUBLE_CONVERSION_UNREACHABLE(); } } @@ -307,7 +307,7 @@ static bool DiyFpStrtod(Vector buffer, input.Normalize(); error <<= old_e - input.e(); - ASSERT(exponent <= PowersOfTenCache::kMaxDecimalExponent); + DOUBLE_CONVERSION_ASSERT(exponent <= PowersOfTenCache::kMaxDecimalExponent); if (exponent < PowersOfTenCache::kMinDecimalExponent) { *result = 0.0; return true; @@ -325,7 +325,7 @@ static bool DiyFpStrtod(Vector buffer, if (kMaxUint64DecimalDigits - buffer.length() >= adjustment_exponent) { // The product of input with the adjustment power fits into a 64 bit // integer. - ASSERT(DiyFp::kSignificandSize == 64); + DOUBLE_CONVERSION_ASSERT(DiyFp::kSignificandSize == 64); } else { // The adjustment power is exact. There is hence only an error of 0.5. error += kDenominator / 2; @@ -367,8 +367,8 @@ static bool DiyFpStrtod(Vector buffer, precision_digits_count -= shift_amount; } // We use uint64_ts now. This only works if the DiyFp uses uint64_ts too. - ASSERT(DiyFp::kSignificandSize == 64); - ASSERT(precision_digits_count < 64); + DOUBLE_CONVERSION_ASSERT(DiyFp::kSignificandSize == 64); + DOUBLE_CONVERSION_ASSERT(precision_digits_count < 64); uint64_t one64 = 1; uint64_t precision_bits_mask = (one64 << precision_digits_count) - 1; uint64_t precision_bits = input.f() & precision_bits_mask; @@ -407,14 +407,14 @@ static bool DiyFpStrtod(Vector buffer, static int CompareBufferWithDiyFp(Vector buffer, int exponent, DiyFp diy_fp) { - ASSERT(buffer.length() + exponent <= kMaxDecimalPower + 1); - ASSERT(buffer.length() + exponent > kMinDecimalPower); - ASSERT(buffer.length() <= kMaxSignificantDecimalDigits); + DOUBLE_CONVERSION_ASSERT(buffer.length() + exponent <= kMaxDecimalPower + 1); + DOUBLE_CONVERSION_ASSERT(buffer.length() + exponent > kMinDecimalPower); + DOUBLE_CONVERSION_ASSERT(buffer.length() <= kMaxSignificantDecimalDigits); // Make sure that the Bignum will be able to hold all our numbers. // Our Bignum implementation has a separate field for exponents. Shifts will // consume at most one bigit (< 64 bits). // ln(10) == 3.3219... - ASSERT(((kMaxDecimalPower + 1) * 333 / 100) < Bignum::kMaxSignificantBits); + DOUBLE_CONVERSION_ASSERT(((kMaxDecimalPower + 1) * 333 / 100) < Bignum::kMaxSignificantBits); Bignum buffer_bignum; Bignum diy_fp_bignum; buffer_bignum.AssignDecimalString(buffer); @@ -460,18 +460,33 @@ static bool ComputeGuess(Vector trimmed, int exponent, return false; } -double Strtod(Vector buffer, int exponent) { - char copy_buffer[kMaxSignificantDecimalDigits]; - Vector trimmed; - int updated_exponent; - TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits, - &trimmed, &updated_exponent); - exponent = updated_exponent; +#if U_DEBUG // needed for ICU only in debug mode +static bool IsDigit(const char d) { + return ('0' <= d) && (d <= '9'); +} - double guess; - bool is_correct = ComputeGuess(trimmed, exponent, &guess); - if (is_correct) return guess; +static bool IsNonZeroDigit(const char d) { + return ('1' <= d) && (d <= '9'); +} + +static bool AssertTrimmedDigits(const Vector& buffer) { + for(int i = 0; i < buffer.length(); ++i) { + if(!IsDigit(buffer[i])) { + return false; + } + } + return (buffer.length() == 0) || (IsNonZeroDigit(buffer[0]) && IsNonZeroDigit(buffer[buffer.length()-1])); +} +#endif // needed for ICU only in debug mode +double StrtodTrimmed(Vector trimmed, int exponent) { + DOUBLE_CONVERSION_ASSERT(trimmed.length() <= kMaxSignificantDecimalDigits); + DOUBLE_CONVERSION_ASSERT(AssertTrimmedDigits(trimmed)); + double guess; + const bool is_correct = ComputeGuess(trimmed, exponent, &guess); + if (is_correct) { + return guess; + } DiyFp upper_boundary = Double(guess).UpperBoundary(); int comparison = CompareBufferWithDiyFp(trimmed, exponent, upper_boundary); if (comparison < 0) { @@ -486,6 +501,39 @@ double Strtod(Vector buffer, int exponent) { } } +double Strtod(Vector buffer, int exponent) { + char copy_buffer[kMaxSignificantDecimalDigits]; + Vector trimmed; + int updated_exponent; + TrimAndCut(buffer, exponent, copy_buffer, kMaxSignificantDecimalDigits, + &trimmed, &updated_exponent); + return StrtodTrimmed(trimmed, updated_exponent); +} + +static float SanitizedDoubletof(double d) { + DOUBLE_CONVERSION_ASSERT(d >= 0.0); + // ASAN has a sanitize check that disallows casting doubles to floats if + // they are too big. + // https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html#available-checks + // The behavior should be covered by IEEE 754, but some projects use this + // flag, so work around it. + float max_finite = 3.4028234663852885981170418348451692544e+38; + // The half-way point between the max-finite and infinity value. + // Since infinity has an even significand everything equal or greater than + // this value should become infinity. + double half_max_finite_infinity = + 3.40282356779733661637539395458142568448e+38; + if (d >= max_finite) { + if (d >= half_max_finite_infinity) { + return Single::Infinity(); + } else { + return max_finite; + } + } else { + return static_cast(d); + } +} + float Strtof(Vector buffer, int exponent) { char copy_buffer[kMaxSignificantDecimalDigits]; Vector trimmed; @@ -497,7 +545,7 @@ float Strtof(Vector buffer, int exponent) { double double_guess; bool is_correct = ComputeGuess(trimmed, exponent, &double_guess); - float float_guess = static_cast(double_guess); + float float_guess = SanitizedDoubletof(double_guess); if (float_guess == double_guess) { // This shortcut triggers for integer values. return float_guess; @@ -520,18 +568,18 @@ float Strtof(Vector buffer, int exponent) { double double_next = Double(double_guess).NextDouble(); double double_previous = Double(double_guess).PreviousDouble(); - float f1 = static_cast(double_previous); + float f1 = SanitizedDoubletof(double_previous); float f2 = float_guess; - float f3 = static_cast(double_next); + float f3 = SanitizedDoubletof(double_next); float f4; if (is_correct) { f4 = f3; } else { double double_next2 = Double(double_next).NextDouble(); - f4 = static_cast(double_next2); + f4 = SanitizedDoubletof(double_next2); } (void) f2; // Mark variable as used. - ASSERT(f1 <= f2 && f2 <= f3 && f3 <= f4); + DOUBLE_CONVERSION_ASSERT(f1 <= f2 && f2 <= f3 && f3 <= f4); // If the guess doesn't lie near a single-precision boundary we can simply // return its float-value. @@ -539,11 +587,11 @@ float Strtof(Vector buffer, int exponent) { return float_guess; } - ASSERT((f1 != f2 && f2 == f3 && f3 == f4) || + DOUBLE_CONVERSION_ASSERT((f1 != f2 && f2 == f3 && f3 == f4) || (f1 == f2 && f2 != f3 && f3 == f4) || (f1 == f2 && f2 == f3 && f3 != f4)); - // guess and next are the two possible canditates (in the same way that + // guess and next are the two possible candidates (in the same way that // double_guess was the lower candidate for a double-precision guess). float guess = f1; float next = f4; diff --git a/deps/icu-small/source/i18n/double-conversion-strtod.h b/deps/icu-small/source/i18n/double-conversion-strtod.h index e2d6d3c2fe5d7d..50ef746401a908 100644 --- a/deps/icu-small/source/i18n/double-conversion-strtod.h +++ b/deps/icu-small/source/i18n/double-conversion-strtod.h @@ -54,6 +54,11 @@ double Strtod(Vector buffer, int exponent); // contain a dot or a sign. It must not start with '0', and must not be empty. float Strtof(Vector buffer, int exponent); +// For special use cases, the heart of the Strtod() function is also available +// separately, it assumes that 'trimmed' is as produced by TrimAndCut(), i.e. +// no leading or trailing zeros, also no lone zero, and not 'too many' digits. +double StrtodTrimmed(Vector trimmed, int exponent); + } // namespace double_conversion // ICU PATCH: Close ICU namespace diff --git a/deps/icu-small/source/i18n/double-conversion-utils.h b/deps/icu-small/source/i18n/double-conversion-utils.h index 1e44fcaa0e398d..099298460c63d9 100644 --- a/deps/icu-small/source/i18n/double-conversion-utils.h +++ b/deps/icu-small/source/i18n/double-conversion-utils.h @@ -42,10 +42,12 @@ // ICU PATCH: Use U_ASSERT instead of #include "uassert.h" -#define ASSERT U_ASSERT - -#ifndef UNIMPLEMENTED -#define UNIMPLEMENTED() (abort()) +#ifndef DOUBLE_CONVERSION_ASSERT +#define DOUBLE_CONVERSION_ASSERT(condition) \ + U_ASSERT(condition); +#endif +#ifndef DOUBLE_CONVERSION_UNIMPLEMENTED +#define DOUBLE_CONVERSION_UNIMPLEMENTED() (abort()) #endif #ifndef DOUBLE_CONVERSION_NO_RETURN #ifdef _MSC_VER @@ -54,16 +56,23 @@ #define DOUBLE_CONVERSION_NO_RETURN __attribute__((noreturn)) #endif #endif -#ifndef UNREACHABLE +#ifndef DOUBLE_CONVERSION_UNREACHABLE #ifdef _MSC_VER void DOUBLE_CONVERSION_NO_RETURN abort_noreturn(); inline void abort_noreturn() { abort(); } -#define UNREACHABLE() (abort_noreturn()) +#define DOUBLE_CONVERSION_UNREACHABLE() (abort_noreturn()) #else -#define UNREACHABLE() (abort()) +#define DOUBLE_CONVERSION_UNREACHABLE() (abort()) #endif #endif +#ifndef DOUBLE_CONVERSION_UNUSED +#ifdef __GNUC__ +#define DOUBLE_CONVERSION_UNUSED __attribute__((unused)) +#else +#define DOUBLE_CONVERSION_UNUSED +#endif +#endif // Double operations detection based on target architecture. // Linux uses a 80bit wide floating point stack on x86. This induces double @@ -99,9 +108,9 @@ int main(int argc, char** argv) { defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ + defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\ defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || \ + defined(__riscv) || defined(__e2k__) || \ defined(__or1k__) || defined(__arc__) || \ defined(__EMSCRIPTEN__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 @@ -141,24 +150,24 @@ typedef uint16_t uc16; // The following macro works on both 32 and 64-bit platforms. // Usage: instead of writing 0x1234567890123456 -// write UINT64_2PART_C(0x12345678,90123456); -#define UINT64_2PART_C(a, b) (((static_cast(a) << 32) + 0x##b##u)) +// write DOUBLE_CONVERSION_UINT64_2PART_C(0x12345678,90123456); +#define DOUBLE_CONVERSION_UINT64_2PART_C(a, b) (((static_cast(a) << 32) + 0x##b##u)) -// The expression ARRAY_SIZE(a) is a compile-time constant of type +// The expression DOUBLE_CONVERSION_ARRAY_SIZE(a) is a compile-time constant of type // size_t which represents the number of elements of the given -// array. You should only use ARRAY_SIZE on statically allocated +// array. You should only use DOUBLE_CONVERSION_ARRAY_SIZE on statically allocated // arrays. -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(a) \ +#ifndef DOUBLE_CONVERSION_ARRAY_SIZE +#define DOUBLE_CONVERSION_ARRAY_SIZE(a) \ ((sizeof(a) / sizeof(*(a))) / \ static_cast(!(sizeof(a) % sizeof(*(a))))) #endif // A macro to disallow the evil copy constructor and operator= functions // This should be used in the private: declarations for a class -#ifndef DC_DISALLOW_COPY_AND_ASSIGN -#define DC_DISALLOW_COPY_AND_ASSIGN(TypeName) \ +#ifndef DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN +#define DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName&); \ void operator=(const TypeName&) #endif @@ -169,10 +178,10 @@ typedef uint16_t uc16; // This should be used in the private: declarations for a class // that wants to prevent anyone from instantiating it. This is // especially useful for classes containing only static methods. -#ifndef DC_DISALLOW_IMPLICIT_CONSTRUCTORS -#define DC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ +#ifndef DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS +#define DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ TypeName(); \ - DC_DISALLOW_COPY_AND_ASSIGN(TypeName) + DOUBLE_CONVERSION_DISALLOW_COPY_AND_ASSIGN(TypeName) #endif // ICU PATCH: Wrap in ICU namespace @@ -180,25 +189,9 @@ U_NAMESPACE_BEGIN namespace double_conversion { -static const int kCharSize = sizeof(char); - -// Returns the maximum of the two parameters. -template -static T Max(T a, T b) { - return a < b ? b : a; -} - - -// Returns the minimum of the two parameters. -template -static T Min(T a, T b) { - return a < b ? a : b; -} - - inline int StrLength(const char* string) { size_t length = strlen(string); - ASSERT(length == static_cast(static_cast(length))); + DOUBLE_CONVERSION_ASSERT(length == static_cast(static_cast(length))); return static_cast(length); } @@ -208,15 +201,15 @@ class Vector { public: Vector() : start_(NULL), length_(0) {} Vector(T* data, int len) : start_(data), length_(len) { - ASSERT(len == 0 || (len > 0 && data != NULL)); + DOUBLE_CONVERSION_ASSERT(len == 0 || (len > 0 && data != NULL)); } // Returns a vector using the same backing storage as this one, // spanning from and including 'from', to but not including 'to'. Vector SubVector(int from, int to) { - ASSERT(to <= length_); - ASSERT(from < to); - ASSERT(0 <= from); + DOUBLE_CONVERSION_ASSERT(to <= length_); + DOUBLE_CONVERSION_ASSERT(from < to); + DOUBLE_CONVERSION_ASSERT(0 <= from); return Vector(start() + from, to - from); } @@ -231,7 +224,7 @@ class Vector { // Access individual vector elements - checks bounds in debug mode. T& operator[](int index) const { - ASSERT(0 <= index && index < length_); + DOUBLE_CONVERSION_ASSERT(0 <= index && index < length_); return start_[index]; } @@ -239,6 +232,11 @@ class Vector { T& last() { return start_[length_ - 1]; } + void pop_back() { + DOUBLE_CONVERSION_ASSERT(!is_empty()); + --length_; + } + private: T* start_; int length_; @@ -259,7 +257,7 @@ class StringBuilder { // Get the current position in the builder. int position() const { - ASSERT(!is_finalized()); + DOUBLE_CONVERSION_ASSERT(!is_finalized()); return position_; } @@ -270,8 +268,8 @@ class StringBuilder { // 0-characters; use the Finalize() method to terminate the string // instead. void AddCharacter(char c) { - ASSERT(c != '\0'); - ASSERT(!is_finalized() && position_ < buffer_.length()); + DOUBLE_CONVERSION_ASSERT(c != '\0'); + DOUBLE_CONVERSION_ASSERT(!is_finalized() && position_ < buffer_.length()); buffer_[position_++] = c; } @@ -284,9 +282,9 @@ class StringBuilder { // Add the first 'n' characters of the given string 's' to the // builder. The input string must have enough characters. void AddSubstring(const char* s, int n) { - ASSERT(!is_finalized() && position_ + n < buffer_.length()); - ASSERT(static_cast(n) <= strlen(s)); - memmove(&buffer_[position_], s, n * kCharSize); + DOUBLE_CONVERSION_ASSERT(!is_finalized() && position_ + n < buffer_.length()); + DOUBLE_CONVERSION_ASSERT(static_cast(n) <= strlen(s)); + memmove(&buffer_[position_], s, n); position_ += n; } @@ -301,13 +299,13 @@ class StringBuilder { // Finalize the string by 0-terminating it and returning the buffer. char* Finalize() { - ASSERT(!is_finalized() && position_ < buffer_.length()); + DOUBLE_CONVERSION_ASSERT(!is_finalized() && position_ < buffer_.length()); buffer_[position_] = '\0'; // Make sure nobody managed to add a 0-character to the // buffer while building the string. - ASSERT(strlen(buffer_.start()) == static_cast(position_)); + DOUBLE_CONVERSION_ASSERT(strlen(buffer_.start()) == static_cast(position_)); position_ = -1; - ASSERT(is_finalized()); + DOUBLE_CONVERSION_ASSERT(is_finalized()); return buffer_.start(); } @@ -317,7 +315,7 @@ class StringBuilder { bool is_finalized() const { return position_ < 0; } - DC_DISALLOW_IMPLICIT_CONSTRUCTORS(StringBuilder); + DOUBLE_CONVERSION_DISALLOW_IMPLICIT_CONSTRUCTORS(StringBuilder); }; // The type-based aliasing rule allows the compiler to assume that pointers of @@ -345,13 +343,14 @@ class StringBuilder { // enough that it can no longer see that you have cast one pointer type to // another thus avoiding the warning. template -inline Dest BitCast(const Source& source) { +Dest BitCast(const Source& source) { // Compile time assertion: sizeof(Dest) == sizeof(Source) // A compile error here means your Dest and Source have different sizes. #if __cplusplus >= 201103L static_assert(sizeof(Dest) == sizeof(Source), "source and destination size mismatch"); #else + DOUBLE_CONVERSION_UNUSED typedef char VerifySizesAreEqual[sizeof(Dest) == sizeof(Source) ? 1 : -1]; #endif @@ -361,7 +360,7 @@ inline Dest BitCast(const Source& source) { } template -inline Dest BitCast(Source* source) { +Dest BitCast(Source* source) { return BitCast(reinterpret_cast(source)); } diff --git a/deps/icu-small/source/i18n/double-conversion.h b/deps/icu-small/source/i18n/double-conversion.h index 377c710bf791e7..eddc38763becdc 100644 --- a/deps/icu-small/source/i18n/double-conversion.h +++ b/deps/icu-small/source/i18n/double-conversion.h @@ -39,561 +39,8 @@ // ICU PATCH: Customize header file paths for ICU. -#include "double-conversion-utils.h" - -// ICU PATCH: Wrap in ICU namespace -U_NAMESPACE_BEGIN - -namespace double_conversion { - -class DoubleToStringConverter { - public: -#if 0 // not needed for ICU - // When calling ToFixed with a double > 10^kMaxFixedDigitsBeforePoint - // or a requested_digits parameter > kMaxFixedDigitsAfterPoint then the - // function returns false. - static const int kMaxFixedDigitsBeforePoint = 60; - static const int kMaxFixedDigitsAfterPoint = 60; - - // When calling ToExponential with a requested_digits - // parameter > kMaxExponentialDigits then the function returns false. - static const int kMaxExponentialDigits = 120; - - // When calling ToPrecision with a requested_digits - // parameter < kMinPrecisionDigits or requested_digits > kMaxPrecisionDigits - // then the function returns false. - static const int kMinPrecisionDigits = 1; - static const int kMaxPrecisionDigits = 120; - - enum Flags { - NO_FLAGS = 0, - EMIT_POSITIVE_EXPONENT_SIGN = 1, - EMIT_TRAILING_DECIMAL_POINT = 2, - EMIT_TRAILING_ZERO_AFTER_POINT = 4, - UNIQUE_ZERO = 8 - }; - - // Flags should be a bit-or combination of the possible Flags-enum. - // - NO_FLAGS: no special flags. - // - EMIT_POSITIVE_EXPONENT_SIGN: when the number is converted into exponent - // form, emits a '+' for positive exponents. Example: 1.2e+2. - // - EMIT_TRAILING_DECIMAL_POINT: when the input number is an integer and is - // converted into decimal format then a trailing decimal point is appended. - // Example: 2345.0 is converted to "2345.". - // - EMIT_TRAILING_ZERO_AFTER_POINT: in addition to a trailing decimal point - // emits a trailing '0'-character. This flag requires the - // EXMIT_TRAILING_DECIMAL_POINT flag. - // Example: 2345.0 is converted to "2345.0". - // - UNIQUE_ZERO: "-0.0" is converted to "0.0". - // - // Infinity symbol and nan_symbol provide the string representation for these - // special values. If the string is NULL and the special value is encountered - // then the conversion functions return false. - // - // The exponent_character is used in exponential representations. It is - // usually 'e' or 'E'. - // - // When converting to the shortest representation the converter will - // represent input numbers in decimal format if they are in the interval - // [10^decimal_in_shortest_low; 10^decimal_in_shortest_high[ - // (lower boundary included, greater boundary excluded). - // Example: with decimal_in_shortest_low = -6 and - // decimal_in_shortest_high = 21: - // ToShortest(0.000001) -> "0.000001" - // ToShortest(0.0000001) -> "1e-7" - // ToShortest(111111111111111111111.0) -> "111111111111111110000" - // ToShortest(100000000000000000000.0) -> "100000000000000000000" - // ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21" - // - // When converting to precision mode the converter may add - // max_leading_padding_zeroes before returning the number in exponential - // format. - // Example with max_leading_padding_zeroes_in_precision_mode = 6. - // ToPrecision(0.0000012345, 2) -> "0.0000012" - // ToPrecision(0.00000012345, 2) -> "1.2e-7" - // Similarily the converter may add up to - // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid - // returning an exponential representation. A zero added by the - // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit. - // Examples for max_trailing_padding_zeroes_in_precision_mode = 1: - // ToPrecision(230.0, 2) -> "230" - // ToPrecision(230.0, 2) -> "230." with EMIT_TRAILING_DECIMAL_POINT. - // ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT. - DoubleToStringConverter(int flags, - const char* infinity_symbol, - const char* nan_symbol, - char exponent_character, - int decimal_in_shortest_low, - int decimal_in_shortest_high, - int max_leading_padding_zeroes_in_precision_mode, - int max_trailing_padding_zeroes_in_precision_mode) - : flags_(flags), - infinity_symbol_(infinity_symbol), - nan_symbol_(nan_symbol), - exponent_character_(exponent_character), - decimal_in_shortest_low_(decimal_in_shortest_low), - decimal_in_shortest_high_(decimal_in_shortest_high), - max_leading_padding_zeroes_in_precision_mode_( - max_leading_padding_zeroes_in_precision_mode), - max_trailing_padding_zeroes_in_precision_mode_( - max_trailing_padding_zeroes_in_precision_mode) { - // When 'trailing zero after the point' is set, then 'trailing point' - // must be set too. - ASSERT(((flags & EMIT_TRAILING_DECIMAL_POINT) != 0) || - !((flags & EMIT_TRAILING_ZERO_AFTER_POINT) != 0)); - } - - // Returns a converter following the EcmaScript specification. - static const DoubleToStringConverter& EcmaScriptConverter(); - - // Computes the shortest string of digits that correctly represent the input - // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high - // (see constructor) it then either returns a decimal representation, or an - // exponential representation. - // Example with decimal_in_shortest_low = -6, - // decimal_in_shortest_high = 21, - // EMIT_POSITIVE_EXPONENT_SIGN activated, and - // EMIT_TRAILING_DECIMAL_POINT deactived: - // ToShortest(0.000001) -> "0.000001" - // ToShortest(0.0000001) -> "1e-7" - // ToShortest(111111111111111111111.0) -> "111111111111111110000" - // ToShortest(100000000000000000000.0) -> "100000000000000000000" - // ToShortest(1111111111111111111111.0) -> "1.1111111111111111e+21" - // - // Note: the conversion may round the output if the returned string - // is accurate enough to uniquely identify the input-number. - // For example the most precise representation of the double 9e59 equals - // "899999999999999918767229449717619953810131273674690656206848", but - // the converter will return the shorter (but still correct) "9e59". - // - // Returns true if the conversion succeeds. The conversion always succeeds - // except when the input value is special and no infinity_symbol or - // nan_symbol has been given to the constructor. - bool ToShortest(double value, StringBuilder* result_builder) const { - return ToShortestIeeeNumber(value, result_builder, SHORTEST); - } - - // Same as ToShortest, but for single-precision floats. - bool ToShortestSingle(float value, StringBuilder* result_builder) const { - return ToShortestIeeeNumber(value, result_builder, SHORTEST_SINGLE); - } - - - // Computes a decimal representation with a fixed number of digits after the - // decimal point. The last emitted digit is rounded. - // - // Examples: - // ToFixed(3.12, 1) -> "3.1" - // ToFixed(3.1415, 3) -> "3.142" - // ToFixed(1234.56789, 4) -> "1234.5679" - // ToFixed(1.23, 5) -> "1.23000" - // ToFixed(0.1, 4) -> "0.1000" - // ToFixed(1e30, 2) -> "1000000000000000019884624838656.00" - // ToFixed(0.1, 30) -> "0.100000000000000005551115123126" - // ToFixed(0.1, 17) -> "0.10000000000000001" - // - // If requested_digits equals 0, then the tail of the result depends on - // the EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT. - // Examples, for requested_digits == 0, - // let EMIT_TRAILING_DECIMAL_POINT and EMIT_TRAILING_ZERO_AFTER_POINT be - // - false and false: then 123.45 -> 123 - // 0.678 -> 1 - // - true and false: then 123.45 -> 123. - // 0.678 -> 1. - // - true and true: then 123.45 -> 123.0 - // 0.678 -> 1.0 - // - // Returns true if the conversion succeeds. The conversion always succeeds - // except for the following cases: - // - the input value is special and no infinity_symbol or nan_symbol has - // been provided to the constructor, - // - 'value' > 10^kMaxFixedDigitsBeforePoint, or - // - 'requested_digits' > kMaxFixedDigitsAfterPoint. - // The last two conditions imply that the result will never contain more than - // 1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters - // (one additional character for the sign, and one for the decimal point). - bool ToFixed(double value, - int requested_digits, - StringBuilder* result_builder) const; - - // Computes a representation in exponential format with requested_digits - // after the decimal point. The last emitted digit is rounded. - // If requested_digits equals -1, then the shortest exponential representation - // is computed. - // - // Examples with EMIT_POSITIVE_EXPONENT_SIGN deactivated, and - // exponent_character set to 'e'. - // ToExponential(3.12, 1) -> "3.1e0" - // ToExponential(5.0, 3) -> "5.000e0" - // ToExponential(0.001, 2) -> "1.00e-3" - // ToExponential(3.1415, -1) -> "3.1415e0" - // ToExponential(3.1415, 4) -> "3.1415e0" - // ToExponential(3.1415, 3) -> "3.142e0" - // ToExponential(123456789000000, 3) -> "1.235e14" - // ToExponential(1000000000000000019884624838656.0, -1) -> "1e30" - // ToExponential(1000000000000000019884624838656.0, 32) -> - // "1.00000000000000001988462483865600e30" - // ToExponential(1234, 0) -> "1e3" - // - // Returns true if the conversion succeeds. The conversion always succeeds - // except for the following cases: - // - the input value is special and no infinity_symbol or nan_symbol has - // been provided to the constructor, - // - 'requested_digits' > kMaxExponentialDigits. - // The last condition implies that the result will never contain more than - // kMaxExponentialDigits + 8 characters (the sign, the digit before the - // decimal point, the decimal point, the exponent character, the - // exponent's sign, and at most 3 exponent digits). - bool ToExponential(double value, - int requested_digits, - StringBuilder* result_builder) const; - - // Computes 'precision' leading digits of the given 'value' and returns them - // either in exponential or decimal format, depending on - // max_{leading|trailing}_padding_zeroes_in_precision_mode (given to the - // constructor). - // The last computed digit is rounded. - // - // Example with max_leading_padding_zeroes_in_precision_mode = 6. - // ToPrecision(0.0000012345, 2) -> "0.0000012" - // ToPrecision(0.00000012345, 2) -> "1.2e-7" - // Similarily the converter may add up to - // max_trailing_padding_zeroes_in_precision_mode in precision mode to avoid - // returning an exponential representation. A zero added by the - // EMIT_TRAILING_ZERO_AFTER_POINT flag is counted for this limit. - // Examples for max_trailing_padding_zeroes_in_precision_mode = 1: - // ToPrecision(230.0, 2) -> "230" - // ToPrecision(230.0, 2) -> "230." with EMIT_TRAILING_DECIMAL_POINT. - // ToPrecision(230.0, 2) -> "2.3e2" with EMIT_TRAILING_ZERO_AFTER_POINT. - // Examples for max_trailing_padding_zeroes_in_precision_mode = 3, and no - // EMIT_TRAILING_ZERO_AFTER_POINT: - // ToPrecision(123450.0, 6) -> "123450" - // ToPrecision(123450.0, 5) -> "123450" - // ToPrecision(123450.0, 4) -> "123500" - // ToPrecision(123450.0, 3) -> "123000" - // ToPrecision(123450.0, 2) -> "1.2e5" - // - // Returns true if the conversion succeeds. The conversion always succeeds - // except for the following cases: - // - the input value is special and no infinity_symbol or nan_symbol has - // been provided to the constructor, - // - precision < kMinPericisionDigits - // - precision > kMaxPrecisionDigits - // The last condition implies that the result will never contain more than - // kMaxPrecisionDigits + 7 characters (the sign, the decimal point, the - // exponent character, the exponent's sign, and at most 3 exponent digits). - bool ToPrecision(double value, - int precision, - StringBuilder* result_builder) const; -#endif // not needed for ICU - - enum DtoaMode { - // Produce the shortest correct representation. - // For example the output of 0.299999999999999988897 is (the less accurate - // but correct) 0.3. - SHORTEST, - // Same as SHORTEST, but for single-precision floats. - SHORTEST_SINGLE, - // Produce a fixed number of digits after the decimal point. - // For instance fixed(0.1, 4) becomes 0.1000 - // If the input number is big, the output will be big. - FIXED, - // Fixed number of digits (independent of the decimal point). - PRECISION - }; - - // The maximal number of digits that are needed to emit a double in base 10. - // A higher precision can be achieved by using more digits, but the shortest - // accurate representation of any double will never use more digits than - // kBase10MaximalLength. - // Note that DoubleToAscii null-terminates its input. So the given buffer - // should be at least kBase10MaximalLength + 1 characters long. - static const int kBase10MaximalLength = 17; - - // Converts the given double 'v' to digit characters. 'v' must not be NaN, - // +Infinity, or -Infinity. In SHORTEST_SINGLE-mode this restriction also - // applies to 'v' after it has been casted to a single-precision float. That - // is, in this mode static_cast(v) must not be NaN, +Infinity or - // -Infinity. - // - // The result should be interpreted as buffer * 10^(point-length). - // - // The digits are written to the buffer in the platform's charset, which is - // often UTF-8 (with ASCII-range digits) but may be another charset, such - // as EBCDIC. - // - // The output depends on the given mode: - // - SHORTEST: produce the least amount of digits for which the internal - // identity requirement is still satisfied. If the digits are printed - // (together with the correct exponent) then reading this number will give - // 'v' again. The buffer will choose the representation that is closest to - // 'v'. If there are two at the same distance, than the one farther away - // from 0 is chosen (halfway cases - ending with 5 - are rounded up). - // In this mode the 'requested_digits' parameter is ignored. - // - SHORTEST_SINGLE: same as SHORTEST but with single-precision. - // - FIXED: produces digits necessary to print a given number with - // 'requested_digits' digits after the decimal point. The produced digits - // might be too short in which case the caller has to fill the remainder - // with '0's. - // Example: toFixed(0.001, 5) is allowed to return buffer="1", point=-2. - // Halfway cases are rounded towards +/-Infinity (away from 0). The call - // toFixed(0.15, 2) thus returns buffer="2", point=0. - // The returned buffer may contain digits that would be truncated from the - // shortest representation of the input. - // - PRECISION: produces 'requested_digits' where the first digit is not '0'. - // Even though the length of produced digits usually equals - // 'requested_digits', the function is allowed to return fewer digits, in - // which case the caller has to fill the missing digits with '0's. - // Halfway cases are again rounded away from 0. - // DoubleToAscii expects the given buffer to be big enough to hold all - // digits and a terminating null-character. In SHORTEST-mode it expects a - // buffer of at least kBase10MaximalLength + 1. In all other modes the - // requested_digits parameter and the padding-zeroes limit the size of the - // output. Don't forget the decimal point, the exponent character and the - // terminating null-character when computing the maximal output size. - // The given length is only used in debug mode to ensure the buffer is big - // enough. - // ICU PATCH: Export this as U_I18N_API for unit tests. - static void U_I18N_API DoubleToAscii(double v, - DtoaMode mode, - int requested_digits, - char* buffer, - int buffer_length, - bool* sign, - int* length, - int* point); - -#if 0 // not needed for ICU - private: - // Implementation for ToShortest and ToShortestSingle. - bool ToShortestIeeeNumber(double value, - StringBuilder* result_builder, - DtoaMode mode) const; - - // If the value is a special value (NaN or Infinity) constructs the - // corresponding string using the configured infinity/nan-symbol. - // If either of them is NULL or the value is not special then the - // function returns false. - bool HandleSpecialValues(double value, StringBuilder* result_builder) const; - // Constructs an exponential representation (i.e. 1.234e56). - // The given exponent assumes a decimal point after the first decimal digit. - void CreateExponentialRepresentation(const char* decimal_digits, - int length, - int exponent, - StringBuilder* result_builder) const; - // Creates a decimal representation (i.e 1234.5678). - void CreateDecimalRepresentation(const char* decimal_digits, - int length, - int decimal_point, - int digits_after_point, - StringBuilder* result_builder) const; - - const int flags_; - const char* const infinity_symbol_; - const char* const nan_symbol_; - const char exponent_character_; - const int decimal_in_shortest_low_; - const int decimal_in_shortest_high_; - const int max_leading_padding_zeroes_in_precision_mode_; - const int max_trailing_padding_zeroes_in_precision_mode_; -#endif // not needed for ICU - - DC_DISALLOW_IMPLICIT_CONSTRUCTORS(DoubleToStringConverter); -}; - - -class StringToDoubleConverter { - public: - // Enumeration for allowing octals and ignoring junk when converting - // strings to numbers. - enum Flags { - NO_FLAGS = 0, - ALLOW_HEX = 1, - ALLOW_OCTALS = 2, - ALLOW_TRAILING_JUNK = 4, - ALLOW_LEADING_SPACES = 8, - ALLOW_TRAILING_SPACES = 16, - ALLOW_SPACES_AFTER_SIGN = 32, - ALLOW_CASE_INSENSIBILITY = 64, - ALLOW_HEX_FLOATS = 128, - }; - - static const uc16 kNoSeparator = '\0'; - - // Flags should be a bit-or combination of the possible Flags-enum. - // - NO_FLAGS: no special flags. - // - ALLOW_HEX: recognizes the prefix "0x". Hex numbers may only be integers. - // Ex: StringToDouble("0x1234") -> 4660.0 - // In StringToDouble("0x1234.56") the characters ".56" are trailing - // junk. The result of the call is hence dependent on - // the ALLOW_TRAILING_JUNK flag and/or the junk value. - // With this flag "0x" is a junk-string. Even with ALLOW_TRAILING_JUNK, - // the string will not be parsed as "0" followed by junk. - // - // - ALLOW_OCTALS: recognizes the prefix "0" for octals: - // If a sequence of octal digits starts with '0', then the number is - // read as octal integer. Octal numbers may only be integers. - // Ex: StringToDouble("01234") -> 668.0 - // StringToDouble("012349") -> 12349.0 // Not a sequence of octal - // // digits. - // In StringToDouble("01234.56") the characters ".56" are trailing - // junk. The result of the call is hence dependent on - // the ALLOW_TRAILING_JUNK flag and/or the junk value. - // In StringToDouble("01234e56") the characters "e56" are trailing - // junk, too. - // - ALLOW_TRAILING_JUNK: ignore trailing characters that are not part of - // a double literal. - // - ALLOW_LEADING_SPACES: skip over leading whitespace, including spaces, - // new-lines, and tabs. - // - ALLOW_TRAILING_SPACES: ignore trailing whitespace. - // - ALLOW_SPACES_AFTER_SIGN: ignore whitespace after the sign. - // Ex: StringToDouble("- 123.2") -> -123.2. - // StringToDouble("+ 123.2") -> 123.2 - // - ALLOW_CASE_INSENSIBILITY: ignore case of characters for special values: - // infinity and nan. - // - ALLOW_HEX_FLOATS: allows hexadecimal float literals. - // This *must* start with "0x" and separate the exponent with "p". - // Examples: 0x1.2p3 == 9.0 - // 0x10.1p0 == 16.0625 - // ALLOW_HEX and ALLOW_HEX_FLOATS are indendent. - // - // empty_string_value is returned when an empty string is given as input. - // If ALLOW_LEADING_SPACES or ALLOW_TRAILING_SPACES are set, then a string - // containing only spaces is converted to the 'empty_string_value', too. - // - // junk_string_value is returned when - // a) ALLOW_TRAILING_JUNK is not set, and a junk character (a character not - // part of a double-literal) is found. - // b) ALLOW_TRAILING_JUNK is set, but the string does not start with a - // double literal. - // - // infinity_symbol and nan_symbol are strings that are used to detect - // inputs that represent infinity and NaN. They can be null, in which case - // they are ignored. - // The conversion routine first reads any possible signs. Then it compares the - // following character of the input-string with the first character of - // the infinity, and nan-symbol. If either matches, the function assumes, that - // a match has been found, and expects the following input characters to match - // the remaining characters of the special-value symbol. - // This means that the following restrictions apply to special-value symbols: - // - they must not start with signs ('+', or '-'), - // - they must not have the same first character. - // - they must not start with digits. - // - // If the separator character is not kNoSeparator, then that specific - // character is ignored when in between two valid digits of the significant. - // It is not allowed to appear in the exponent. - // It is not allowed to lead or trail the number. - // It is not allowed to appear twice next to each other. - // - // Examples: - // flags = ALLOW_HEX | ALLOW_TRAILING_JUNK, - // empty_string_value = 0.0, - // junk_string_value = NaN, - // infinity_symbol = "infinity", - // nan_symbol = "nan": - // StringToDouble("0x1234") -> 4660.0. - // StringToDouble("0x1234K") -> 4660.0. - // StringToDouble("") -> 0.0 // empty_string_value. - // StringToDouble(" ") -> NaN // junk_string_value. - // StringToDouble(" 1") -> NaN // junk_string_value. - // StringToDouble("0x") -> NaN // junk_string_value. - // StringToDouble("-123.45") -> -123.45. - // StringToDouble("--123.45") -> NaN // junk_string_value. - // StringToDouble("123e45") -> 123e45. - // StringToDouble("123E45") -> 123e45. - // StringToDouble("123e+45") -> 123e45. - // StringToDouble("123E-45") -> 123e-45. - // StringToDouble("123e") -> 123.0 // trailing junk ignored. - // StringToDouble("123e-") -> 123.0 // trailing junk ignored. - // StringToDouble("+NaN") -> NaN // NaN string literal. - // StringToDouble("-infinity") -> -inf. // infinity literal. - // StringToDouble("Infinity") -> NaN // junk_string_value. - // - // flags = ALLOW_OCTAL | ALLOW_LEADING_SPACES, - // empty_string_value = 0.0, - // junk_string_value = NaN, - // infinity_symbol = NULL, - // nan_symbol = NULL: - // StringToDouble("0x1234") -> NaN // junk_string_value. - // StringToDouble("01234") -> 668.0. - // StringToDouble("") -> 0.0 // empty_string_value. - // StringToDouble(" ") -> 0.0 // empty_string_value. - // StringToDouble(" 1") -> 1.0 - // StringToDouble("0x") -> NaN // junk_string_value. - // StringToDouble("0123e45") -> NaN // junk_string_value. - // StringToDouble("01239E45") -> 1239e45. - // StringToDouble("-infinity") -> NaN // junk_string_value. - // StringToDouble("NaN") -> NaN // junk_string_value. - // - // flags = NO_FLAGS, - // separator = ' ': - // StringToDouble("1 2 3 4") -> 1234.0 - // StringToDouble("1 2") -> NaN // junk_string_value - // StringToDouble("1 000 000.0") -> 1000000.0 - // StringToDouble("1.000 000") -> 1.0 - // StringToDouble("1.0e1 000") -> NaN // junk_string_value - StringToDoubleConverter(int flags, - double empty_string_value, - double junk_string_value, - const char* infinity_symbol, - const char* nan_symbol, - uc16 separator = kNoSeparator) - : flags_(flags), - empty_string_value_(empty_string_value), - junk_string_value_(junk_string_value), - infinity_symbol_(infinity_symbol), - nan_symbol_(nan_symbol), - separator_(separator) { - } - - // Performs the conversion. - // The output parameter 'processed_characters_count' is set to the number - // of characters that have been processed to read the number. - // Spaces than are processed with ALLOW_{LEADING|TRAILING}_SPACES are included - // in the 'processed_characters_count'. Trailing junk is never included. - double StringToDouble(const char* buffer, - int length, - int* processed_characters_count) const; - - // Same as StringToDouble above but for 16 bit characters. - double StringToDouble(const uc16* buffer, - int length, - int* processed_characters_count) const; - - // Same as StringToDouble but reads a float. - // Note that this is not equivalent to static_cast(StringToDouble(...)) - // due to potential double-rounding. - float StringToFloat(const char* buffer, - int length, - int* processed_characters_count) const; - - // Same as StringToFloat above but for 16 bit characters. - float StringToFloat(const uc16* buffer, - int length, - int* processed_characters_count) const; - - private: - const int flags_; - const double empty_string_value_; - const double junk_string_value_; - const char* const infinity_symbol_; - const char* const nan_symbol_; - const uc16 separator_; - - template - double StringToIeee(Iterator start_pointer, - int length, - bool read_as_double, - int* processed_characters_count) const; - - DC_DISALLOW_IMPLICIT_CONSTRUCTORS(StringToDoubleConverter); -}; - -} // namespace double_conversion - -// ICU PATCH: Close ICU namespace -U_NAMESPACE_END +#include "double-conversion-string-to-double.h" +#include "double-conversion-double-to-string.h" #endif // DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ #endif // ICU PATCH: close #if !UCONFIG_NO_FORMATTING diff --git a/deps/icu-small/source/i18n/dtfmtsym.cpp b/deps/icu-small/source/i18n/dtfmtsym.cpp index 04aa01eb4c2459..9dde66c1fba419 100644 --- a/deps/icu-small/source/i18n/dtfmtsym.cpp +++ b/deps/icu-small/source/i18n/dtfmtsym.cpp @@ -1246,7 +1246,7 @@ const UnicodeString** DateFormatSymbols::getZoneStrings(int32_t& rowCount, int32_t& columnCount) const { const UnicodeString **result = NULL; - static UMutex LOCK = U_MUTEX_INITIALIZER; + static UMutex LOCK; umtx_lock(&LOCK); if (fZoneStrings == NULL) { @@ -2177,16 +2177,16 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError // The ordering of the following statements is important. if (fLeapMonthPatterns[kLeapMonthPatternFormatAbbrev].isEmpty()) { fLeapMonthPatterns[kLeapMonthPatternFormatAbbrev].setTo(fLeapMonthPatterns[kLeapMonthPatternFormatWide]); - }; + } if (fLeapMonthPatterns[kLeapMonthPatternFormatNarrow].isEmpty()) { fLeapMonthPatterns[kLeapMonthPatternFormatNarrow].setTo(fLeapMonthPatterns[kLeapMonthPatternStandaloneNarrow]); - }; + } if (fLeapMonthPatterns[kLeapMonthPatternStandaloneWide].isEmpty()) { fLeapMonthPatterns[kLeapMonthPatternStandaloneWide].setTo(fLeapMonthPatterns[kLeapMonthPatternFormatWide]); - }; + } if (fLeapMonthPatterns[kLeapMonthPatternStandaloneAbbrev].isEmpty()) { fLeapMonthPatterns[kLeapMonthPatternStandaloneAbbrev].setTo(fLeapMonthPatterns[kLeapMonthPatternFormatAbbrev]); - }; + } // end of hack fLeapMonthPatternsCount = kMonthPatternsCount; } else { @@ -2338,11 +2338,21 @@ DateFormatSymbols::initializeData(const Locale& locale, const char *type, UError assignArray(fStandaloneNarrowMonths, fStandaloneNarrowMonthsCount, fShortMonths, fShortMonthsCount); } - // Load AM/PM markers + // Load AM/PM markers; if wide or narrow not available, use short + UErrorCode ampmStatus = U_ZERO_ERROR; initField(&fAmPms, fAmPmsCount, calendarSink, - buildResourcePath(path, gAmPmMarkersTag, status), status); + buildResourcePath(path, gAmPmMarkersTag, ampmStatus), ampmStatus); + if (U_FAILURE(ampmStatus)) { + initField(&fAmPms, fAmPmsCount, calendarSink, + buildResourcePath(path, gAmPmMarkersAbbrTag, status), status); + } + ampmStatus = U_ZERO_ERROR; initField(&fNarrowAmPms, fNarrowAmPmsCount, calendarSink, - buildResourcePath(path, gAmPmMarkersNarrowTag, status), status); + buildResourcePath(path, gAmPmMarkersNarrowTag, ampmStatus), ampmStatus); + if (U_FAILURE(ampmStatus)) { + initField(&fNarrowAmPms, fNarrowAmPmsCount, calendarSink, + buildResourcePath(path, gAmPmMarkersAbbrTag, status), status); + } // Load quarters initField(&fQuarters, fQuartersCount, calendarSink, diff --git a/deps/icu-small/source/i18n/dtitv_impl.h b/deps/icu-small/source/i18n/dtitv_impl.h index 18fe0b8c9b527d..7c4d8a72148919 100644 --- a/deps/icu-small/source/i18n/dtitv_impl.h +++ b/deps/icu-small/source/i18n/dtitv_impl.h @@ -88,7 +88,7 @@ #define MAX_E_COUNT 5 #define MAX_M_COUNT 5 //#define MAX_INTERVAL_INDEX 4 -#define MAX_POSITIVE_INT 56632; +#define MAX_POSITIVE_INT 56632 #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/dtitvfmt.cpp b/deps/icu-small/source/i18n/dtitvfmt.cpp index 0e124f5624002b..f47e7708ccc128 100644 --- a/deps/icu-small/source/i18n/dtitvfmt.cpp +++ b/deps/icu-small/source/i18n/dtitvfmt.cpp @@ -82,10 +82,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DateIntervalFormat) // Mutex, protects access to fDateFormat, fFromCalendar and fToCalendar. // Needed because these data members are modified by const methods of DateIntervalFormat. -static UMutex *gFormatterMutex() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gFormatterMutex; DateIntervalFormat* U_EXPORT2 DateIntervalFormat::createInstance(const UnicodeString& skeleton, @@ -171,9 +168,9 @@ DateIntervalFormat::operator=(const DateIntervalFormat& itvfmt) { delete fTimePattern; delete fDateTimeFormat; { - Mutex lock(gFormatterMutex()); + Mutex lock(&gFormatterMutex); if ( itvfmt.fDateFormat ) { - fDateFormat = (SimpleDateFormat*)itvfmt.fDateFormat->clone(); + fDateFormat = itvfmt.fDateFormat->clone(); } else { fDateFormat = NULL; } @@ -199,9 +196,9 @@ DateIntervalFormat::operator=(const DateIntervalFormat& itvfmt) { fIntervalPatterns[i] = itvfmt.fIntervalPatterns[i]; } fLocale = itvfmt.fLocale; - fDatePattern = (itvfmt.fDatePattern)? (UnicodeString*)itvfmt.fDatePattern->clone(): NULL; - fTimePattern = (itvfmt.fTimePattern)? (UnicodeString*)itvfmt.fTimePattern->clone(): NULL; - fDateTimeFormat = (itvfmt.fDateTimeFormat)? (UnicodeString*)itvfmt.fDateTimeFormat->clone(): NULL; + fDatePattern = (itvfmt.fDatePattern)? itvfmt.fDatePattern->clone(): NULL; + fTimePattern = (itvfmt.fTimePattern)? itvfmt.fTimePattern->clone(): NULL; + fDateTimeFormat = (itvfmt.fDateTimeFormat)? itvfmt.fDateTimeFormat->clone(): NULL; } return *this; } @@ -218,8 +215,8 @@ DateIntervalFormat::~DateIntervalFormat() { } -Format* -DateIntervalFormat::clone(void) const { +DateIntervalFormat* +DateIntervalFormat::clone() const { return new DateIntervalFormat(*this); } @@ -233,7 +230,7 @@ DateIntervalFormat::operator==(const Format& other) const { if ((fInfo != fmt->fInfo) && (fInfo == NULL || fmt->fInfo == NULL)) {return FALSE;} if (fInfo && fmt->fInfo && (*fInfo != *fmt->fInfo )) {return FALSE;} { - Mutex lock(gFormatterMutex()); + Mutex lock(&gFormatterMutex); if (fDateFormat != fmt->fDateFormat && (fDateFormat == NULL || fmt->fDateFormat == NULL)) {return FALSE;} if (fDateFormat && fmt->fDateFormat && (*fDateFormat != *fmt->fDateFormat)) {return FALSE;} } @@ -295,7 +292,7 @@ DateIntervalFormat::format(const DateInterval* dtInterval, handler.setAcceptFirstOnly(TRUE); int8_t ignore; - Mutex lock(gFormatterMutex()); + Mutex lock(&gFormatterMutex); return formatIntervalImpl(*dtInterval, appendTo, ignore, handler, status); } @@ -312,7 +309,7 @@ FormattedDateInterval DateIntervalFormat::formatToValue( auto handler = result->getHandler(status); handler.setCategory(UFIELD_CATEGORY_DATE); { - Mutex lock(gFormatterMutex()); + Mutex lock(&gFormatterMutex); formatIntervalImpl(dtInterval, string, firstIndex, handler, status); } handler.getError(status); @@ -344,7 +341,7 @@ DateIntervalFormat::format(Calendar& fromCalendar, handler.setAcceptFirstOnly(TRUE); int8_t ignore; - Mutex lock(gFormatterMutex()); + Mutex lock(&gFormatterMutex); return formatImpl(fromCalendar, toCalendar, appendTo, ignore, handler, status); } @@ -362,7 +359,7 @@ FormattedDateInterval DateIntervalFormat::formatToValue( auto handler = result->getHandler(status); handler.setCategory(UFIELD_CATEGORY_DATE); { - Mutex lock(gFormatterMutex()); + Mutex lock(&gFormatterMutex); formatImpl(fromCalendar, toCalendar, string, firstIndex, handler, status); } handler.getError(status); @@ -600,7 +597,7 @@ const TimeZone& DateIntervalFormat::getTimeZone() const { if (fDateFormat != NULL) { - Mutex lock(gFormatterMutex()); + Mutex lock(&gFormatterMutex); return fDateFormat->getTimeZone(); } // If fDateFormat is NULL (unexpected), create default timezone. diff --git a/deps/icu-small/source/i18n/dtitvinf.cpp b/deps/icu-small/source/i18n/dtitvinf.cpp index c0a6980e5567bc..35ee8c16261934 100644 --- a/deps/icu-small/source/i18n/dtitvinf.cpp +++ b/deps/icu-small/source/i18n/dtitvinf.cpp @@ -42,7 +42,9 @@ U_NAMESPACE_BEGIN #ifdef DTITVINF_DEBUG -#define PRINTMESG(msg) { std::cout << "(" << __FILE__ << ":" << __LINE__ << ") " << msg << "\n"; } +#define PRINTMESG(msg) UPRV_BLOCK_MACRO_BEGIN { \ + std::cout << "(" << __FILE__ << ":" << __LINE__ << ") " << msg << "\n"; \ +} UPRV_BLOCK_MACRO_END #endif UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DateIntervalInfo) diff --git a/deps/icu-small/source/i18n/dtptngen.cpp b/deps/icu-small/source/i18n/dtptngen.cpp index 9ca29a3cc7e608..50a377259aa80e 100644 --- a/deps/icu-small/source/i18n/dtptngen.cpp +++ b/deps/icu-small/source/i18n/dtptngen.cpp @@ -28,6 +28,7 @@ #include "unicode/ures.h" #include "unicode/ustring.h" #include "unicode/rep.h" +#include "unicode/region.h" #include "cpputils.h" #include "mutex.h" #include "umutex.h" @@ -613,29 +614,56 @@ U_CFUNC void U_CALLCONV DateTimePatternGenerator::loadAllowedHourFormatsData(UEr ures_getAllItemsWithFallback(rb.getAlias(), "timeData", sink, status); } -void DateTimePatternGenerator::getAllowedHourFormats(const Locale &locale, UErrorCode &status) { - if (U_FAILURE(status)) { return; } - Locale maxLocale(locale); - maxLocale.addLikelySubtags(status); - if (U_FAILURE(status)) { - return; - } - - const char *country = maxLocale.getCountry(); - if (*country == '\0') { country = "001"; } - const char *language = maxLocale.getLanguage(); - +static int32_t* getAllowedHourFormatsLangCountry(const char* language, const char* country, UErrorCode& status) { CharString langCountry; - langCountry.append(language, static_cast(uprv_strlen(language)), status); + langCountry.append(language, status); langCountry.append('_', status); - langCountry.append(country, static_cast(uprv_strlen(country)), status); + langCountry.append(country, status); - int32_t *allowedFormats; + int32_t* allowedFormats; allowedFormats = (int32_t *)uhash_get(localeToAllowedHourFormatsMap, langCountry.data()); if (allowedFormats == nullptr) { allowedFormats = (int32_t *)uhash_get(localeToAllowedHourFormatsMap, const_cast(country)); } + return allowedFormats; +} + +void DateTimePatternGenerator::getAllowedHourFormats(const Locale &locale, UErrorCode &status) { + if (U_FAILURE(status)) { return; } + + const char *language = locale.getLanguage(); + const char *country = locale.getCountry(); + Locale maxLocale; // must be here for correct lifetime + if (*language == '\0' || *country == '\0') { + maxLocale = locale; + UErrorCode localStatus = U_ZERO_ERROR; + maxLocale.addLikelySubtags(localStatus); + if (U_SUCCESS(localStatus)) { + language = maxLocale.getLanguage(); + country = maxLocale.getCountry(); + } + } + if (*language == '\0') { + // Unexpected, but fail gracefully + language = "und"; + } + if (*country == '\0') { + country = "001"; + } + + int32_t* allowedFormats = getAllowedHourFormatsLangCountry(language, country, status); + + // Check if the region has an alias + if (allowedFormats == nullptr) { + UErrorCode localStatus = U_ZERO_ERROR; + const Region* region = Region::getInstance(country, localStatus); + if (U_SUCCESS(localStatus)) { + country = region->getRegionCode(); // the real region code + allowedFormats = getAllowedHourFormatsLangCountry(language, country, status); + } + } + if (allowedFormats != nullptr) { // Lookup is successful // Here allowedFormats points to a list consisting of key for preferredFormat, // followed by one or more keys for allowedFormats, then followed by ALLOWED_HOUR_FORMAT_UNKNOWN. @@ -787,6 +815,7 @@ void DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, CharString& destination, UErrorCode& err) { destination.clear().append(DT_DateTimeGregorianTag, -1, err); // initial default if ( U_SUCCESS(err) ) { + UErrorCode localStatus = U_ZERO_ERROR; char localeWithCalendarKey[ULOC_LOCALE_IDENTIFIER_CAPACITY]; // obtain a locale that always has the calendar key value that should be used ures_getFunctionalEquivalent( @@ -798,8 +827,7 @@ DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, CharString& locale.getName(), nullptr, FALSE, - &err); - if (U_FAILURE(err)) { return; } + &localStatus); localeWithCalendarKey[ULOC_LOCALE_IDENTIFIER_CAPACITY-1] = 0; // ensure null termination // now get the calendar key value from that locale char calendarType[ULOC_KEYWORDS_CAPACITY]; @@ -808,13 +836,17 @@ DateTimePatternGenerator::getCalendarTypeToUse(const Locale& locale, CharString& "calendar", calendarType, ULOC_KEYWORDS_CAPACITY, - &err); - if (U_FAILURE(err)) { return; } + &localStatus); + // If the input locale was invalid, don't fail with missing resource error, instead + // continue with default of Gregorian. + if (U_FAILURE(localStatus) && localStatus != U_MISSING_RESOURCE_ERROR) { + err = localStatus; + return; + } if (calendarTypeLen < ULOC_KEYWORDS_CAPACITY) { destination.clear().append(calendarType, -1, err); if (U_FAILURE(err)) { return; } } - err = U_ZERO_ERROR; } } @@ -2543,7 +2575,8 @@ UChar SkeletonFields::getFirstChar() const { } -PtnSkeleton::PtnSkeleton() { +PtnSkeleton::PtnSkeleton() + : addedDefaultDayPeriod(FALSE) { } PtnSkeleton::PtnSkeleton(const PtnSkeleton& other) { @@ -2554,6 +2587,7 @@ void PtnSkeleton::copyFrom(const PtnSkeleton& other) { uprv_memcpy(type, other.type, sizeof(type)); original.copyFrom(other.original); baseOriginal.copyFrom(other.baseOriginal); + addedDefaultDayPeriod = other.addedDefaultDayPeriod; } void PtnSkeleton::clear() { diff --git a/deps/icu-small/source/i18n/esctrn.cpp b/deps/icu-small/source/i18n/esctrn.cpp index 900bed7e45734b..ba0e4c2c7bb618 100644 --- a/deps/icu-small/source/i18n/esctrn.cpp +++ b/deps/icu-small/source/i18n/esctrn.cpp @@ -122,7 +122,7 @@ EscapeTransliterator::~EscapeTransliterator() { /** * Transliterator API. */ -Transliterator* EscapeTransliterator::clone() const { +EscapeTransliterator* EscapeTransliterator::clone() const { return new EscapeTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/esctrn.h b/deps/icu-small/source/i18n/esctrn.h index 60ecc74b498456..2a2c6dcfe9af10 100644 --- a/deps/icu-small/source/i18n/esctrn.h +++ b/deps/icu-small/source/i18n/esctrn.h @@ -115,7 +115,7 @@ class EscapeTransliterator : public Transliterator { /** * Transliterator API. */ - virtual Transliterator* clone() const; + virtual EscapeTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/ethpccal.cpp b/deps/icu-small/source/i18n/ethpccal.cpp index 4377c59b325a1b..0b8ad0e81488c3 100644 --- a/deps/icu-small/source/i18n/ethpccal.cpp +++ b/deps/icu-small/source/i18n/ethpccal.cpp @@ -46,7 +46,7 @@ EthiopicCalendar::~EthiopicCalendar() { } -Calendar* +EthiopicCalendar* EthiopicCalendar::clone() const { return new EthiopicCalendar(*this); diff --git a/deps/icu-small/source/i18n/ethpccal.h b/deps/icu-small/source/i18n/ethpccal.h index 5fae2fb1bea2c7..179a20e85302fb 100644 --- a/deps/icu-small/source/i18n/ethpccal.h +++ b/deps/icu-small/source/i18n/ethpccal.h @@ -141,7 +141,7 @@ class EthiopicCalendar : public CECalendar { * @return return a polymorphic copy of this calendar. * @internal */ - virtual Calendar* clone() const; + virtual EthiopicCalendar* clone() const; /** * return the calendar type, "ethiopic" diff --git a/deps/icu-small/source/i18n/fmtable.cpp b/deps/icu-small/source/i18n/fmtable.cpp index 9baa5ff480db6a..10a6fdb0ff3441 100644 --- a/deps/icu-small/source/i18n/fmtable.cpp +++ b/deps/icu-small/source/i18n/fmtable.cpp @@ -736,7 +736,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) { fDecimalStr->append("Infinity", status); } else if (fDecimalQuantity->isNaN()) { fDecimalStr->append("NaN", status); - } else if (fDecimalQuantity->isZero()) { + } else if (fDecimalQuantity->isZeroish()) { fDecimalStr->append("0", -1, status); } else if (fType==kLong || fType==kInt64 || // use toPlainString for integer types (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5)) { diff --git a/deps/icu-small/source/i18n/number_stringbuilder.cpp b/deps/icu-small/source/i18n/formatted_string_builder.cpp similarity index 58% rename from deps/icu-small/source/i18n/number_stringbuilder.cpp rename to deps/icu-small/source/i18n/formatted_string_builder.cpp index 03300b33ac5e21..3024bff6addacc 100644 --- a/deps/icu-small/source/i18n/number_stringbuilder.cpp +++ b/deps/icu-small/source/i18n/formatted_string_builder.cpp @@ -5,14 +5,9 @@ #if !UCONFIG_NO_FORMATTING -#include "number_stringbuilder.h" -#include "static_unicode_sets.h" +#include "formatted_string_builder.h" +#include "unicode/ustring.h" #include "unicode/utf16.h" -#include "number_utils.h" - -using namespace icu; -using namespace icu::number; -using namespace icu::number::impl; namespace { @@ -34,7 +29,10 @@ inline void uprv_memmove2(void* dest, const void* src, size_t len) { } // namespace -NumberStringBuilder::NumberStringBuilder() { + +U_NAMESPACE_BEGIN + +FormattedStringBuilder::FormattedStringBuilder() { #if U_DEBUG // Initializing the memory to non-zero helps catch some bugs that involve // reading from an improperly terminated string. @@ -44,18 +42,18 @@ NumberStringBuilder::NumberStringBuilder() { #endif } -NumberStringBuilder::~NumberStringBuilder() { +FormattedStringBuilder::~FormattedStringBuilder() { if (fUsingHeap) { uprv_free(fChars.heap.ptr); uprv_free(fFields.heap.ptr); } } -NumberStringBuilder::NumberStringBuilder(const NumberStringBuilder &other) { +FormattedStringBuilder::FormattedStringBuilder(const FormattedStringBuilder &other) { *this = other; } -NumberStringBuilder &NumberStringBuilder::operator=(const NumberStringBuilder &other) { +FormattedStringBuilder &FormattedStringBuilder::operator=(const FormattedStringBuilder &other) { // Check for self-assignment if (this == &other) { return *this; @@ -78,7 +76,7 @@ NumberStringBuilder &NumberStringBuilder::operator=(const NumberStringBuilder &o // UErrorCode is not available; fail silently. uprv_free(newChars); uprv_free(newFields); - *this = NumberStringBuilder(); // can't fail + *this = FormattedStringBuilder(); // can't fail return *this; } @@ -97,15 +95,15 @@ NumberStringBuilder &NumberStringBuilder::operator=(const NumberStringBuilder &o return *this; } -int32_t NumberStringBuilder::length() const { +int32_t FormattedStringBuilder::length() const { return fLength; } -int32_t NumberStringBuilder::codePointCount() const { +int32_t FormattedStringBuilder::codePointCount() const { return u_countChar32(getCharPtr() + fZero, fLength); } -UChar32 NumberStringBuilder::getFirstCodePoint() const { +UChar32 FormattedStringBuilder::getFirstCodePoint() const { if (fLength == 0) { return -1; } @@ -114,7 +112,7 @@ UChar32 NumberStringBuilder::getFirstCodePoint() const { return cp; } -UChar32 NumberStringBuilder::getLastCodePoint() const { +UChar32 FormattedStringBuilder::getLastCodePoint() const { if (fLength == 0) { return -1; } @@ -125,13 +123,13 @@ UChar32 NumberStringBuilder::getLastCodePoint() const { return cp; } -UChar32 NumberStringBuilder::codePointAt(int32_t index) const { +UChar32 FormattedStringBuilder::codePointAt(int32_t index) const { UChar32 cp; U16_GET(getCharPtr() + fZero, 0, index, fLength, cp); return cp; } -UChar32 NumberStringBuilder::codePointBefore(int32_t index) const { +UChar32 FormattedStringBuilder::codePointBefore(int32_t index) const { int32_t offset = index; U16_BACK_1(getCharPtr() + fZero, 0, offset); UChar32 cp; @@ -139,19 +137,15 @@ UChar32 NumberStringBuilder::codePointBefore(int32_t index) const { return cp; } -NumberStringBuilder &NumberStringBuilder::clear() { +FormattedStringBuilder &FormattedStringBuilder::clear() { // TODO: Reset the heap here? fZero = getCapacity() / 2; fLength = 0; return *this; } -int32_t NumberStringBuilder::appendCodePoint(UChar32 codePoint, Field field, UErrorCode &status) { - return insertCodePoint(fLength, codePoint, field, status); -} - int32_t -NumberStringBuilder::insertCodePoint(int32_t index, UChar32 codePoint, Field field, UErrorCode &status) { +FormattedStringBuilder::insertCodePoint(int32_t index, UChar32 codePoint, Field field, UErrorCode &status) { int32_t count = U16_LENGTH(codePoint); int32_t position = prepareForInsert(index, count, status); if (U_FAILURE(status)) { @@ -168,11 +162,7 @@ NumberStringBuilder::insertCodePoint(int32_t index, UChar32 codePoint, Field fie return count; } -int32_t NumberStringBuilder::append(const UnicodeString &unistr, Field field, UErrorCode &status) { - return insert(fLength, unistr, field, status); -} - -int32_t NumberStringBuilder::insert(int32_t index, const UnicodeString &unistr, Field field, +int32_t FormattedStringBuilder::insert(int32_t index, const UnicodeString &unistr, Field field, UErrorCode &status) { if (unistr.length() == 0) { // Nothing to insert. @@ -186,7 +176,7 @@ int32_t NumberStringBuilder::insert(int32_t index, const UnicodeString &unistr, } int32_t -NumberStringBuilder::insert(int32_t index, const UnicodeString &unistr, int32_t start, int32_t end, +FormattedStringBuilder::insert(int32_t index, const UnicodeString &unistr, int32_t start, int32_t end, Field field, UErrorCode &status) { int32_t count = end - start; int32_t position = prepareForInsert(index, count, status); @@ -201,7 +191,7 @@ NumberStringBuilder::insert(int32_t index, const UnicodeString &unistr, int32_t } int32_t -NumberStringBuilder::splice(int32_t startThis, int32_t endThis, const UnicodeString &unistr, +FormattedStringBuilder::splice(int32_t startThis, int32_t endThis, const UnicodeString &unistr, int32_t startOther, int32_t endOther, Field field, UErrorCode& status) { int32_t thisLength = endThis - startThis; int32_t otherLength = endOther - startOther; @@ -224,12 +214,12 @@ NumberStringBuilder::splice(int32_t startThis, int32_t endThis, const UnicodeSt return count; } -int32_t NumberStringBuilder::append(const NumberStringBuilder &other, UErrorCode &status) { +int32_t FormattedStringBuilder::append(const FormattedStringBuilder &other, UErrorCode &status) { return insert(fLength, other, status); } int32_t -NumberStringBuilder::insert(int32_t index, const NumberStringBuilder &other, UErrorCode &status) { +FormattedStringBuilder::insert(int32_t index, const FormattedStringBuilder &other, UErrorCode &status) { if (this == &other) { status = U_ILLEGAL_ARGUMENT_ERROR; return 0; @@ -250,7 +240,7 @@ NumberStringBuilder::insert(int32_t index, const NumberStringBuilder &other, UEr return count; } -void NumberStringBuilder::writeTerminator(UErrorCode& status) { +void FormattedStringBuilder::writeTerminator(UErrorCode& status) { int32_t position = prepareForInsert(fLength, 1, status); if (U_FAILURE(status)) { return; @@ -260,7 +250,7 @@ void NumberStringBuilder::writeTerminator(UErrorCode& status) { fLength--; } -int32_t NumberStringBuilder::prepareForInsert(int32_t index, int32_t count, UErrorCode &status) { +int32_t FormattedStringBuilder::prepareForInsert(int32_t index, int32_t count, UErrorCode &status) { U_ASSERT(index >= 0); U_ASSERT(index <= fLength); U_ASSERT(count >= 0); @@ -279,7 +269,7 @@ int32_t NumberStringBuilder::prepareForInsert(int32_t index, int32_t count, UErr } } -int32_t NumberStringBuilder::prepareForInsertHelper(int32_t index, int32_t count, UErrorCode &status) { +int32_t FormattedStringBuilder::prepareForInsertHelper(int32_t index, int32_t count, UErrorCode &status) { int32_t oldCapacity = getCapacity(); int32_t oldZero = fZero; char16_t *oldChars = getCharPtr(); @@ -342,7 +332,7 @@ int32_t NumberStringBuilder::prepareForInsertHelper(int32_t index, int32_t count return fZero + index; } -int32_t NumberStringBuilder::remove(int32_t index, int32_t count) { +int32_t FormattedStringBuilder::remove(int32_t index, int32_t count) { // TODO: Reset the heap here? (If the string after removal can fit on stack?) int32_t position = index + fZero; uprv_memmove2(getCharPtr() + position, @@ -355,18 +345,18 @@ int32_t NumberStringBuilder::remove(int32_t index, int32_t count) { return position; } -UnicodeString NumberStringBuilder::toUnicodeString() const { +UnicodeString FormattedStringBuilder::toUnicodeString() const { return UnicodeString(getCharPtr() + fZero, fLength); } -const UnicodeString NumberStringBuilder::toTempUnicodeString() const { +const UnicodeString FormattedStringBuilder::toTempUnicodeString() const { // Readonly-alias constructor: return UnicodeString(FALSE, getCharPtr() + fZero, fLength); } -UnicodeString NumberStringBuilder::toDebugString() const { +UnicodeString FormattedStringBuilder::toDebugString() const { UnicodeString sb; - sb.append(u"= UNUM_FIELD_COUNT) { - status = U_ILLEGAL_ARGUMENT_ERROR; - return FALSE; - } - - ConstrainedFieldPosition cfpos; - cfpos.constrainField(UFIELD_CATEGORY_NUMBER, rawField); - cfpos.setState(UFIELD_CATEGORY_NUMBER, rawField, fp.getBeginIndex(), fp.getEndIndex()); - if (nextPosition(cfpos, 0, status)) { - fp.setBeginIndex(cfpos.getStart()); - fp.setEndIndex(cfpos.getLimit()); - return true; - } - - // Special case: fraction should start after integer if fraction is not present - if (rawField == UNUM_FRACTION_FIELD && fp.getEndIndex() == 0) { - bool inside = false; - int32_t i = fZero; - for (; i < fZero + fLength; i++) { - if (isIntOrGroup(getFieldPtr()[i]) || getFieldPtr()[i] == UNUM_DECIMAL_SEPARATOR_FIELD) { - inside = true; - } else if (inside) { - break; - } - } - fp.setBeginIndex(i - fZero); - fp.setEndIndex(i - fZero); - } - - return false; -} - -void NumberStringBuilder::getAllFieldPositions(FieldPositionIteratorHandler& fpih, - UErrorCode& status) const { - ConstrainedFieldPosition cfpos; - while (nextPosition(cfpos, 0, status)) { - fpih.addAttribute(cfpos.getField(), cfpos.getStart(), cfpos.getLimit()); - } -} - -// Signal the end of the string using a field that doesn't exist and that is -// different from UNUM_FIELD_COUNT, which is used for "null number field". -static constexpr Field kEndField = 0xff; - -bool NumberStringBuilder::nextPosition(ConstrainedFieldPosition& cfpos, Field numericField, UErrorCode& /*status*/) const { - auto numericCAF = NumFieldUtils::expand(numericField); - int32_t fieldStart = -1; - Field currField = UNUM_FIELD_COUNT; - for (int32_t i = fZero + cfpos.getLimit(); i <= fZero + fLength; i++) { - Field _field = (i < fZero + fLength) ? getFieldPtr()[i] : kEndField; - // Case 1: currently scanning a field. - if (currField != UNUM_FIELD_COUNT) { - if (currField != _field) { - int32_t end = i - fZero; - // Grouping separators can be whitespace; don't throw them out! - if (currField != UNUM_GROUPING_SEPARATOR_FIELD) { - end = trimBack(i - fZero); - } - if (end <= fieldStart) { - // Entire field position is ignorable; skip. - fieldStart = -1; - currField = UNUM_FIELD_COUNT; - i--; // look at this index again - continue; - } - int32_t start = fieldStart; - if (currField != UNUM_GROUPING_SEPARATOR_FIELD) { - start = trimFront(start); - } - auto caf = NumFieldUtils::expand(currField); - cfpos.setState(caf.category, caf.field, start, end); - return true; - } - continue; - } - // Special case: coalesce the INTEGER if we are pointing at the end of the INTEGER. - if (cfpos.matchesField(UFIELD_CATEGORY_NUMBER, UNUM_INTEGER_FIELD) - && i > fZero - // don't return the same field twice in a row: - && i - fZero > cfpos.getLimit() - && isIntOrGroup(getFieldPtr()[i - 1]) - && !isIntOrGroup(_field)) { - int j = i - 1; - for (; j >= fZero && isIntOrGroup(getFieldPtr()[j]); j--) {} - cfpos.setState(UFIELD_CATEGORY_NUMBER, UNUM_INTEGER_FIELD, j - fZero + 1, i - fZero); - return true; - } - // Special case: coalesce NUMERIC if we are pointing at the end of the NUMERIC. - if (numericField != 0 - && cfpos.matchesField(numericCAF.category, numericCAF.field) - && i > fZero - // don't return the same field twice in a row: - && (i - fZero > cfpos.getLimit() - || cfpos.getCategory() != numericCAF.category - || cfpos.getField() != numericCAF.field) - && isNumericField(getFieldPtr()[i - 1]) - && !isNumericField(_field)) { - int j = i - 1; - for (; j >= fZero && isNumericField(getFieldPtr()[j]); j--) {} - cfpos.setState(numericCAF.category, numericCAF.field, j - fZero + 1, i - fZero); - return true; - } - // Special case: skip over INTEGER; will be coalesced later. - if (_field == UNUM_INTEGER_FIELD) { - _field = UNUM_FIELD_COUNT; - } - // Case 2: no field starting at this position. - if (_field == UNUM_FIELD_COUNT || _field == kEndField) { - continue; - } - // Case 3: check for field starting at this position - auto caf = NumFieldUtils::expand(_field); - if (cfpos.matchesField(caf.category, caf.field)) { - fieldStart = i - fZero; - currField = _field; - } - } - - U_ASSERT(currField == UNUM_FIELD_COUNT); - return false; -} - -bool NumberStringBuilder::containsField(Field field) const { +bool FormattedStringBuilder::containsField(Field field) const { for (int32_t i = 0; i < fLength; i++) { if (field == fieldAt(i)) { return true; @@ -573,27 +434,6 @@ bool NumberStringBuilder::containsField(Field field) const { return false; } -bool NumberStringBuilder::isIntOrGroup(Field field) { - return field == UNUM_INTEGER_FIELD - || field == UNUM_GROUPING_SEPARATOR_FIELD; -} - -bool NumberStringBuilder::isNumericField(Field field) { - return NumFieldUtils::isNumericField(field); -} - -int32_t NumberStringBuilder::trimBack(int32_t limit) const { - return unisets::get(unisets::DEFAULT_IGNORABLES)->spanBack( - getCharPtr() + fZero, - limit, - USET_SPAN_CONTAINED); -} - -int32_t NumberStringBuilder::trimFront(int32_t start) const { - return start + unisets::get(unisets::DEFAULT_IGNORABLES)->span( - getCharPtr() + fZero + start, - fLength - start, - USET_SPAN_CONTAINED); -} +U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/formatted_string_builder.h b/deps/icu-small/source/i18n/formatted_string_builder.h new file mode 100644 index 00000000000000..2949ae73e0ff9e --- /dev/null +++ b/deps/icu-small/source/i18n/formatted_string_builder.h @@ -0,0 +1,253 @@ +// © 2017 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING +#ifndef __NUMBER_STRINGBUILDER_H__ +#define __NUMBER_STRINGBUILDER_H__ + + +#include +#include "unicode/unum.h" // for UNUM_FIELD_COUNT +#include "cstring.h" +#include "uassert.h" +#include "fphdlimp.h" + +U_NAMESPACE_BEGIN + +class FormattedValueStringBuilderImpl; + +/** + * A StringBuilder optimized for formatting. It implements the following key + * features beyond a UnicodeString: + * + *
    + *
  1. Efficient prepend as well as append. + *
  2. Keeps tracks of Fields in an efficient manner. + *
+ * + * See also FormattedValueStringBuilderImpl. + * + * @author sffc (Shane Carr) + */ +class U_I18N_API FormattedStringBuilder : public UMemory { + private: + static const int32_t DEFAULT_CAPACITY = 40; + + template + union ValueOrHeapArray { + T value[DEFAULT_CAPACITY]; + struct { + T *ptr; + int32_t capacity; + } heap; + }; + + public: + FormattedStringBuilder(); + + ~FormattedStringBuilder(); + + FormattedStringBuilder(const FormattedStringBuilder &other); + + // Convention: bottom 4 bits for field, top 4 bits for field category. + // Field category 0 implies the number category so that the number field + // literals can be directly passed as a Field type. + // See the helper functions in "StringBuilderFieldUtils" below. + typedef uint8_t Field; + + FormattedStringBuilder &operator=(const FormattedStringBuilder &other); + + int32_t length() const; + + int32_t codePointCount() const; + + inline char16_t charAt(int32_t index) const { + U_ASSERT(index >= 0); + U_ASSERT(index < fLength); + return getCharPtr()[fZero + index]; + } + + inline Field fieldAt(int32_t index) const { + U_ASSERT(index >= 0); + U_ASSERT(index < fLength); + return getFieldPtr()[fZero + index]; + } + + UChar32 getFirstCodePoint() const; + + UChar32 getLastCodePoint() const; + + UChar32 codePointAt(int32_t index) const; + + UChar32 codePointBefore(int32_t index) const; + + FormattedStringBuilder &clear(); + + /** Appends a UTF-16 code unit. */ + inline int32_t appendChar16(char16_t codeUnit, Field field, UErrorCode& status) { + // appendCodePoint handles both code units and code points. + return insertCodePoint(fLength, codeUnit, field, status); + } + + /** Inserts a UTF-16 code unit. Note: insert at index 0 is very efficient. */ + inline int32_t insertChar16(int32_t index, char16_t codeUnit, Field field, UErrorCode& status) { + // insertCodePoint handles both code units and code points. + return insertCodePoint(index, codeUnit, field, status); + } + + /** Appends a Unicode code point. */ + inline int32_t appendCodePoint(UChar32 codePoint, Field field, UErrorCode &status) { + return insertCodePoint(fLength, codePoint, field, status); + } + + /** Inserts a Unicode code point. Note: insert at index 0 is very efficient. */ + int32_t insertCodePoint(int32_t index, UChar32 codePoint, Field field, UErrorCode &status); + + /** Appends a string. */ + inline int32_t append(const UnicodeString &unistr, Field field, UErrorCode &status) { + return insert(fLength, unistr, field, status); + } + + /** Inserts a string. Note: insert at index 0 is very efficient. */ + int32_t insert(int32_t index, const UnicodeString &unistr, Field field, UErrorCode &status); + + /** Inserts a substring. Note: insert at index 0 is very efficient. + * + * @param start Start index of the substring of unistr to be inserted. + * @param end End index of the substring of unistr to be inserted (exclusive). + */ + int32_t insert(int32_t index, const UnicodeString &unistr, int32_t start, int32_t end, Field field, + UErrorCode &status); + + /** Deletes a substring and then inserts a string at that same position. + * Similar to JavaScript Array.prototype.splice(). + * + * @param startThis Start of the span to delete. + * @param endThis End of the span to delete (exclusive). + * @param unistr The string to insert at the deletion position. + * @param startOther Start index of the substring of unistr to be inserted. + * @param endOther End index of the substring of unistr to be inserted (exclusive). + */ + int32_t splice(int32_t startThis, int32_t endThis, const UnicodeString &unistr, + int32_t startOther, int32_t endOther, Field field, UErrorCode& status); + + /** Appends a formatted string. */ + int32_t append(const FormattedStringBuilder &other, UErrorCode &status); + + /** Inserts a formatted string. Note: insert at index 0 is very efficient. */ + int32_t insert(int32_t index, const FormattedStringBuilder &other, UErrorCode &status); + + /** + * Ensures that the string buffer contains a NUL terminator. The NUL terminator does + * not count toward the string length. Any further changes to the string (insert or + * append) may invalidate the NUL terminator. + * + * You should call this method after the formatted string is completely built if you + * plan to return a pointer to the string from a C API. + */ + void writeTerminator(UErrorCode& status); + + /** + * Gets a "safe" UnicodeString that can be used even after the FormattedStringBuilder is destructed. + */ + UnicodeString toUnicodeString() const; + + /** + * Gets an "unsafe" UnicodeString that is valid only as long as the FormattedStringBuilder is alive and + * unchanged. Slightly faster than toUnicodeString(). + */ + const UnicodeString toTempUnicodeString() const; + + UnicodeString toDebugString() const; + + const char16_t *chars() const; + + bool contentEquals(const FormattedStringBuilder &other) const; + + bool containsField(Field field) const; + + private: + bool fUsingHeap = false; + ValueOrHeapArray fChars; + ValueOrHeapArray fFields; + int32_t fZero = DEFAULT_CAPACITY / 2; + int32_t fLength = 0; + + inline char16_t *getCharPtr() { + return fUsingHeap ? fChars.heap.ptr : fChars.value; + } + + inline const char16_t *getCharPtr() const { + return fUsingHeap ? fChars.heap.ptr : fChars.value; + } + + inline Field *getFieldPtr() { + return fUsingHeap ? fFields.heap.ptr : fFields.value; + } + + inline const Field *getFieldPtr() const { + return fUsingHeap ? fFields.heap.ptr : fFields.value; + } + + inline int32_t getCapacity() const { + return fUsingHeap ? fChars.heap.capacity : DEFAULT_CAPACITY; + } + + int32_t prepareForInsert(int32_t index, int32_t count, UErrorCode &status); + + int32_t prepareForInsertHelper(int32_t index, int32_t count, UErrorCode &status); + + int32_t remove(int32_t index, int32_t count); + + friend class FormattedValueStringBuilderImpl; +}; + +/** + * Helper functions for dealing with the Field typedef, which stores fields + * in a compressed format. + */ +class StringBuilderFieldUtils { +public: + struct CategoryFieldPair { + int32_t category; + int32_t field; + }; + + /** Compile-time function to construct a Field from a category and a field */ + template + static constexpr FormattedStringBuilder::Field compress() { + static_assert(category != 0, "cannot use Undefined category in FieldUtils"); + static_assert(category <= 0xf, "only 4 bits for category"); + static_assert(field <= 0xf, "only 4 bits for field"); + return static_cast((category << 4) | field); + } + + /** Runtime inline function to unpack the category and field from the Field */ + static inline CategoryFieldPair expand(FormattedStringBuilder::Field field) { + if (field == UNUM_FIELD_COUNT) { + return {UFIELD_CATEGORY_UNDEFINED, 0}; + } + CategoryFieldPair ret = { + (field >> 4), + (field & 0xf) + }; + if (ret.category == 0) { + ret.category = UFIELD_CATEGORY_NUMBER; + } + return ret; + } + + static inline bool isNumericField(FormattedStringBuilder::Field field) { + int8_t category = field >> 4; + return category == 0 || category == UFIELD_CATEGORY_NUMBER; + } +}; + +U_NAMESPACE_END + + +#endif //__NUMBER_STRINGBUILDER_H__ + +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/formattedval_impl.h b/deps/icu-small/source/i18n/formattedval_impl.h index 69ba0922edc81f..4ee53e4589b2e9 100644 --- a/deps/icu-small/source/i18n/formattedval_impl.h +++ b/deps/icu-small/source/i18n/formattedval_impl.h @@ -18,7 +18,7 @@ #include "fphdlimp.h" #include "util.h" #include "uvectr32.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" /** @@ -67,7 +67,9 @@ typedef enum UCFPosConstraintType { U_NAMESPACE_BEGIN -/** Implementation using FieldPositionHandler to accept fields. */ +/** + * Implementation of FormattedValue using FieldPositionHandler to accept fields. + */ class FormattedValueFieldPositionIteratorImpl : public UMemory, public FormattedValue { public: @@ -112,12 +114,21 @@ class FormattedValueFieldPositionIteratorImpl : public UMemory, public Formatted }; -class FormattedValueNumberStringBuilderImpl : public UMemory, public FormattedValue { +/** + * Implementation of FormattedValue based on FormattedStringBuilder. + * + * The implementation currently revolves around numbers and number fields. + * However, it can be generalized in the future when there is a need. + * + * @author sffc (Shane Carr) + */ +// Exported as U_I18N_API for tests +class U_I18N_API FormattedValueStringBuilderImpl : public UMemory, public FormattedValue { public: - FormattedValueNumberStringBuilderImpl(number::impl::Field numericField); + FormattedValueStringBuilderImpl(FormattedStringBuilder::Field numericField); - virtual ~FormattedValueNumberStringBuilderImpl(); + virtual ~FormattedValueStringBuilderImpl(); // Implementation of FormattedValue (const): @@ -126,17 +137,25 @@ class FormattedValueNumberStringBuilderImpl : public UMemory, public FormattedVa Appendable& appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; - inline number::impl::NumberStringBuilder& getStringRef() { + // Additional helper functions: + UBool nextFieldPosition(FieldPosition& fp, UErrorCode& status) const; + void getAllFieldPositions(FieldPositionIteratorHandler& fpih, UErrorCode& status) const; + inline FormattedStringBuilder& getStringRef() { return fString; } - - inline const number::impl::NumberStringBuilder& getStringRef() const { + inline const FormattedStringBuilder& getStringRef() const { return fString; } private: - number::impl::NumberStringBuilder fString; - number::impl::Field fNumericField; + FormattedStringBuilder fString; + FormattedStringBuilder::Field fNumericField; + + bool nextPositionImpl(ConstrainedFieldPosition& cfpos, FormattedStringBuilder::Field numericField, UErrorCode& status) const; + static bool isIntOrGroup(FormattedStringBuilder::Field field); + static bool isNumericField(FormattedStringBuilder::Field field); + int32_t trimBack(int32_t limit) const; + int32_t trimFront(int32_t start) const; }; diff --git a/deps/icu-small/source/i18n/formattedval_sbimpl.cpp b/deps/icu-small/source/i18n/formattedval_sbimpl.cpp index 1fbecf25ac6bb6..ca28f222813afc 100644 --- a/deps/icu-small/source/i18n/formattedval_sbimpl.cpp +++ b/deps/icu-small/source/i18n/formattedval_sbimpl.cpp @@ -9,35 +9,203 @@ // Other independent implementations should go into their own cpp file for // better dependency modularization. +#include "unicode/ustring.h" #include "formattedval_impl.h" +#include "number_types.h" +#include "formatted_string_builder.h" +#include "number_utils.h" +#include "static_unicode_sets.h" U_NAMESPACE_BEGIN -FormattedValueNumberStringBuilderImpl::FormattedValueNumberStringBuilderImpl(number::impl::Field numericField) +typedef FormattedStringBuilder::Field Field; + + +FormattedValueStringBuilderImpl::FormattedValueStringBuilderImpl(Field numericField) : fNumericField(numericField) { } -FormattedValueNumberStringBuilderImpl::~FormattedValueNumberStringBuilderImpl() { +FormattedValueStringBuilderImpl::~FormattedValueStringBuilderImpl() { } -UnicodeString FormattedValueNumberStringBuilderImpl::toString(UErrorCode&) const { +UnicodeString FormattedValueStringBuilderImpl::toString(UErrorCode&) const { return fString.toUnicodeString(); } -UnicodeString FormattedValueNumberStringBuilderImpl::toTempString(UErrorCode&) const { +UnicodeString FormattedValueStringBuilderImpl::toTempString(UErrorCode&) const { return fString.toTempUnicodeString(); } -Appendable& FormattedValueNumberStringBuilderImpl::appendTo(Appendable& appendable, UErrorCode&) const { +Appendable& FormattedValueStringBuilderImpl::appendTo(Appendable& appendable, UErrorCode&) const { appendable.appendString(fString.chars(), fString.length()); return appendable; } -UBool FormattedValueNumberStringBuilderImpl::nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const { +UBool FormattedValueStringBuilderImpl::nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const { // NOTE: MSVC sometimes complains when implicitly converting between bool and UBool - return fString.nextPosition(cfpos, fNumericField, status) ? TRUE : FALSE; + return nextPositionImpl(cfpos, fNumericField, status) ? TRUE : FALSE; +} + +UBool FormattedValueStringBuilderImpl::nextFieldPosition(FieldPosition& fp, UErrorCode& status) const { + int32_t rawField = fp.getField(); + + if (rawField == FieldPosition::DONT_CARE) { + return FALSE; + } + + if (rawField < 0 || rawField >= UNUM_FIELD_COUNT) { + status = U_ILLEGAL_ARGUMENT_ERROR; + return FALSE; + } + + ConstrainedFieldPosition cfpos; + cfpos.constrainField(UFIELD_CATEGORY_NUMBER, rawField); + cfpos.setState(UFIELD_CATEGORY_NUMBER, rawField, fp.getBeginIndex(), fp.getEndIndex()); + if (nextPositionImpl(cfpos, 0, status)) { + fp.setBeginIndex(cfpos.getStart()); + fp.setEndIndex(cfpos.getLimit()); + return TRUE; + } + + // Special case: fraction should start after integer if fraction is not present + if (rawField == UNUM_FRACTION_FIELD && fp.getEndIndex() == 0) { + bool inside = false; + int32_t i = fString.fZero; + for (; i < fString.fZero + fString.fLength; i++) { + if (isIntOrGroup(fString.getFieldPtr()[i]) || fString.getFieldPtr()[i] == UNUM_DECIMAL_SEPARATOR_FIELD) { + inside = true; + } else if (inside) { + break; + } + } + fp.setBeginIndex(i - fString.fZero); + fp.setEndIndex(i - fString.fZero); + } + + return FALSE; +} + +void FormattedValueStringBuilderImpl::getAllFieldPositions(FieldPositionIteratorHandler& fpih, + UErrorCode& status) const { + ConstrainedFieldPosition cfpos; + while (nextPositionImpl(cfpos, 0, status)) { + fpih.addAttribute(cfpos.getField(), cfpos.getStart(), cfpos.getLimit()); + } +} + +// Signal the end of the string using a field that doesn't exist and that is +// different from UNUM_FIELD_COUNT, which is used for "null number field". +static constexpr Field kEndField = 0xff; + +bool FormattedValueStringBuilderImpl::nextPositionImpl(ConstrainedFieldPosition& cfpos, Field numericField, UErrorCode& /*status*/) const { + auto numericCAF = StringBuilderFieldUtils::expand(numericField); + int32_t fieldStart = -1; + Field currField = UNUM_FIELD_COUNT; + for (int32_t i = fString.fZero + cfpos.getLimit(); i <= fString.fZero + fString.fLength; i++) { + Field _field = (i < fString.fZero + fString.fLength) ? fString.getFieldPtr()[i] : kEndField; + // Case 1: currently scanning a field. + if (currField != UNUM_FIELD_COUNT) { + if (currField != _field) { + int32_t end = i - fString.fZero; + // Grouping separators can be whitespace; don't throw them out! + if (currField != UNUM_GROUPING_SEPARATOR_FIELD) { + end = trimBack(i - fString.fZero); + } + if (end <= fieldStart) { + // Entire field position is ignorable; skip. + fieldStart = -1; + currField = UNUM_FIELD_COUNT; + i--; // look at this index again + continue; + } + int32_t start = fieldStart; + if (currField != UNUM_GROUPING_SEPARATOR_FIELD) { + start = trimFront(start); + } + auto caf = StringBuilderFieldUtils::expand(currField); + cfpos.setState(caf.category, caf.field, start, end); + return true; + } + continue; + } + // Special case: coalesce the INTEGER if we are pointing at the end of the INTEGER. + if (cfpos.matchesField(UFIELD_CATEGORY_NUMBER, UNUM_INTEGER_FIELD) + && i > fString.fZero + // don't return the same field twice in a row: + && i - fString.fZero > cfpos.getLimit() + && isIntOrGroup(fString.getFieldPtr()[i - 1]) + && !isIntOrGroup(_field)) { + int j = i - 1; + for (; j >= fString.fZero && isIntOrGroup(fString.getFieldPtr()[j]); j--) {} + cfpos.setState( + UFIELD_CATEGORY_NUMBER, + UNUM_INTEGER_FIELD, + j - fString.fZero + 1, + i - fString.fZero); + return true; + } + // Special case: coalesce NUMERIC if we are pointing at the end of the NUMERIC. + if (numericField != 0 + && cfpos.matchesField(numericCAF.category, numericCAF.field) + && i > fString.fZero + // don't return the same field twice in a row: + && (i - fString.fZero > cfpos.getLimit() + || cfpos.getCategory() != numericCAF.category + || cfpos.getField() != numericCAF.field) + && isNumericField(fString.getFieldPtr()[i - 1]) + && !isNumericField(_field)) { + int j = i - 1; + for (; j >= fString.fZero && isNumericField(fString.getFieldPtr()[j]); j--) {} + cfpos.setState( + numericCAF.category, + numericCAF.field, + j - fString.fZero + 1, + i - fString.fZero); + return true; + } + // Special case: skip over INTEGER; will be coalesced later. + if (_field == UNUM_INTEGER_FIELD) { + _field = UNUM_FIELD_COUNT; + } + // Case 2: no field starting at this position. + if (_field == UNUM_FIELD_COUNT || _field == kEndField) { + continue; + } + // Case 3: check for field starting at this position + auto caf = StringBuilderFieldUtils::expand(_field); + if (cfpos.matchesField(caf.category, caf.field)) { + fieldStart = i - fString.fZero; + currField = _field; + } + } + + U_ASSERT(currField == UNUM_FIELD_COUNT); + return false; +} + +bool FormattedValueStringBuilderImpl::isIntOrGroup(Field field) { + return field == UNUM_INTEGER_FIELD + || field == UNUM_GROUPING_SEPARATOR_FIELD; +} + +bool FormattedValueStringBuilderImpl::isNumericField(Field field) { + return StringBuilderFieldUtils::isNumericField(field); +} + +int32_t FormattedValueStringBuilderImpl::trimBack(int32_t limit) const { + return unisets::get(unisets::DEFAULT_IGNORABLES)->spanBack( + fString.getCharPtr() + fString.fZero, + limit, + USET_SPAN_CONTAINED); +} + +int32_t FormattedValueStringBuilderImpl::trimFront(int32_t start) const { + return start + unisets::get(unisets::DEFAULT_IGNORABLES)->span( + fString.getCharPtr() + fString.fZero + start, + fString.fLength - start, + USET_SPAN_CONTAINED); } diff --git a/deps/icu-small/source/i18n/funcrepl.cpp b/deps/icu-small/source/i18n/funcrepl.cpp index 30bcebbf908794..ceb456e1afc50c 100644 --- a/deps/icu-small/source/i18n/funcrepl.cpp +++ b/deps/icu-small/source/i18n/funcrepl.cpp @@ -59,7 +59,7 @@ FunctionReplacer::~FunctionReplacer() { /** * Implement UnicodeFunctor */ -UnicodeFunctor* FunctionReplacer::clone() const { +FunctionReplacer* FunctionReplacer::clone() const { return new FunctionReplacer(*this); } diff --git a/deps/icu-small/source/i18n/funcrepl.h b/deps/icu-small/source/i18n/funcrepl.h index a835d5be7c2173..fe41f6caaa6d10 100644 --- a/deps/icu-small/source/i18n/funcrepl.h +++ b/deps/icu-small/source/i18n/funcrepl.h @@ -70,7 +70,7 @@ class FunctionReplacer : public UnicodeFunctor, public UnicodeReplacer { /** * Implement UnicodeFunctor */ - virtual UnicodeFunctor* clone() const; + virtual FunctionReplacer* clone() const; /** * UnicodeFunctor API. Cast 'this' to a UnicodeReplacer* pointer diff --git a/deps/icu-small/source/i18n/gender.cpp b/deps/icu-small/source/i18n/gender.cpp index 106cf424c59d88..03c03cecad94ba 100644 --- a/deps/icu-small/source/i18n/gender.cpp +++ b/deps/icu-small/source/i18n/gender.cpp @@ -98,7 +98,7 @@ const GenderInfo* GenderInfo::getInstance(const Locale& locale, UErrorCode& stat return NULL; } - static UMutex gGenderMetaLock = U_MUTEX_INITIALIZER; + static UMutex gGenderMetaLock; const GenderInfo* result = NULL; const char* key = locale.getName(); { diff --git a/deps/icu-small/source/i18n/gregocal.cpp b/deps/icu-small/source/i18n/gregocal.cpp index 4db66758df1f1f..028ab05aa9accc 100644 --- a/deps/icu-small/source/i18n/gregocal.cpp +++ b/deps/icu-small/source/i18n/gregocal.cpp @@ -286,7 +286,7 @@ fIsGregorian(source.fIsGregorian), fInvertGregorian(source.fInvertGregorian) // ------------------------------------- -Calendar* GregorianCalendar::clone() const +GregorianCalendar* GregorianCalendar::clone() const { return new GregorianCalendar(*this); } @@ -324,26 +324,26 @@ GregorianCalendar::setGregorianChange(UDate date, UErrorCode& status) if (U_FAILURE(status)) return; - fGregorianCutover = date; - // Precompute two internal variables which we use to do the actual // cutover computations. These are the normalized cutover, which is the // midnight at or before the cutover, and the cutover year. The // normalized cutover is in pure date milliseconds; it contains no time // of day or timezone component, and it used to compare against other // pure date values. - int32_t cutoverDay = (int32_t)ClockMath::floorDivide(fGregorianCutover, (double)kOneDay); - fNormalizedGregorianCutover = cutoverDay * kOneDay; - - // Handle the rare case of numeric overflow. If the user specifies a - // change of UDate(Long.MIN_VALUE), in order to get a pure Gregorian - // calendar, then the epoch day is -106751991168, which when multiplied - // by ONE_DAY gives 9223372036794351616 -- the negative value is too - // large for 64 bits, and overflows into a positive value. We correct - // this by using the next day, which for all intents is semantically - // equivalent. - if (cutoverDay < 0 && fNormalizedGregorianCutover > 0) { - fNormalizedGregorianCutover = (cutoverDay + 1) * kOneDay; + double cutoverDay = ClockMath::floorDivide(date, (double)kOneDay); + + // Handle the rare case of numeric overflow where the user specifies a time + // outside of INT32_MIN .. INT32_MAX number of days. + + if (cutoverDay <= INT32_MIN) { + cutoverDay = INT32_MIN; + fGregorianCutover = fNormalizedGregorianCutover = cutoverDay * kOneDay; + } else if (cutoverDay >= INT32_MAX) { + cutoverDay = INT32_MAX; + fGregorianCutover = fNormalizedGregorianCutover = cutoverDay * kOneDay; + } else { + fNormalizedGregorianCutover = cutoverDay * kOneDay; + fGregorianCutover = date; } // Normalize the year so BC values are represented as 0 and negative @@ -360,7 +360,7 @@ GregorianCalendar::setGregorianChange(UDate date, UErrorCode& status) fGregorianCutoverYear = cal->get(UCAL_YEAR, status); if (cal->get(UCAL_ERA, status) == BC) fGregorianCutoverYear = 1 - fGregorianCutoverYear; - fCutoverJulianDay = cutoverDay; + fCutoverJulianDay = (int32_t)cutoverDay; delete cal; } diff --git a/deps/icu-small/source/i18n/hebrwcal.cpp b/deps/icu-small/source/i18n/hebrwcal.cpp index 66a3e47a4f1e0f..085ded784651a6 100644 --- a/deps/icu-small/source/i18n/hebrwcal.cpp +++ b/deps/icu-small/source/i18n/hebrwcal.cpp @@ -169,7 +169,7 @@ const char *HebrewCalendar::getType() const { return "hebrew"; } -Calendar* HebrewCalendar::clone() const { +HebrewCalendar* HebrewCalendar::clone() const { return new HebrewCalendar(*this); } diff --git a/deps/icu-small/source/i18n/hebrwcal.h b/deps/icu-small/source/i18n/hebrwcal.h index 9323ad62aa72fa..97e8511705e776 100644 --- a/deps/icu-small/source/i18n/hebrwcal.h +++ b/deps/icu-small/source/i18n/hebrwcal.h @@ -192,7 +192,7 @@ class U_I18N_API HebrewCalendar : public Calendar { * @return return a polymorphic copy of this calendar. * @internal */ - virtual Calendar* clone(void) const; + virtual HebrewCalendar* clone() const; public: /** diff --git a/deps/icu-small/source/i18n/indiancal.cpp b/deps/icu-small/source/i18n/indiancal.cpp index 667b6f2d7a32c5..f1266bb7757939 100644 --- a/deps/icu-small/source/i18n/indiancal.cpp +++ b/deps/icu-small/source/i18n/indiancal.cpp @@ -35,7 +35,7 @@ U_NAMESPACE_BEGIN //------------------------------------------------------------------------- -Calendar* IndianCalendar::clone() const { +IndianCalendar* IndianCalendar::clone() const { return new IndianCalendar(*this); } diff --git a/deps/icu-small/source/i18n/indiancal.h b/deps/icu-small/source/i18n/indiancal.h index ffd4ae8b8a40cd..142597ce0e6b02 100644 --- a/deps/icu-small/source/i18n/indiancal.h +++ b/deps/icu-small/source/i18n/indiancal.h @@ -186,7 +186,7 @@ class U_I18N_API IndianCalendar : public Calendar { // TODO: copy c'tor, etc // clone - virtual Calendar* clone() const; + virtual IndianCalendar* clone() const; private: /** diff --git a/deps/icu-small/source/i18n/islamcal.cpp b/deps/icu-small/source/i18n/islamcal.cpp index 8d6171af011e5d..4e4a6648048208 100644 --- a/deps/icu-small/source/i18n/islamcal.cpp +++ b/deps/icu-small/source/i18n/islamcal.cpp @@ -227,7 +227,7 @@ const char *IslamicCalendar::getType() const { return sType; } -Calendar* IslamicCalendar::clone() const { +IslamicCalendar* IslamicCalendar::clone() const { return new IslamicCalendar(*this); } @@ -470,7 +470,7 @@ double IslamicCalendar::moonAge(UDate time, UErrorCode &status) { double age = 0; - static UMutex astroLock = U_MUTEX_INITIALIZER; // pod bay door lock + static UMutex astroLock; // pod bay door lock umtx_lock(&astroLock); if(gIslamicCalendarAstro == NULL) { gIslamicCalendarAstro = new CalendarAstronomer(); diff --git a/deps/icu-small/source/i18n/islamcal.h b/deps/icu-small/source/i18n/islamcal.h index 17fb6687ef7b63..aad8f07be0f984 100644 --- a/deps/icu-small/source/i18n/islamcal.h +++ b/deps/icu-small/source/i18n/islamcal.h @@ -230,7 +230,7 @@ class U_I18N_API IslamicCalendar : public Calendar { // TODO: copy c'tor, etc // clone - virtual Calendar* clone() const; + virtual IslamicCalendar* clone() const; private: /** diff --git a/deps/icu-small/source/i18n/japancal.cpp b/deps/icu-small/source/i18n/japancal.cpp index cc061fd1410d84..e7e5f4fc5174f6 100644 --- a/deps/icu-small/source/i18n/japancal.cpp +++ b/deps/icu-small/source/i18n/japancal.cpp @@ -136,7 +136,7 @@ JapaneseCalendar& JapaneseCalendar::operator= ( const JapaneseCalendar& right) return *this; } -Calendar* JapaneseCalendar::clone(void) const +JapaneseCalendar* JapaneseCalendar::clone() const { return new JapaneseCalendar(*this); } diff --git a/deps/icu-small/source/i18n/japancal.h b/deps/icu-small/source/i18n/japancal.h index a32f3db5635473..ee86c4ed0e3b93 100644 --- a/deps/icu-small/source/i18n/japancal.h +++ b/deps/icu-small/source/i18n/japancal.h @@ -116,7 +116,7 @@ class JapaneseCalendar : public GregorianCalendar { * @return return a polymorphic copy of this calendar. * @internal */ - virtual Calendar* clone(void) const; + virtual JapaneseCalendar* clone() const; /** * Return the extended year defined by the current fields. In the diff --git a/deps/icu-small/source/i18n/listformatter.cpp b/deps/icu-small/source/i18n/listformatter.cpp index 64d2e36ae15059..35cc00de252aa7 100644 --- a/deps/icu-small/source/i18n/listformatter.cpp +++ b/deps/icu-small/source/i18n/listformatter.cpp @@ -144,7 +144,7 @@ const ListFormatInternal* ListFormatter::getListFormatInternal( keyBuffer.append(':', errorCode).append(style, errorCode); UnicodeString key(keyBuffer.data(), -1, US_INV); ListFormatInternal* result = nullptr; - static UMutex listFormatterMutex = U_MUTEX_INITIALIZER; + static UMutex listFormatterMutex; { Mutex m(&listFormatterMutex); if (listPatternHash == nullptr) { @@ -478,8 +478,8 @@ UnicodeString& ListFormatter::format_( if (index == 0) { offset = 0; } - int32_t offsetFirst; - int32_t offsetSecond; + int32_t offsetFirst = 0; + int32_t offsetSecond = 0; int32_t prefixLength = 0; // for n items, there are 2 * (n + 1) boundary including 0 and the upper // edge. diff --git a/deps/icu-small/source/i18n/measfmt.cpp b/deps/icu-small/source/i18n/measfmt.cpp index 03e4417e64da6a..47ffb140cf6712 100644 --- a/deps/icu-small/source/i18n/measfmt.cpp +++ b/deps/icu-small/source/i18n/measfmt.cpp @@ -55,28 +55,23 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(MeasureFormat) class NumericDateFormatters : public UMemory { public: // Formats like H:mm - SimpleDateFormat hourMinute; + UnicodeString hourMinute; // formats like M:ss - SimpleDateFormat minuteSecond; + UnicodeString minuteSecond; // formats like H:mm:ss - SimpleDateFormat hourMinuteSecond; + UnicodeString hourMinuteSecond; // Constructor that takes the actual patterns for hour-minute, // minute-second, and hour-minute-second respectively. NumericDateFormatters( const UnicodeString &hm, const UnicodeString &ms, - const UnicodeString &hms, - UErrorCode &status) : - hourMinute(hm, status), - minuteSecond(ms, status), - hourMinuteSecond(hms, status) { - const TimeZone *gmt = TimeZone::getGMT(); - hourMinute.setTimeZone(*gmt); - minuteSecond.setTimeZone(*gmt); - hourMinuteSecond.setTimeZone(*gmt); + const UnicodeString &hms) : + hourMinute(hm), + minuteSecond(ms), + hourMinuteSecond(hms) { } private: NumericDateFormatters(const NumericDateFormatters &other); @@ -233,8 +228,7 @@ static NumericDateFormatters *loadNumericDateFormatters( NumericDateFormatters *result = new NumericDateFormatters( loadNumericDateFormatterPattern(resource, "hm", status), loadNumericDateFormatterPattern(resource, "ms", status), - loadNumericDateFormatterPattern(resource, "hms", status), - status); + loadNumericDateFormatterPattern(resource, "hms", status)); if (U_FAILURE(status)) { delete result; return NULL; @@ -466,7 +460,7 @@ UBool MeasureFormat::operator==(const Format &other) const { **numberFormat == **rhs.numberFormat); } -Format *MeasureFormat::clone() const { +MeasureFormat *MeasureFormat::clone() const { return new MeasureFormat(*this); } @@ -691,9 +685,19 @@ UnicodeString &MeasureFormat::formatMeasure( } auto* df = dynamic_cast(&nf); if (df == nullptr) { - // Don't know how to handle other types of NumberFormat - status = U_UNSUPPORTED_ERROR; - return appendTo; + // Handle other types of NumberFormat using the ICU 63 code, modified to + // get the unitPattern from LongNameHandler and handle fallback to OTHER. + UnicodeString formattedNumber; + StandardPlural::Form pluralForm = QuantityFormatter::selectPlural( + amtNumber, nf, **pluralRules, formattedNumber, pos, status); + UnicodeString pattern = number::impl::LongNameHandler::getUnitPattern(getLocale(status), + amtUnit, getUnitWidth(fWidth), pluralForm, status); + // The above handles fallback from other widths to short, and from other plural forms to OTHER + if (U_FAILURE(status)) { + return appendTo; + } + SimpleFormatter formatter(pattern, 0, 1, status); + return QuantityFormatter::format(formatter, formattedNumber, appendTo, pos, status); } number::FormattedNumber result; if (auto* lnf = df->toNumberFormatter(status)) { @@ -706,135 +710,112 @@ UnicodeString &MeasureFormat::formatMeasure( return appendTo; } -// Formats hours-minutes-seconds as 5:37:23 or similar. + +// Formats numeric time duration as 5:00:47 or 3:54. UnicodeString &MeasureFormat::formatNumeric( const Formattable *hms, // always length 3 - int32_t bitMap, // 1=hourset, 2=minuteset, 4=secondset + int32_t bitMap, // 1=hour set, 2=minute set, 4=second set UnicodeString &appendTo, UErrorCode &status) const { if (U_FAILURE(status)) { return appendTo; } - UDate millis = - (UDate) (((uprv_trunc(hms[0].getDouble(status)) * 60.0 - + uprv_trunc(hms[1].getDouble(status))) * 60.0 - + uprv_trunc(hms[2].getDouble(status))) * 1000.0); - switch (bitMap) { - case 5: // hs - case 7: // hms - return formatNumeric( - millis, - cache->getNumericDateFormatters()->hourMinuteSecond, - UDAT_SECOND_FIELD, - hms[2], - appendTo, - status); - break; - case 6: // ms - return formatNumeric( - millis, - cache->getNumericDateFormatters()->minuteSecond, - UDAT_SECOND_FIELD, - hms[2], - appendTo, - status); - break; - case 3: // hm - return formatNumeric( - millis, - cache->getNumericDateFormatters()->hourMinute, - UDAT_MINUTE_FIELD, - hms[1], - appendTo, - status); - break; - default: - status = U_INTERNAL_PROGRAM_ERROR; - return appendTo; - break; - } -} - -static void appendRange( - const UnicodeString &src, - int32_t start, - int32_t end, - UnicodeString &dest) { - dest.append(src, start, end - start); -} -static void appendRange( - const UnicodeString &src, - int32_t end, - UnicodeString &dest) { - dest.append(src, end, src.length() - end); -} + UnicodeString pattern; -// Formats time like 5:37:23 -UnicodeString &MeasureFormat::formatNumeric( - UDate date, // Time since epoch 1:30:00 would be 5400000 - const DateFormat &dateFmt, // h:mm, m:ss, or h:mm:ss - UDateFormatField smallestField, // seconds in 5:37:23.5 - const Formattable &smallestAmount, // 23.5 for 5:37:23.5 - UnicodeString &appendTo, - UErrorCode &status) const { + double hours = hms[0].getDouble(status); + double minutes = hms[1].getDouble(status); + double seconds = hms[2].getDouble(status); if (U_FAILURE(status)) { return appendTo; } - // Format the smallest amount with this object's NumberFormat - UnicodeString smallestAmountFormatted; - - // We keep track of the integer part of smallest amount so that - // we can replace it later so that we get '0:00:09.3' instead of - // '0:00:9.3' - FieldPosition intFieldPosition(UNUM_INTEGER_FIELD); - (*numberFormat)->format( - smallestAmount, smallestAmountFormatted, intFieldPosition, status); - if ( - intFieldPosition.getBeginIndex() == 0 && - intFieldPosition.getEndIndex() == 0) { + + // All possible combinations: "h", "m", "s", "hm", "hs", "ms", "hms" + if (bitMap == 5 || bitMap == 7) { // "hms" & "hs" (we add minutes if "hs") + pattern = cache->getNumericDateFormatters()->hourMinuteSecond; + hours = uprv_trunc(hours); + minutes = uprv_trunc(minutes); + } else if (bitMap == 3) { // "hm" + pattern = cache->getNumericDateFormatters()->hourMinute; + hours = uprv_trunc(hours); + } else if (bitMap == 6) { // "ms" + pattern = cache->getNumericDateFormatters()->minuteSecond; + minutes = uprv_trunc(minutes); + } else { // h m s, handled outside formatNumeric. No value is also an error. status = U_INTERNAL_PROGRAM_ERROR; return appendTo; } - // Format time. draft becomes something like '5:30:45' - // #13606: DateFormat is not thread-safe, but MeasureFormat advertises itself as thread-safe. - FieldPosition smallestFieldPosition(smallestField); - UnicodeString draft; - static UMutex dateFmtMutex = U_MUTEX_INITIALIZER; - umtx_lock(&dateFmtMutex); - dateFmt.format(date, draft, smallestFieldPosition, status); - umtx_unlock(&dateFmtMutex); - - // If we find field for smallest amount replace it with the formatted - // smallest amount from above taking care to replace the integer part - // with what is in original time. For example, If smallest amount - // is 9.35s and the formatted time is 0:00:09 then 9.35 becomes 09.35 - // and replacing yields 0:00:09.35 - if (smallestFieldPosition.getBeginIndex() != 0 || - smallestFieldPosition.getEndIndex() != 0) { - appendRange(draft, 0, smallestFieldPosition.getBeginIndex(), appendTo); - appendRange( - smallestAmountFormatted, - 0, - intFieldPosition.getBeginIndex(), - appendTo); - appendRange( - draft, - smallestFieldPosition.getBeginIndex(), - smallestFieldPosition.getEndIndex(), - appendTo); - appendRange( - smallestAmountFormatted, - intFieldPosition.getEndIndex(), - appendTo); - appendRange( - draft, - smallestFieldPosition.getEndIndex(), - appendTo); + const DecimalFormat *numberFormatter = dynamic_cast(numberFormat->get()); + if (!numberFormatter) { + status = U_INTERNAL_PROGRAM_ERROR; + return appendTo; + } + number::LocalizedNumberFormatter numberFormatter2; + if (auto* lnf = numberFormatter->toNumberFormatter(status)) { + numberFormatter2 = lnf->integerWidth(number::IntegerWidth::zeroFillTo(2)); } else { - appendTo.append(draft); + return appendTo; } + + FormattedStringBuilder fsb; + + UBool protect = FALSE; + const int32_t patternLength = pattern.length(); + for (int32_t i = 0; i < patternLength; i++) { + char16_t c = pattern[i]; + + // Also set the proper field in this switch + // We don't use DateFormat.Field because this is not a date / time, is a duration. + double value = 0; + switch (c) { + case u'H': value = hours; break; + case u'm': value = minutes; break; + case u's': value = seconds; break; + } + + // For undefined field we use UNUM_FIELD_COUNT, for historical reasons. + // See cleanup bug: https://unicode-org.atlassian.net/browse/ICU-20665 + // But we give it a clear name, to keep "the ugly part" in one place. + constexpr UNumberFormatFields undefinedField = UNUM_FIELD_COUNT; + + // There is not enough info to add Field(s) for the unit because all we have are plain + // text patterns. For example in "21:51" there is no text for something like "hour", + // while in something like "21h51" there is ("h"). But we can't really tell... + switch (c) { + case u'H': + case u'm': + case u's': + if (protect) { + fsb.appendChar16(c, undefinedField, status); + } else { + UnicodeString tmp; + if ((i + 1 < patternLength) && pattern[i + 1] == c) { // doubled + tmp = numberFormatter2.formatDouble(value, status).toString(status); + i++; + } else { + numberFormatter->format(value, tmp, status); + } + // TODO: Use proper Field + fsb.append(tmp, undefinedField, status); + } + break; + case u'\'': + // '' is escaped apostrophe + if ((i + 1 < patternLength) && pattern[i + 1] == c) { + fsb.appendChar16(c, undefinedField, status); + i++; + } else { + protect = !protect; + } + break; + default: + fsb.appendChar16(c, undefinedField, status); + } + } + + appendTo.append(fsb.toTempUnicodeString()); + return appendTo; } diff --git a/deps/icu-small/source/i18n/measunit.cpp b/deps/icu-small/source/i18n/measunit.cpp index 428283e6dda8d4..917c0cdfadf235 100644 --- a/deps/icu-small/source/i18n/measunit.cpp +++ b/deps/icu-small/source/i18n/measunit.cpp @@ -43,21 +43,22 @@ static const int32_t gOffsets[] = { 29, 328, 339, - 354, - 358, - 366, + 355, + 359, 368, - 372, - 393, - 395, - 409, - 412, + 370, + 374, + 381, + 402, + 404, 418, - 426, - 430, - 434, - 436, - 463 + 421, + 427, + 437, + 441, + 445, + 447, + 474 }; static const int32_t gIndexes[] = { @@ -69,21 +70,22 @@ static const int32_t gIndexes[] = { 29, 29, 40, - 55, - 59, - 67, + 56, + 60, 69, - 73, - 94, - 96, - 110, - 113, + 71, + 75, + 82, + 103, + 105, 119, - 127, - 131, - 135, - 137, - 164 + 122, + 128, + 138, + 142, + 146, + 148, + 175 }; // Must be sorted alphabetically. @@ -100,6 +102,7 @@ static const char * const gTypes[] = { "energy", "force", "frequency", + "graphics", "length", "light", "mass", @@ -456,6 +459,7 @@ static const char * const gSubTypes[] = { "century", "day", "day-person", + "decade", "hour", "microsecond", "millisecond", @@ -480,12 +484,20 @@ static const char * const gSubTypes[] = { "kilocalorie", "kilojoule", "kilowatt-hour", + "therm-us", "newton", "pound-force", "gigahertz", "hertz", "kilohertz", "megahertz", + "dot-per-centimeter", + "dot-per-inch", + "em", + "megapixel", + "pixel", + "pixel-per-centimeter", + "pixel-per-inch", "astronomical-unit", "centimeter", "decimeter", @@ -533,12 +545,14 @@ static const char * const gSubTypes[] = { "milliwatt", "watt", "atmosphere", + "bar", "hectopascal", "inch-hg", "kilopascal", "megapascal", "millibar", "millimeter-of-mercury", + "pascal", "pound-per-square-inch", "kilometer-per-hour", "knot", @@ -581,18 +595,20 @@ static const char * const gSubTypes[] = { // Must be sorted by first value and then second value. static int32_t unitPerUnitToSingleUnit[][4] = { - {379, 342, 18, 0}, - {381, 349, 18, 2}, - {383, 342, 18, 3}, - {383, 452, 4, 2}, - {383, 453, 4, 3}, - {402, 449, 3, 1}, - {405, 12, 17, 7}, - {455, 379, 4, 1} + {378, 382, 12, 5}, + {378, 387, 12, 6}, + {388, 343, 19, 0}, + {390, 350, 19, 2}, + {392, 343, 19, 3}, + {392, 463, 4, 2}, + {392, 464, 4, 3}, + {411, 460, 3, 1}, + {414, 12, 18, 9}, + {466, 388, 4, 1} }; // Shortcuts to the base unit in order to make the default constructor fast -static const int32_t kBaseTypeIdx = 15; +static const int32_t kBaseTypeIdx = 16; static const int32_t kBaseSubTypeIdx = 0; MeasureUnit *MeasureUnit::createGForce(UErrorCode &status) { @@ -939,102 +955,110 @@ MeasureUnit MeasureUnit::getDayPerson() { return MeasureUnit(7, 2); } -MeasureUnit *MeasureUnit::createHour(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDecade(UErrorCode &status) { return MeasureUnit::create(7, 3, status); } -MeasureUnit MeasureUnit::getHour() { +MeasureUnit MeasureUnit::getDecade() { return MeasureUnit(7, 3); } -MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHour(UErrorCode &status) { return MeasureUnit::create(7, 4, status); } -MeasureUnit MeasureUnit::getMicrosecond() { +MeasureUnit MeasureUnit::getHour() { return MeasureUnit(7, 4); } -MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) { return MeasureUnit::create(7, 5, status); } -MeasureUnit MeasureUnit::getMillisecond() { +MeasureUnit MeasureUnit::getMicrosecond() { return MeasureUnit(7, 5); } -MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) { return MeasureUnit::create(7, 6, status); } -MeasureUnit MeasureUnit::getMinute() { +MeasureUnit MeasureUnit::getMillisecond() { return MeasureUnit(7, 6); } -MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) { return MeasureUnit::create(7, 7, status); } -MeasureUnit MeasureUnit::getMonth() { +MeasureUnit MeasureUnit::getMinute() { return MeasureUnit(7, 7); } -MeasureUnit *MeasureUnit::createMonthPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) { return MeasureUnit::create(7, 8, status); } -MeasureUnit MeasureUnit::getMonthPerson() { +MeasureUnit MeasureUnit::getMonth() { return MeasureUnit(7, 8); } -MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMonthPerson(UErrorCode &status) { return MeasureUnit::create(7, 9, status); } -MeasureUnit MeasureUnit::getNanosecond() { +MeasureUnit MeasureUnit::getMonthPerson() { return MeasureUnit(7, 9); } -MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) { return MeasureUnit::create(7, 10, status); } -MeasureUnit MeasureUnit::getSecond() { +MeasureUnit MeasureUnit::getNanosecond() { return MeasureUnit(7, 10); } -MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { return MeasureUnit::create(7, 11, status); } -MeasureUnit MeasureUnit::getWeek() { +MeasureUnit MeasureUnit::getSecond() { return MeasureUnit(7, 11); } -MeasureUnit *MeasureUnit::createWeekPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { return MeasureUnit::create(7, 12, status); } -MeasureUnit MeasureUnit::getWeekPerson() { +MeasureUnit MeasureUnit::getWeek() { return MeasureUnit(7, 12); } -MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWeekPerson(UErrorCode &status) { return MeasureUnit::create(7, 13, status); } -MeasureUnit MeasureUnit::getYear() { +MeasureUnit MeasureUnit::getWeekPerson() { return MeasureUnit(7, 13); } -MeasureUnit *MeasureUnit::createYearPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { return MeasureUnit::create(7, 14, status); } -MeasureUnit MeasureUnit::getYearPerson() { +MeasureUnit MeasureUnit::getYear() { return MeasureUnit(7, 14); } +MeasureUnit *MeasureUnit::createYearPerson(UErrorCode &status) { + return MeasureUnit::create(7, 15, status); +} + +MeasureUnit MeasureUnit::getYearPerson() { + return MeasureUnit(7, 15); +} + MeasureUnit *MeasureUnit::createAmpere(UErrorCode &status) { return MeasureUnit::create(8, 0, status); } @@ -1131,6 +1155,14 @@ MeasureUnit MeasureUnit::getKilowattHour() { return MeasureUnit(9, 7); } +MeasureUnit *MeasureUnit::createThermUs(UErrorCode &status) { + return MeasureUnit::create(9, 8, status); +} + +MeasureUnit MeasureUnit::getThermUs() { + return MeasureUnit(9, 8); +} + MeasureUnit *MeasureUnit::createNewton(UErrorCode &status) { return MeasureUnit::create(10, 0, status); } @@ -1179,708 +1211,780 @@ MeasureUnit MeasureUnit::getMegahertz() { return MeasureUnit(11, 3); } -MeasureUnit *MeasureUnit::createAstronomicalUnit(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDotPerCentimeter(UErrorCode &status) { return MeasureUnit::create(12, 0, status); } -MeasureUnit MeasureUnit::getAstronomicalUnit() { +MeasureUnit MeasureUnit::getDotPerCentimeter() { return MeasureUnit(12, 0); } -MeasureUnit *MeasureUnit::createCentimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDotPerInch(UErrorCode &status) { return MeasureUnit::create(12, 1, status); } -MeasureUnit MeasureUnit::getCentimeter() { +MeasureUnit MeasureUnit::getDotPerInch() { return MeasureUnit(12, 1); } -MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createEm(UErrorCode &status) { return MeasureUnit::create(12, 2, status); } -MeasureUnit MeasureUnit::getDecimeter() { +MeasureUnit MeasureUnit::getEm() { return MeasureUnit(12, 2); } -MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegapixel(UErrorCode &status) { return MeasureUnit::create(12, 3, status); } -MeasureUnit MeasureUnit::getFathom() { +MeasureUnit MeasureUnit::getMegapixel() { return MeasureUnit(12, 3); } -MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPixel(UErrorCode &status) { return MeasureUnit::create(12, 4, status); } -MeasureUnit MeasureUnit::getFoot() { +MeasureUnit MeasureUnit::getPixel() { return MeasureUnit(12, 4); } -MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPixelPerCentimeter(UErrorCode &status) { return MeasureUnit::create(12, 5, status); } -MeasureUnit MeasureUnit::getFurlong() { +MeasureUnit MeasureUnit::getPixelPerCentimeter() { return MeasureUnit(12, 5); } -MeasureUnit *MeasureUnit::createInch(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPixelPerInch(UErrorCode &status) { return MeasureUnit::create(12, 6, status); } -MeasureUnit MeasureUnit::getInch() { +MeasureUnit MeasureUnit::getPixelPerInch() { return MeasureUnit(12, 6); } +MeasureUnit *MeasureUnit::createAstronomicalUnit(UErrorCode &status) { + return MeasureUnit::create(13, 0, status); +} + +MeasureUnit MeasureUnit::getAstronomicalUnit() { + return MeasureUnit(13, 0); +} + +MeasureUnit *MeasureUnit::createCentimeter(UErrorCode &status) { + return MeasureUnit::create(13, 1, status); +} + +MeasureUnit MeasureUnit::getCentimeter() { + return MeasureUnit(13, 1); +} + +MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) { + return MeasureUnit::create(13, 2, status); +} + +MeasureUnit MeasureUnit::getDecimeter() { + return MeasureUnit(13, 2); +} + +MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) { + return MeasureUnit::create(13, 3, status); +} + +MeasureUnit MeasureUnit::getFathom() { + return MeasureUnit(13, 3); +} + +MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) { + return MeasureUnit::create(13, 4, status); +} + +MeasureUnit MeasureUnit::getFoot() { + return MeasureUnit(13, 4); +} + +MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) { + return MeasureUnit::create(13, 5, status); +} + +MeasureUnit MeasureUnit::getFurlong() { + return MeasureUnit(13, 5); +} + +MeasureUnit *MeasureUnit::createInch(UErrorCode &status) { + return MeasureUnit::create(13, 6, status); +} + +MeasureUnit MeasureUnit::getInch() { + return MeasureUnit(13, 6); +} + MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) { - return MeasureUnit::create(12, 7, status); + return MeasureUnit::create(13, 7, status); } MeasureUnit MeasureUnit::getKilometer() { - return MeasureUnit(12, 7); + return MeasureUnit(13, 7); } MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) { - return MeasureUnit::create(12, 8, status); + return MeasureUnit::create(13, 8, status); } MeasureUnit MeasureUnit::getLightYear() { - return MeasureUnit(12, 8); + return MeasureUnit(13, 8); } MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) { - return MeasureUnit::create(12, 9, status); + return MeasureUnit::create(13, 9, status); } MeasureUnit MeasureUnit::getMeter() { - return MeasureUnit(12, 9); + return MeasureUnit(13, 9); } MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) { - return MeasureUnit::create(12, 10, status); + return MeasureUnit::create(13, 10, status); } MeasureUnit MeasureUnit::getMicrometer() { - return MeasureUnit(12, 10); + return MeasureUnit(13, 10); } MeasureUnit *MeasureUnit::createMile(UErrorCode &status) { - return MeasureUnit::create(12, 11, status); + return MeasureUnit::create(13, 11, status); } MeasureUnit MeasureUnit::getMile() { - return MeasureUnit(12, 11); + return MeasureUnit(13, 11); } MeasureUnit *MeasureUnit::createMileScandinavian(UErrorCode &status) { - return MeasureUnit::create(12, 12, status); + return MeasureUnit::create(13, 12, status); } MeasureUnit MeasureUnit::getMileScandinavian() { - return MeasureUnit(12, 12); + return MeasureUnit(13, 12); } MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) { - return MeasureUnit::create(12, 13, status); + return MeasureUnit::create(13, 13, status); } MeasureUnit MeasureUnit::getMillimeter() { - return MeasureUnit(12, 13); + return MeasureUnit(13, 13); } MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) { - return MeasureUnit::create(12, 14, status); + return MeasureUnit::create(13, 14, status); } MeasureUnit MeasureUnit::getNanometer() { - return MeasureUnit(12, 14); + return MeasureUnit(13, 14); } MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) { - return MeasureUnit::create(12, 15, status); + return MeasureUnit::create(13, 15, status); } MeasureUnit MeasureUnit::getNauticalMile() { - return MeasureUnit(12, 15); + return MeasureUnit(13, 15); } MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) { - return MeasureUnit::create(12, 16, status); + return MeasureUnit::create(13, 16, status); } MeasureUnit MeasureUnit::getParsec() { - return MeasureUnit(12, 16); + return MeasureUnit(13, 16); } MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) { - return MeasureUnit::create(12, 17, status); + return MeasureUnit::create(13, 17, status); } MeasureUnit MeasureUnit::getPicometer() { - return MeasureUnit(12, 17); + return MeasureUnit(13, 17); } MeasureUnit *MeasureUnit::createPoint(UErrorCode &status) { - return MeasureUnit::create(12, 18, status); + return MeasureUnit::create(13, 18, status); } MeasureUnit MeasureUnit::getPoint() { - return MeasureUnit(12, 18); + return MeasureUnit(13, 18); } MeasureUnit *MeasureUnit::createSolarRadius(UErrorCode &status) { - return MeasureUnit::create(12, 19, status); + return MeasureUnit::create(13, 19, status); } MeasureUnit MeasureUnit::getSolarRadius() { - return MeasureUnit(12, 19); + return MeasureUnit(13, 19); } MeasureUnit *MeasureUnit::createYard(UErrorCode &status) { - return MeasureUnit::create(12, 20, status); + return MeasureUnit::create(13, 20, status); } MeasureUnit MeasureUnit::getYard() { - return MeasureUnit(12, 20); + return MeasureUnit(13, 20); } MeasureUnit *MeasureUnit::createLux(UErrorCode &status) { - return MeasureUnit::create(13, 0, status); + return MeasureUnit::create(14, 0, status); } MeasureUnit MeasureUnit::getLux() { - return MeasureUnit(13, 0); + return MeasureUnit(14, 0); } MeasureUnit *MeasureUnit::createSolarLuminosity(UErrorCode &status) { - return MeasureUnit::create(13, 1, status); + return MeasureUnit::create(14, 1, status); } MeasureUnit MeasureUnit::getSolarLuminosity() { - return MeasureUnit(13, 1); + return MeasureUnit(14, 1); } MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) { - return MeasureUnit::create(14, 0, status); + return MeasureUnit::create(15, 0, status); } MeasureUnit MeasureUnit::getCarat() { - return MeasureUnit(14, 0); + return MeasureUnit(15, 0); } MeasureUnit *MeasureUnit::createDalton(UErrorCode &status) { - return MeasureUnit::create(14, 1, status); + return MeasureUnit::create(15, 1, status); } MeasureUnit MeasureUnit::getDalton() { - return MeasureUnit(14, 1); + return MeasureUnit(15, 1); } MeasureUnit *MeasureUnit::createEarthMass(UErrorCode &status) { - return MeasureUnit::create(14, 2, status); + return MeasureUnit::create(15, 2, status); } MeasureUnit MeasureUnit::getEarthMass() { - return MeasureUnit(14, 2); + return MeasureUnit(15, 2); } MeasureUnit *MeasureUnit::createGram(UErrorCode &status) { - return MeasureUnit::create(14, 3, status); + return MeasureUnit::create(15, 3, status); } MeasureUnit MeasureUnit::getGram() { - return MeasureUnit(14, 3); + return MeasureUnit(15, 3); } MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) { - return MeasureUnit::create(14, 4, status); + return MeasureUnit::create(15, 4, status); } MeasureUnit MeasureUnit::getKilogram() { - return MeasureUnit(14, 4); + return MeasureUnit(15, 4); } MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) { - return MeasureUnit::create(14, 5, status); + return MeasureUnit::create(15, 5, status); } MeasureUnit MeasureUnit::getMetricTon() { - return MeasureUnit(14, 5); + return MeasureUnit(15, 5); } MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { - return MeasureUnit::create(14, 6, status); + return MeasureUnit::create(15, 6, status); } MeasureUnit MeasureUnit::getMicrogram() { - return MeasureUnit(14, 6); + return MeasureUnit(15, 6); } MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { - return MeasureUnit::create(14, 7, status); + return MeasureUnit::create(15, 7, status); } MeasureUnit MeasureUnit::getMilligram() { - return MeasureUnit(14, 7); + return MeasureUnit(15, 7); } MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { - return MeasureUnit::create(14, 8, status); + return MeasureUnit::create(15, 8, status); } MeasureUnit MeasureUnit::getOunce() { - return MeasureUnit(14, 8); + return MeasureUnit(15, 8); } MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { - return MeasureUnit::create(14, 9, status); + return MeasureUnit::create(15, 9, status); } MeasureUnit MeasureUnit::getOunceTroy() { - return MeasureUnit(14, 9); + return MeasureUnit(15, 9); } MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { - return MeasureUnit::create(14, 10, status); + return MeasureUnit::create(15, 10, status); } MeasureUnit MeasureUnit::getPound() { - return MeasureUnit(14, 10); + return MeasureUnit(15, 10); } MeasureUnit *MeasureUnit::createSolarMass(UErrorCode &status) { - return MeasureUnit::create(14, 11, status); + return MeasureUnit::create(15, 11, status); } MeasureUnit MeasureUnit::getSolarMass() { - return MeasureUnit(14, 11); + return MeasureUnit(15, 11); } MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { - return MeasureUnit::create(14, 12, status); + return MeasureUnit::create(15, 12, status); } MeasureUnit MeasureUnit::getStone() { - return MeasureUnit(14, 12); + return MeasureUnit(15, 12); } MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { - return MeasureUnit::create(14, 13, status); + return MeasureUnit::create(15, 13, status); } MeasureUnit MeasureUnit::getTon() { - return MeasureUnit(14, 13); + return MeasureUnit(15, 13); } MeasureUnit *MeasureUnit::createGigawatt(UErrorCode &status) { - return MeasureUnit::create(16, 0, status); + return MeasureUnit::create(17, 0, status); } MeasureUnit MeasureUnit::getGigawatt() { - return MeasureUnit(16, 0); + return MeasureUnit(17, 0); } MeasureUnit *MeasureUnit::createHorsepower(UErrorCode &status) { - return MeasureUnit::create(16, 1, status); + return MeasureUnit::create(17, 1, status); } MeasureUnit MeasureUnit::getHorsepower() { - return MeasureUnit(16, 1); + return MeasureUnit(17, 1); } MeasureUnit *MeasureUnit::createKilowatt(UErrorCode &status) { - return MeasureUnit::create(16, 2, status); + return MeasureUnit::create(17, 2, status); } MeasureUnit MeasureUnit::getKilowatt() { - return MeasureUnit(16, 2); + return MeasureUnit(17, 2); } MeasureUnit *MeasureUnit::createMegawatt(UErrorCode &status) { - return MeasureUnit::create(16, 3, status); + return MeasureUnit::create(17, 3, status); } MeasureUnit MeasureUnit::getMegawatt() { - return MeasureUnit(16, 3); + return MeasureUnit(17, 3); } MeasureUnit *MeasureUnit::createMilliwatt(UErrorCode &status) { - return MeasureUnit::create(16, 4, status); + return MeasureUnit::create(17, 4, status); } MeasureUnit MeasureUnit::getMilliwatt() { - return MeasureUnit(16, 4); + return MeasureUnit(17, 4); } MeasureUnit *MeasureUnit::createWatt(UErrorCode &status) { - return MeasureUnit::create(16, 5, status); + return MeasureUnit::create(17, 5, status); } MeasureUnit MeasureUnit::getWatt() { - return MeasureUnit(16, 5); + return MeasureUnit(17, 5); } MeasureUnit *MeasureUnit::createAtmosphere(UErrorCode &status) { - return MeasureUnit::create(17, 0, status); + return MeasureUnit::create(18, 0, status); } MeasureUnit MeasureUnit::getAtmosphere() { - return MeasureUnit(17, 0); + return MeasureUnit(18, 0); +} + +MeasureUnit *MeasureUnit::createBar(UErrorCode &status) { + return MeasureUnit::create(18, 1, status); +} + +MeasureUnit MeasureUnit::getBar() { + return MeasureUnit(18, 1); } MeasureUnit *MeasureUnit::createHectopascal(UErrorCode &status) { - return MeasureUnit::create(17, 1, status); + return MeasureUnit::create(18, 2, status); } MeasureUnit MeasureUnit::getHectopascal() { - return MeasureUnit(17, 1); + return MeasureUnit(18, 2); } MeasureUnit *MeasureUnit::createInchHg(UErrorCode &status) { - return MeasureUnit::create(17, 2, status); + return MeasureUnit::create(18, 3, status); } MeasureUnit MeasureUnit::getInchHg() { - return MeasureUnit(17, 2); + return MeasureUnit(18, 3); } MeasureUnit *MeasureUnit::createKilopascal(UErrorCode &status) { - return MeasureUnit::create(17, 3, status); + return MeasureUnit::create(18, 4, status); } MeasureUnit MeasureUnit::getKilopascal() { - return MeasureUnit(17, 3); + return MeasureUnit(18, 4); } MeasureUnit *MeasureUnit::createMegapascal(UErrorCode &status) { - return MeasureUnit::create(17, 4, status); + return MeasureUnit::create(18, 5, status); } MeasureUnit MeasureUnit::getMegapascal() { - return MeasureUnit(17, 4); + return MeasureUnit(18, 5); } MeasureUnit *MeasureUnit::createMillibar(UErrorCode &status) { - return MeasureUnit::create(17, 5, status); + return MeasureUnit::create(18, 6, status); } MeasureUnit MeasureUnit::getMillibar() { - return MeasureUnit(17, 5); + return MeasureUnit(18, 6); } MeasureUnit *MeasureUnit::createMillimeterOfMercury(UErrorCode &status) { - return MeasureUnit::create(17, 6, status); + return MeasureUnit::create(18, 7, status); } MeasureUnit MeasureUnit::getMillimeterOfMercury() { - return MeasureUnit(17, 6); + return MeasureUnit(18, 7); +} + +MeasureUnit *MeasureUnit::createPascal(UErrorCode &status) { + return MeasureUnit::create(18, 8, status); +} + +MeasureUnit MeasureUnit::getPascal() { + return MeasureUnit(18, 8); } MeasureUnit *MeasureUnit::createPoundPerSquareInch(UErrorCode &status) { - return MeasureUnit::create(17, 7, status); + return MeasureUnit::create(18, 9, status); } MeasureUnit MeasureUnit::getPoundPerSquareInch() { - return MeasureUnit(17, 7); + return MeasureUnit(18, 9); } MeasureUnit *MeasureUnit::createKilometerPerHour(UErrorCode &status) { - return MeasureUnit::create(18, 0, status); + return MeasureUnit::create(19, 0, status); } MeasureUnit MeasureUnit::getKilometerPerHour() { - return MeasureUnit(18, 0); + return MeasureUnit(19, 0); } MeasureUnit *MeasureUnit::createKnot(UErrorCode &status) { - return MeasureUnit::create(18, 1, status); + return MeasureUnit::create(19, 1, status); } MeasureUnit MeasureUnit::getKnot() { - return MeasureUnit(18, 1); + return MeasureUnit(19, 1); } MeasureUnit *MeasureUnit::createMeterPerSecond(UErrorCode &status) { - return MeasureUnit::create(18, 2, status); + return MeasureUnit::create(19, 2, status); } MeasureUnit MeasureUnit::getMeterPerSecond() { - return MeasureUnit(18, 2); + return MeasureUnit(19, 2); } MeasureUnit *MeasureUnit::createMilePerHour(UErrorCode &status) { - return MeasureUnit::create(18, 3, status); + return MeasureUnit::create(19, 3, status); } MeasureUnit MeasureUnit::getMilePerHour() { - return MeasureUnit(18, 3); + return MeasureUnit(19, 3); } MeasureUnit *MeasureUnit::createCelsius(UErrorCode &status) { - return MeasureUnit::create(19, 0, status); + return MeasureUnit::create(20, 0, status); } MeasureUnit MeasureUnit::getCelsius() { - return MeasureUnit(19, 0); + return MeasureUnit(20, 0); } MeasureUnit *MeasureUnit::createFahrenheit(UErrorCode &status) { - return MeasureUnit::create(19, 1, status); + return MeasureUnit::create(20, 1, status); } MeasureUnit MeasureUnit::getFahrenheit() { - return MeasureUnit(19, 1); + return MeasureUnit(20, 1); } MeasureUnit *MeasureUnit::createGenericTemperature(UErrorCode &status) { - return MeasureUnit::create(19, 2, status); + return MeasureUnit::create(20, 2, status); } MeasureUnit MeasureUnit::getGenericTemperature() { - return MeasureUnit(19, 2); + return MeasureUnit(20, 2); } MeasureUnit *MeasureUnit::createKelvin(UErrorCode &status) { - return MeasureUnit::create(19, 3, status); + return MeasureUnit::create(20, 3, status); } MeasureUnit MeasureUnit::getKelvin() { - return MeasureUnit(19, 3); + return MeasureUnit(20, 3); } MeasureUnit *MeasureUnit::createNewtonMeter(UErrorCode &status) { - return MeasureUnit::create(20, 0, status); + return MeasureUnit::create(21, 0, status); } MeasureUnit MeasureUnit::getNewtonMeter() { - return MeasureUnit(20, 0); + return MeasureUnit(21, 0); } MeasureUnit *MeasureUnit::createPoundFoot(UErrorCode &status) { - return MeasureUnit::create(20, 1, status); + return MeasureUnit::create(21, 1, status); } MeasureUnit MeasureUnit::getPoundFoot() { - return MeasureUnit(20, 1); + return MeasureUnit(21, 1); } MeasureUnit *MeasureUnit::createAcreFoot(UErrorCode &status) { - return MeasureUnit::create(21, 0, status); + return MeasureUnit::create(22, 0, status); } MeasureUnit MeasureUnit::getAcreFoot() { - return MeasureUnit(21, 0); + return MeasureUnit(22, 0); } MeasureUnit *MeasureUnit::createBarrel(UErrorCode &status) { - return MeasureUnit::create(21, 1, status); + return MeasureUnit::create(22, 1, status); } MeasureUnit MeasureUnit::getBarrel() { - return MeasureUnit(21, 1); + return MeasureUnit(22, 1); } MeasureUnit *MeasureUnit::createBushel(UErrorCode &status) { - return MeasureUnit::create(21, 2, status); + return MeasureUnit::create(22, 2, status); } MeasureUnit MeasureUnit::getBushel() { - return MeasureUnit(21, 2); + return MeasureUnit(22, 2); } MeasureUnit *MeasureUnit::createCentiliter(UErrorCode &status) { - return MeasureUnit::create(21, 3, status); + return MeasureUnit::create(22, 3, status); } MeasureUnit MeasureUnit::getCentiliter() { - return MeasureUnit(21, 3); + return MeasureUnit(22, 3); } MeasureUnit *MeasureUnit::createCubicCentimeter(UErrorCode &status) { - return MeasureUnit::create(21, 4, status); + return MeasureUnit::create(22, 4, status); } MeasureUnit MeasureUnit::getCubicCentimeter() { - return MeasureUnit(21, 4); + return MeasureUnit(22, 4); } MeasureUnit *MeasureUnit::createCubicFoot(UErrorCode &status) { - return MeasureUnit::create(21, 5, status); + return MeasureUnit::create(22, 5, status); } MeasureUnit MeasureUnit::getCubicFoot() { - return MeasureUnit(21, 5); + return MeasureUnit(22, 5); } MeasureUnit *MeasureUnit::createCubicInch(UErrorCode &status) { - return MeasureUnit::create(21, 6, status); + return MeasureUnit::create(22, 6, status); } MeasureUnit MeasureUnit::getCubicInch() { - return MeasureUnit(21, 6); + return MeasureUnit(22, 6); } MeasureUnit *MeasureUnit::createCubicKilometer(UErrorCode &status) { - return MeasureUnit::create(21, 7, status); + return MeasureUnit::create(22, 7, status); } MeasureUnit MeasureUnit::getCubicKilometer() { - return MeasureUnit(21, 7); + return MeasureUnit(22, 7); } MeasureUnit *MeasureUnit::createCubicMeter(UErrorCode &status) { - return MeasureUnit::create(21, 8, status); + return MeasureUnit::create(22, 8, status); } MeasureUnit MeasureUnit::getCubicMeter() { - return MeasureUnit(21, 8); + return MeasureUnit(22, 8); } MeasureUnit *MeasureUnit::createCubicMile(UErrorCode &status) { - return MeasureUnit::create(21, 9, status); + return MeasureUnit::create(22, 9, status); } MeasureUnit MeasureUnit::getCubicMile() { - return MeasureUnit(21, 9); + return MeasureUnit(22, 9); } MeasureUnit *MeasureUnit::createCubicYard(UErrorCode &status) { - return MeasureUnit::create(21, 10, status); + return MeasureUnit::create(22, 10, status); } MeasureUnit MeasureUnit::getCubicYard() { - return MeasureUnit(21, 10); + return MeasureUnit(22, 10); } MeasureUnit *MeasureUnit::createCup(UErrorCode &status) { - return MeasureUnit::create(21, 11, status); + return MeasureUnit::create(22, 11, status); } MeasureUnit MeasureUnit::getCup() { - return MeasureUnit(21, 11); + return MeasureUnit(22, 11); } MeasureUnit *MeasureUnit::createCupMetric(UErrorCode &status) { - return MeasureUnit::create(21, 12, status); + return MeasureUnit::create(22, 12, status); } MeasureUnit MeasureUnit::getCupMetric() { - return MeasureUnit(21, 12); + return MeasureUnit(22, 12); } MeasureUnit *MeasureUnit::createDeciliter(UErrorCode &status) { - return MeasureUnit::create(21, 13, status); + return MeasureUnit::create(22, 13, status); } MeasureUnit MeasureUnit::getDeciliter() { - return MeasureUnit(21, 13); + return MeasureUnit(22, 13); } MeasureUnit *MeasureUnit::createFluidOunce(UErrorCode &status) { - return MeasureUnit::create(21, 14, status); + return MeasureUnit::create(22, 14, status); } MeasureUnit MeasureUnit::getFluidOunce() { - return MeasureUnit(21, 14); + return MeasureUnit(22, 14); } MeasureUnit *MeasureUnit::createFluidOunceImperial(UErrorCode &status) { - return MeasureUnit::create(21, 15, status); + return MeasureUnit::create(22, 15, status); } MeasureUnit MeasureUnit::getFluidOunceImperial() { - return MeasureUnit(21, 15); + return MeasureUnit(22, 15); } MeasureUnit *MeasureUnit::createGallon(UErrorCode &status) { - return MeasureUnit::create(21, 16, status); + return MeasureUnit::create(22, 16, status); } MeasureUnit MeasureUnit::getGallon() { - return MeasureUnit(21, 16); + return MeasureUnit(22, 16); } MeasureUnit *MeasureUnit::createGallonImperial(UErrorCode &status) { - return MeasureUnit::create(21, 17, status); + return MeasureUnit::create(22, 17, status); } MeasureUnit MeasureUnit::getGallonImperial() { - return MeasureUnit(21, 17); + return MeasureUnit(22, 17); } MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) { - return MeasureUnit::create(21, 18, status); + return MeasureUnit::create(22, 18, status); } MeasureUnit MeasureUnit::getHectoliter() { - return MeasureUnit(21, 18); + return MeasureUnit(22, 18); } MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) { - return MeasureUnit::create(21, 19, status); + return MeasureUnit::create(22, 19, status); } MeasureUnit MeasureUnit::getLiter() { - return MeasureUnit(21, 19); + return MeasureUnit(22, 19); } MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) { - return MeasureUnit::create(21, 20, status); + return MeasureUnit::create(22, 20, status); } MeasureUnit MeasureUnit::getMegaliter() { - return MeasureUnit(21, 20); + return MeasureUnit(22, 20); } MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) { - return MeasureUnit::create(21, 21, status); + return MeasureUnit::create(22, 21, status); } MeasureUnit MeasureUnit::getMilliliter() { - return MeasureUnit(21, 21); + return MeasureUnit(22, 21); } MeasureUnit *MeasureUnit::createPint(UErrorCode &status) { - return MeasureUnit::create(21, 22, status); + return MeasureUnit::create(22, 22, status); } MeasureUnit MeasureUnit::getPint() { - return MeasureUnit(21, 22); + return MeasureUnit(22, 22); } MeasureUnit *MeasureUnit::createPintMetric(UErrorCode &status) { - return MeasureUnit::create(21, 23, status); + return MeasureUnit::create(22, 23, status); } MeasureUnit MeasureUnit::getPintMetric() { - return MeasureUnit(21, 23); + return MeasureUnit(22, 23); } MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) { - return MeasureUnit::create(21, 24, status); + return MeasureUnit::create(22, 24, status); } MeasureUnit MeasureUnit::getQuart() { - return MeasureUnit(21, 24); + return MeasureUnit(22, 24); } MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) { - return MeasureUnit::create(21, 25, status); + return MeasureUnit::create(22, 25, status); } MeasureUnit MeasureUnit::getTablespoon() { - return MeasureUnit(21, 25); + return MeasureUnit(22, 25); } MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) { - return MeasureUnit::create(21, 26, status); + return MeasureUnit::create(22, 26, status); } MeasureUnit MeasureUnit::getTeaspoon() { - return MeasureUnit(21, 26); + return MeasureUnit(22, 26); } // End generated code @@ -1923,7 +2027,7 @@ MeasureUnit &MeasureUnit::operator=(const MeasureUnit &other) { return *this; } -UObject *MeasureUnit::clone() const { +MeasureUnit *MeasureUnit::clone() const { return new MeasureUnit(*this); } diff --git a/deps/icu-small/source/i18n/measure.cpp b/deps/icu-small/source/i18n/measure.cpp index d9084f87db2baa..bffa44215e3cde 100644 --- a/deps/icu-small/source/i18n/measure.cpp +++ b/deps/icu-small/source/i18n/measure.cpp @@ -43,12 +43,12 @@ Measure& Measure::operator=(const Measure& other) { if (this != &other) { delete unit; number = other.number; - unit = (MeasureUnit*) other.unit->clone(); + unit = other.unit->clone(); } return *this; } -UObject *Measure::clone() const { +Measure *Measure::clone() const { return new Measure(*this); } diff --git a/deps/icu-small/source/i18n/msgfmt.cpp b/deps/icu-small/source/i18n/msgfmt.cpp index e39b26b969889f..3ca368ef954846 100644 --- a/deps/icu-small/source/i18n/msgfmt.cpp +++ b/deps/icu-small/source/i18n/msgfmt.cpp @@ -436,7 +436,7 @@ MessageFormat::operator==(const Format& rhs) const // ------------------------------------- // Creates a copy of this MessageFormat, the caller owns the copy. -Format* +MessageFormat* MessageFormat::clone() const { return new MessageFormat(*this); @@ -813,7 +813,7 @@ MessageFormat::getFormats(int32_t& cnt) const // Get total required capacity first (it's refreshed on each call). int32_t totalCapacity = 0; - for (int32_t partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0; ++totalCapacity) {}; + for (int32_t partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0; ++totalCapacity) {} MessageFormat* t = const_cast (this); cnt = 0; @@ -1873,7 +1873,7 @@ UBool MessageFormat::DummyFormat::operator==(const Format&) const { return TRUE; } -Format* MessageFormat::DummyFormat::clone() const { +MessageFormat::DummyFormat* MessageFormat::DummyFormat::clone() const { return new DummyFormat(); } diff --git a/deps/icu-small/source/i18n/name2uni.cpp b/deps/icu-small/source/i18n/name2uni.cpp index d901eb126a8a46..90bca9d71bef87 100644 --- a/deps/icu-small/source/i18n/name2uni.cpp +++ b/deps/icu-small/source/i18n/name2uni.cpp @@ -100,7 +100,7 @@ NameUnicodeTransliterator::NameUnicodeTransliterator(const NameUnicodeTransliter /** * Transliterator API. */ -Transliterator* NameUnicodeTransliterator::clone(void) const { +NameUnicodeTransliterator* NameUnicodeTransliterator::clone() const { return new NameUnicodeTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/name2uni.h b/deps/icu-small/source/i18n/name2uni.h index 4c743def32ede2..44ad85fb822cb3 100644 --- a/deps/icu-small/source/i18n/name2uni.h +++ b/deps/icu-small/source/i18n/name2uni.h @@ -49,7 +49,7 @@ class NameUnicodeTransliterator : public Transliterator { * Transliterator API. * @return A copy of the object. */ - virtual Transliterator* clone(void) const; + virtual NameUnicodeTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/nortrans.cpp b/deps/icu-small/source/i18n/nortrans.cpp index 589c82482ec9b9..6a8d2c74194fb0 100644 --- a/deps/icu-small/source/i18n/nortrans.cpp +++ b/deps/icu-small/source/i18n/nortrans.cpp @@ -92,7 +92,7 @@ NormalizationTransliterator::NormalizationTransliterator(const NormalizationTran /** * Transliterator API. */ -Transliterator* NormalizationTransliterator::clone(void) const { +NormalizationTransliterator* NormalizationTransliterator::clone() const { return new NormalizationTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/nortrans.h b/deps/icu-small/source/i18n/nortrans.h index d309452f9a4d6a..198ed29c95e70f 100644 --- a/deps/icu-small/source/i18n/nortrans.h +++ b/deps/icu-small/source/i18n/nortrans.h @@ -44,7 +44,7 @@ class NormalizationTransliterator : public Transliterator { * Transliterator API. * @return A copy of the object. */ - virtual Transliterator* clone(void) const; + virtual NormalizationTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/nounit.cpp b/deps/icu-small/source/i18n/nounit.cpp index db07387c590af8..076f76f199c737 100644 --- a/deps/icu-small/source/i18n/nounit.cpp +++ b/deps/icu-small/source/i18n/nounit.cpp @@ -29,7 +29,7 @@ NoUnit::NoUnit(const char* subtype) { NoUnit::NoUnit(const NoUnit& other) : MeasureUnit(other) { } -UObject* NoUnit::clone() const { +NoUnit* NoUnit::clone() const { return new NoUnit(*this); } diff --git a/deps/icu-small/source/i18n/nultrans.cpp b/deps/icu-small/source/i18n/nultrans.cpp index 62d1290ac75e93..439cc55d381a2a 100644 --- a/deps/icu-small/source/i18n/nultrans.cpp +++ b/deps/icu-small/source/i18n/nultrans.cpp @@ -24,7 +24,7 @@ NullTransliterator::NullTransliterator() : Transliterator(UNICODE_STRING_SIMPLE( NullTransliterator::~NullTransliterator() {} -Transliterator* NullTransliterator::clone(void) const { +NullTransliterator* NullTransliterator::clone() const { return new NullTransliterator(); } diff --git a/deps/icu-small/source/i18n/nultrans.h b/deps/icu-small/source/i18n/nultrans.h index a01b04e9ba1ec9..36c92fa7b189d3 100644 --- a/deps/icu-small/source/i18n/nultrans.h +++ b/deps/icu-small/source/i18n/nultrans.h @@ -45,7 +45,7 @@ class NullTransliterator : public Transliterator { * Transliterator API. * @internal Use transliterator factory methods instead since this class will be removed in that release. */ - virtual Transliterator* clone(void) const; + virtual NullTransliterator* clone() const; /** * Implements {@link Transliterator#handleTransliterate}. diff --git a/deps/icu-small/source/i18n/number_affixutils.cpp b/deps/icu-small/source/i18n/number_affixutils.cpp index 3eb9c59bf49090..1039a84c656124 100644 --- a/deps/icu-small/source/i18n/number_affixutils.cpp +++ b/deps/icu-small/source/i18n/number_affixutils.cpp @@ -156,7 +156,7 @@ Field AffixUtils::getFieldForType(AffixPatternType type) { } int32_t -AffixUtils::unescape(const UnicodeString &affixPattern, NumberStringBuilder &output, int32_t position, +AffixUtils::unescape(const UnicodeString &affixPattern, FormattedStringBuilder &output, int32_t position, const SymbolProvider &provider, Field field, UErrorCode &status) { int32_t length = 0; AffixTag tag; @@ -230,7 +230,7 @@ UnicodeString AffixUtils::replaceType(const UnicodeString &affixPattern, AffixPa UnicodeString output(affixPattern); // copy if (affixPattern.length() == 0) { return output; - }; + } AffixTag tag; while (hasNext(tag, affixPattern)) { tag = nextToken(tag, affixPattern, status); @@ -246,7 +246,7 @@ bool AffixUtils::containsOnlySymbolsAndIgnorables(const UnicodeString& affixPatt const UnicodeSet& ignorables, UErrorCode& status) { if (affixPattern.length() == 0) { return true; - }; + } AffixTag tag; while (hasNext(tag, affixPattern)) { tag = nextToken(tag, affixPattern, status); @@ -262,7 +262,7 @@ void AffixUtils::iterateWithConsumer(const UnicodeString& affixPattern, TokenCon UErrorCode& status) { if (affixPattern.length() == 0) { return; - }; + } AffixTag tag; while (hasNext(tag, affixPattern)) { tag = nextToken(tag, affixPattern, status); diff --git a/deps/icu-small/source/i18n/number_affixutils.h b/deps/icu-small/source/i18n/number_affixutils.h index f011a54b316166..5cfde61ffd0ca2 100644 --- a/deps/icu-small/source/i18n/number_affixutils.h +++ b/deps/icu-small/source/i18n/number_affixutils.h @@ -11,7 +11,7 @@ #include "number_types.h" #include "unicode/stringpiece.h" #include "unicode/unistr.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "unicode/uniset.h" U_NAMESPACE_BEGIN namespace number { @@ -134,16 +134,16 @@ class U_I18N_API AffixUtils { /** * Executes the unescape state machine. Replaces the unquoted characters "-", "+", "%", "‰", and * "¤" with the corresponding symbols provided by the {@link SymbolProvider}, and inserts the - * result into the NumberStringBuilder at the requested location. + * result into the FormattedStringBuilder at the requested location. * *

Example input: "'-'¤x"; example output: "-$x" * * @param affixPattern The original string to be unescaped. - * @param output The NumberStringBuilder to mutate with the result. - * @param position The index into the NumberStringBuilder to insert the string. + * @param output The FormattedStringBuilder to mutate with the result. + * @param position The index into the FormattedStringBuilder to insert the string. * @param provider An object to generate locale symbols. */ - static int32_t unescape(const UnicodeString& affixPattern, NumberStringBuilder& output, + static int32_t unescape(const UnicodeString& affixPattern, FormattedStringBuilder& output, int32_t position, const SymbolProvider& provider, Field field, UErrorCode& status); diff --git a/deps/icu-small/source/i18n/number_asformat.cpp b/deps/icu-small/source/i18n/number_asformat.cpp index 9d3ea69f578e1e..e876174fdce0ee 100644 --- a/deps/icu-small/source/i18n/number_asformat.cpp +++ b/deps/icu-small/source/i18n/number_asformat.cpp @@ -43,7 +43,7 @@ UBool LocalizedNumberFormatterAsFormat::operator==(const Format& other) const { return fFormatter.toSkeleton(localStatus) == _other->fFormatter.toSkeleton(localStatus); } -Format* LocalizedNumberFormatterAsFormat::clone() const { +LocalizedNumberFormatterAsFormat* LocalizedNumberFormatterAsFormat::clone() const { return new LocalizedNumberFormatterAsFormat(*this); } @@ -62,12 +62,12 @@ UnicodeString& LocalizedNumberFormatterAsFormat::format(const Formattable& obj, // always return first occurrence: pos.setBeginIndex(0); pos.setEndIndex(0); - bool found = data.getStringRef().nextFieldPosition(pos, status); + bool found = data.nextFieldPosition(pos, status); if (found && appendTo.length() != 0) { pos.setBeginIndex(pos.getBeginIndex() + appendTo.length()); pos.setEndIndex(pos.getEndIndex() + appendTo.length()); } - appendTo.append(data.getStringRef().toTempUnicodeString()); + appendTo.append(data.toTempString(status)); return appendTo; } @@ -84,10 +84,10 @@ UnicodeString& LocalizedNumberFormatterAsFormat::format(const Formattable& obj, if (U_FAILURE(status)) { return appendTo; } - appendTo.append(data.getStringRef().toTempUnicodeString()); + appendTo.append(data.toTempString(status)); if (posIter != nullptr) { FieldPositionIteratorHandler fpih(posIter, status); - data.getStringRef().getAllFieldPositions(fpih, status); + data.getAllFieldPositions(fpih, status); } return appendTo; } diff --git a/deps/icu-small/source/i18n/number_asformat.h b/deps/icu-small/source/i18n/number_asformat.h index bf82d72ae302a4..7b0a1dee6f438b 100644 --- a/deps/icu-small/source/i18n/number_asformat.h +++ b/deps/icu-small/source/i18n/number_asformat.h @@ -45,7 +45,7 @@ class U_I18N_API LocalizedNumberFormatterAsFormat : public Format { /** * Creates a copy of this object. */ - Format* clone() const U_OVERRIDE; + LocalizedNumberFormatterAsFormat* clone() const U_OVERRIDE; /** * Formats a Number using the wrapped LocalizedNumberFormatter. The provided formattable must be a diff --git a/deps/icu-small/source/i18n/number_compact.cpp b/deps/icu-small/source/i18n/number_compact.cpp index f330251be38c88..3d259999d6ce52 100644 --- a/deps/icu-small/source/i18n/number_compact.cpp +++ b/deps/icu-small/source/i18n/number_compact.cpp @@ -272,15 +272,15 @@ void CompactHandler::processQuantity(DecimalQuantity &quantity, MicroProps &micr parent->processQuantity(quantity, micros, status); if (U_FAILURE(status)) { return; } - // Treat zero as if it had magnitude 0 + // Treat zero, NaN, and infinity as if they had magnitude 0 int32_t magnitude; - if (quantity.isZero()) { + if (quantity.isZeroish()) { magnitude = 0; micros.rounder.apply(quantity, status); } else { // TODO: Revisit chooseMultiplierAndApply int32_t multiplier = micros.rounder.chooseMultiplierAndApply(quantity, data, status); - magnitude = quantity.isZero() ? 0 : quantity.getMagnitude(); + magnitude = quantity.isZeroish() ? 0 : quantity.getMagnitude(); magnitude -= multiplier; } diff --git a/deps/icu-small/source/i18n/number_currencysymbols.cpp b/deps/icu-small/source/i18n/number_currencysymbols.cpp index 0b79d6596f18c0..4d6fb2cb1d8dec 100644 --- a/deps/icu-small/source/i18n/number_currencysymbols.cpp +++ b/deps/icu-small/source/i18n/number_currencysymbols.cpp @@ -53,13 +53,12 @@ UnicodeString CurrencySymbols::getCurrencySymbol(UErrorCode& status) const { UnicodeString CurrencySymbols::loadSymbol(UCurrNameStyle selector, UErrorCode& status) const { const char16_t* isoCode = fCurrency.getISOCurrency(); - UBool ignoredIsChoiceFormatFillIn = FALSE; int32_t symbolLen = 0; const char16_t* symbol = ucurr_getName( isoCode, fLocaleName.data(), selector, - &ignoredIsChoiceFormatFillIn, + nullptr /* isChoiceFormat */, &symbolLen, &status); // If given an unknown currency, ucurr_getName returns the input string, which we can't alias safely! @@ -82,12 +81,11 @@ UnicodeString CurrencySymbols::getIntlCurrencySymbol(UErrorCode&) const { UnicodeString CurrencySymbols::getPluralName(StandardPlural::Form plural, UErrorCode& status) const { const char16_t* isoCode = fCurrency.getISOCurrency(); - UBool isChoiceFormat = FALSE; int32_t symbolLen = 0; const char16_t* symbol = ucurr_getPluralName( isoCode, fLocaleName.data(), - &isChoiceFormat, + nullptr /* isChoiceFormat */, StandardPlural::getKeyword(plural), &symbolLen, &status); diff --git a/deps/icu-small/source/i18n/number_decimalquantity.cpp b/deps/icu-small/source/i18n/number_decimalquantity.cpp index d899c27671181e..2c4c2ce7e9931b 100644 --- a/deps/icu-small/source/i18n/number_decimalquantity.cpp +++ b/deps/icu-small/source/i18n/number_decimalquantity.cpp @@ -205,7 +205,7 @@ void DecimalQuantity::roundToIncrement(double roundingIncrement, RoundingMode ro } void DecimalQuantity::multiplyBy(const DecNum& multiplicand, UErrorCode& status) { - if (isInfinite() || isZero() || isNaN()) { + if (isZeroish()) { return; } // Convert to DecNum, multiply, and convert back. @@ -218,7 +218,7 @@ void DecimalQuantity::multiplyBy(const DecNum& multiplicand, UErrorCode& status) } void DecimalQuantity::divideBy(const DecNum& divisor, UErrorCode& status) { - if (isInfinite() || isZero() || isNaN()) { + if (isZeroish()) { return; } // Convert to DecNum, multiply, and convert back. @@ -318,8 +318,14 @@ bool DecimalQuantity::isNegative() const { return (flags & NEGATIVE_FLAG) != 0; } -int8_t DecimalQuantity::signum() const { - return isNegative() ? -1 : isZero() ? 0 : 1; +Signum DecimalQuantity::signum() const { + if (isNegative()) { + return SIGNUM_NEG; + } else if (isZeroish() && !isInfinite()) { + return SIGNUM_ZERO; + } else { + return SIGNUM_POS; + } } bool DecimalQuantity::isInfinite() const { @@ -330,7 +336,7 @@ bool DecimalQuantity::isNaN() const { return (flags & NAN_FLAG) != 0; } -bool DecimalQuantity::isZero() const { +bool DecimalQuantity::isZeroish() const { return precision == 0; } @@ -548,7 +554,10 @@ uint64_t DecimalQuantity::toFractionLong(bool includeTrailingZeros) const { } bool DecimalQuantity::fitsInLong(bool ignoreFraction) const { - if (isZero()) { + if (isInfinite() || isNaN()) { + return false; + } + if (isZeroish()) { return true; } if (scale < 0 && !ignoreFraction) { diff --git a/deps/icu-small/source/i18n/number_decimalquantity.h b/deps/icu-small/source/i18n/number_decimalquantity.h index 06cc836c7796f2..4ec6c5a5b2bcf7 100644 --- a/deps/icu-small/source/i18n/number_decimalquantity.h +++ b/deps/icu-small/source/i18n/number_decimalquantity.h @@ -146,14 +146,17 @@ class U_I18N_API DecimalQuantity : public IFixedDecimal, public UMemory { */ int32_t getMagnitude() const; - /** @return Whether the value represented by this {@link DecimalQuantity} is zero. */ - bool isZero() const; + /** + * @return Whether the value represented by this {@link DecimalQuantity} is + * zero, infinity, or NaN. + */ + bool isZeroish() const; /** @return Whether the value represented by this {@link DecimalQuantity} is less than zero. */ bool isNegative() const; - /** @return -1 if the value is negative; 1 if positive; or 0 if zero. */ - int8_t signum() const; + /** @return The appropriate value from the Signum enum. */ + Signum signum() const; /** @return Whether the value represented by this {@link DecimalQuantity} is infinite. */ bool isInfinite() const U_OVERRIDE; diff --git a/deps/icu-small/source/i18n/number_decnum.h b/deps/icu-small/source/i18n/number_decnum.h index a7793470b55695..0c7399dbddd43b 100644 --- a/deps/icu-small/source/i18n/number_decnum.h +++ b/deps/icu-small/source/i18n/number_decnum.h @@ -55,6 +55,8 @@ class U_I18N_API DecNum : public UMemory { bool isZero() const; + void toString(ByteSink& output, UErrorCode& status) const; + inline const decNumber* getRawDecNumber() const { return fData.getAlias(); } diff --git a/deps/icu-small/source/i18n/number_fluent.cpp b/deps/icu-small/source/i18n/number_fluent.cpp index 09e0905609eb30..2dbd2fa6cd5acf 100644 --- a/deps/icu-small/source/i18n/number_fluent.cpp +++ b/deps/icu-small/source/i18n/number_fluent.cpp @@ -696,8 +696,8 @@ void LocalizedNumberFormatter::formatImpl(impl::UFormattedNumberData* results, U void LocalizedNumberFormatter::getAffixImpl(bool isPrefix, bool isNegative, UnicodeString& result, UErrorCode& status) const { - NumberStringBuilder string; - auto signum = static_cast(isNegative ? -1 : 1); + FormattedStringBuilder string; + auto signum = static_cast(isNegative ? SIGNUM_NEG : SIGNUM_POS); // Always return affixes for plural form OTHER. static const StandardPlural::Form plural = StandardPlural::OTHER; int32_t prefixLength; diff --git a/deps/icu-small/source/i18n/number_formatimpl.cpp b/deps/icu-small/source/i18n/number_formatimpl.cpp index 08b833beb7ad2e..2e2c4a9620c77c 100644 --- a/deps/icu-small/source/i18n/number_formatimpl.cpp +++ b/deps/icu-small/source/i18n/number_formatimpl.cpp @@ -72,7 +72,7 @@ NumberFormatterImpl::NumberFormatterImpl(const MacroProps& macros, UErrorCode& s } int32_t NumberFormatterImpl::formatStatic(const MacroProps& macros, DecimalQuantity& inValue, - NumberStringBuilder& outString, UErrorCode& status) { + FormattedStringBuilder& outString, UErrorCode& status) { NumberFormatterImpl impl(macros, false, status); MicroProps& micros = impl.preProcessUnsafe(inValue, status); if (U_FAILURE(status)) { return 0; } @@ -81,9 +81,9 @@ int32_t NumberFormatterImpl::formatStatic(const MacroProps& macros, DecimalQuant return length; } -int32_t NumberFormatterImpl::getPrefixSuffixStatic(const MacroProps& macros, int8_t signum, +int32_t NumberFormatterImpl::getPrefixSuffixStatic(const MacroProps& macros, Signum signum, StandardPlural::Form plural, - NumberStringBuilder& outString, UErrorCode& status) { + FormattedStringBuilder& outString, UErrorCode& status) { NumberFormatterImpl impl(macros, false, status); return impl.getPrefixSuffixUnsafe(signum, plural, outString, status); } @@ -93,7 +93,7 @@ int32_t NumberFormatterImpl::getPrefixSuffixStatic(const MacroProps& macros, int // The "unsafe" method simply re-uses fMicros, eliminating the extra copy operation. // See MicroProps::processQuantity() for details. -int32_t NumberFormatterImpl::format(DecimalQuantity& inValue, NumberStringBuilder& outString, +int32_t NumberFormatterImpl::format(DecimalQuantity& inValue, FormattedStringBuilder& outString, UErrorCode& status) const { MicroProps micros; preProcess(inValue, micros, status); @@ -129,8 +129,8 @@ MicroProps& NumberFormatterImpl::preProcessUnsafe(DecimalQuantity& inValue, UErr return fMicros; } -int32_t NumberFormatterImpl::getPrefixSuffix(int8_t signum, StandardPlural::Form plural, - NumberStringBuilder& outString, UErrorCode& status) const { +int32_t NumberFormatterImpl::getPrefixSuffix(Signum signum, StandardPlural::Form plural, + FormattedStringBuilder& outString, UErrorCode& status) const { if (U_FAILURE(status)) { return 0; } // #13453: DecimalFormat wants the affixes from the pattern only (modMiddle, aka pattern modifier). // Safe path: use fImmutablePatternModifier. @@ -140,8 +140,8 @@ int32_t NumberFormatterImpl::getPrefixSuffix(int8_t signum, StandardPlural::Form return modifier->getPrefixLength(); } -int32_t NumberFormatterImpl::getPrefixSuffixUnsafe(int8_t signum, StandardPlural::Form plural, - NumberStringBuilder& outString, UErrorCode& status) { +int32_t NumberFormatterImpl::getPrefixSuffixUnsafe(Signum signum, StandardPlural::Form plural, + FormattedStringBuilder& outString, UErrorCode& status) { if (U_FAILURE(status)) { return 0; } // #13453: DecimalFormat wants the affixes from the pattern only (modMiddle, aka pattern modifier). // Unsafe path: use fPatternModifier. @@ -215,7 +215,12 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, if (macros.symbols.isDecimalFormatSymbols()) { fMicros.symbols = macros.symbols.getDecimalFormatSymbols(); } else { - fMicros.symbols = new DecimalFormatSymbols(macros.locale, *ns, status); + auto newSymbols = new DecimalFormatSymbols(macros.locale, *ns, status); + if (newSymbols == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } + fMicros.symbols = newSymbols; // Give ownership to the NumberFormatterImpl. fSymbols.adoptInstead(fMicros.symbols); } @@ -229,7 +234,11 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, if (info.exists) { pattern = info.pattern; // It's clunky to clone an object here, but this code is not frequently executed. - auto* symbols = new DecimalFormatSymbols(*fMicros.symbols); + auto symbols = new DecimalFormatSymbols(*fMicros.symbols); + if (symbols == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } fMicros.symbols = symbols; fSymbols.adoptInstead(symbols); symbols->setSymbol( @@ -260,6 +269,10 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, pattern = utils::getPatternForStyle(macros.locale, nsName, patternStyle, status); } auto patternInfo = new ParsedPatternInfo(); + if (patternInfo == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } fPatternInfo.adoptInstead(patternInfo); PatternParser::parseToPatternInfo(UnicodeString(pattern), *patternInfo, status); @@ -337,7 +350,12 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, // Inner modifier (scientific notation) if (macros.notation.fType == Notation::NTN_SCIENTIFIC) { - fScientificHandler.adoptInstead(new ScientificHandler(¯os.notation, fMicros.symbols, chain)); + auto newScientificHandler = new ScientificHandler(¯os.notation, fMicros.symbols, chain); + if (newScientificHandler == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } + fScientificHandler.adoptInstead(newScientificHandler); chain = fScientificHandler.getAlias(); } else { // No inner modifier required @@ -346,6 +364,10 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, // Middle modifier (patterns, positive/negative, currency symbols, percent) auto patternModifier = new MutablePatternModifier(false); + if (patternModifier == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } fPatternModifier.adoptInstead(patternModifier); patternModifier->setPatternInfo( macros.affixProvider != nullptr ? macros.affixProvider @@ -401,16 +423,20 @@ NumberFormatterImpl::macrosToMicroGenerator(const MacroProps& macros, bool safe, if (macros.notation.fType == Notation::NTN_COMPACT) { CompactType compactType = (isCurrency && unitWidth != UNUM_UNIT_WIDTH_FULL_NAME) ? CompactType::TYPE_CURRENCY : CompactType::TYPE_DECIMAL; - fCompactHandler.adoptInstead( - new CompactHandler( - macros.notation.fUnion.compactStyle, - macros.locale, - nsName, - compactType, - resolvePluralRules(macros.rules, macros.locale, status), - safe ? patternModifier : nullptr, - chain, - status)); + auto newCompactHandler = new CompactHandler( + macros.notation.fUnion.compactStyle, + macros.locale, + nsName, + compactType, + resolvePluralRules(macros.rules, macros.locale, status), + safe ? patternModifier : nullptr, + chain, + status); + if (newCompactHandler == nullptr) { + status = U_MEMORY_ALLOCATION_ERROR; + return nullptr; + } + fCompactHandler.adoptInstead(newCompactHandler); chain = fCompactHandler.getAlias(); } @@ -430,7 +456,7 @@ NumberFormatterImpl::resolvePluralRules(const PluralRules* rulesPtr, const Local return fRules.getAlias(); } -int32_t NumberFormatterImpl::writeAffixes(const MicroProps& micros, NumberStringBuilder& string, +int32_t NumberFormatterImpl::writeAffixes(const MicroProps& micros, FormattedStringBuilder& string, int32_t start, int32_t end, UErrorCode& status) { // Always apply the inner modifier (which is "strong"). int32_t length = micros.modInner->apply(string, start, end, status); @@ -445,7 +471,7 @@ int32_t NumberFormatterImpl::writeAffixes(const MicroProps& micros, NumberString } int32_t NumberFormatterImpl::writeNumber(const MicroProps& micros, DecimalQuantity& quantity, - NumberStringBuilder& string, int32_t index, + FormattedStringBuilder& string, int32_t index, UErrorCode& status) { int32_t length = 0; if (quantity.isInfinite()) { @@ -487,7 +513,7 @@ int32_t NumberFormatterImpl::writeNumber(const MicroProps& micros, DecimalQuanti } int32_t NumberFormatterImpl::writeIntegerDigits(const MicroProps& micros, DecimalQuantity& quantity, - NumberStringBuilder& string, int32_t index, + FormattedStringBuilder& string, int32_t index, UErrorCode& status) { int length = 0; int integerCount = quantity.getUpperDisplayMagnitude() + 1; @@ -513,7 +539,7 @@ int32_t NumberFormatterImpl::writeIntegerDigits(const MicroProps& micros, Decima } int32_t NumberFormatterImpl::writeFractionDigits(const MicroProps& micros, DecimalQuantity& quantity, - NumberStringBuilder& string, int32_t index, + FormattedStringBuilder& string, int32_t index, UErrorCode& status) { int length = 0; int fractionCount = -quantity.getLowerDisplayMagnitude(); diff --git a/deps/icu-small/source/i18n/number_formatimpl.h b/deps/icu-small/source/i18n/number_formatimpl.h index fd8708c532e131..206c5f58c576a1 100644 --- a/deps/icu-small/source/i18n/number_formatimpl.h +++ b/deps/icu-small/source/i18n/number_formatimpl.h @@ -8,7 +8,7 @@ #define __NUMBER_FORMATIMPL_H__ #include "number_types.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "number_patternstring.h" #include "number_utils.h" #include "number_patternmodifier.h" @@ -35,7 +35,7 @@ class NumberFormatterImpl : public UMemory { * Builds and evaluates an "unsafe" MicroPropsGenerator, which is cheaper but can be used only once. */ static int32_t - formatStatic(const MacroProps ¯os, DecimalQuantity &inValue, NumberStringBuilder &outString, + formatStatic(const MacroProps ¯os, DecimalQuantity &inValue, FormattedStringBuilder &outString, UErrorCode &status); /** @@ -44,14 +44,14 @@ class NumberFormatterImpl : public UMemory { * @return The index into the output at which the prefix ends and the suffix starts; in other words, * the prefix length. */ - static int32_t getPrefixSuffixStatic(const MacroProps& macros, int8_t signum, - StandardPlural::Form plural, NumberStringBuilder& outString, + static int32_t getPrefixSuffixStatic(const MacroProps& macros, Signum signum, + StandardPlural::Form plural, FormattedStringBuilder& outString, UErrorCode& status); /** * Evaluates the "safe" MicroPropsGenerator created by "fromMacros". */ - int32_t format(DecimalQuantity& inValue, NumberStringBuilder& outString, UErrorCode& status) const; + int32_t format(DecimalQuantity& inValue, FormattedStringBuilder& outString, UErrorCode& status) const; /** * Like format(), but saves the result into an output MicroProps without additional processing. @@ -61,7 +61,7 @@ class NumberFormatterImpl : public UMemory { /** * Like getPrefixSuffixStatic() but uses the safe compiled object. */ - int32_t getPrefixSuffix(int8_t signum, StandardPlural::Form plural, NumberStringBuilder& outString, + int32_t getPrefixSuffix(Signum signum, StandardPlural::Form plural, FormattedStringBuilder& outString, UErrorCode& status) const; const MicroProps& getRawMicroProps() const { @@ -73,12 +73,12 @@ class NumberFormatterImpl : public UMemory { * This method formats only the main number, not affixes. */ static int32_t writeNumber(const MicroProps& micros, DecimalQuantity& quantity, - NumberStringBuilder& string, int32_t index, UErrorCode& status); + FormattedStringBuilder& string, int32_t index, UErrorCode& status); /** * Adds the affixes. Intended to be called immediately after formatNumber. */ - static int32_t writeAffixes(const MicroProps& micros, NumberStringBuilder& string, int32_t start, + static int32_t writeAffixes(const MicroProps& micros, FormattedStringBuilder& string, int32_t start, int32_t end, UErrorCode& status); private: @@ -109,8 +109,8 @@ class NumberFormatterImpl : public UMemory { MicroProps& preProcessUnsafe(DecimalQuantity &inValue, UErrorCode &status); - int32_t getPrefixSuffixUnsafe(int8_t signum, StandardPlural::Form plural, - NumberStringBuilder& outString, UErrorCode& status); + int32_t getPrefixSuffixUnsafe(Signum signum, StandardPlural::Form plural, + FormattedStringBuilder& outString, UErrorCode& status); /** * If rulesPtr is non-null, return it. Otherwise, return a PluralRules owned by this object for the @@ -136,11 +136,11 @@ class NumberFormatterImpl : public UMemory { macrosToMicroGenerator(const MacroProps ¯os, bool safe, UErrorCode &status); static int32_t - writeIntegerDigits(const MicroProps µs, DecimalQuantity &quantity, NumberStringBuilder &string, + writeIntegerDigits(const MicroProps µs, DecimalQuantity &quantity, FormattedStringBuilder &string, int32_t index, UErrorCode &status); static int32_t - writeFractionDigits(const MicroProps µs, DecimalQuantity &quantity, NumberStringBuilder &string, + writeFractionDigits(const MicroProps µs, DecimalQuantity &quantity, FormattedStringBuilder &string, int32_t index, UErrorCode &status); }; diff --git a/deps/icu-small/source/i18n/number_longnames.cpp b/deps/icu-small/source/i18n/number_longnames.cpp index 0cd160042a46d3..817aa0e0d9c39d 100644 --- a/deps/icu-small/source/i18n/number_longnames.cpp +++ b/deps/icu-small/source/i18n/number_longnames.cpp @@ -148,12 +148,11 @@ void getCurrencyLongNameData(const Locale &locale, const CurrencyUnit ¤cy, if (pattern.isBogus()) { continue; } - UBool isChoiceFormat = FALSE; int32_t longNameLen = 0; const char16_t *longName = ucurr_getPluralName( currency.getISOCurrency(), locale.getName(), - &isChoiceFormat, + nullptr /* isChoiceFormat */, StandardPlural::getKeyword(static_cast(i)), &longNameLen, &status); @@ -265,6 +264,26 @@ UnicodeString LongNameHandler::getUnitDisplayName( return simpleFormats[DNAM_INDEX]; } +UnicodeString LongNameHandler::getUnitPattern( + const Locale& loc, + const MeasureUnit& unit, + UNumberUnitWidth width, + StandardPlural::Form pluralForm, + UErrorCode& status) { + if (U_FAILURE(status)) { + return ICU_Utility::makeBogusString(); + } + UnicodeString simpleFormats[ARRAY_LENGTH]; + getMeasureData(loc, unit, width, simpleFormats, status); + // The above already handles fallback from other widths to short + if (U_FAILURE(status)) { + return ICU_Utility::makeBogusString(); + } + // Now handle fallback from other plural forms to OTHER + return (!(simpleFormats[pluralForm]).isBogus())? simpleFormats[pluralForm]: + simpleFormats[StandardPlural::Form::OTHER]; +} + LongNameHandler* LongNameHandler::forCurrencyLongNames(const Locale &loc, const CurrencyUnit ¤cy, const PluralRules *rules, const MicroPropsGenerator *parent, @@ -289,7 +308,7 @@ void LongNameHandler::simpleFormatsToModifiers(const UnicodeString *simpleFormat if (U_FAILURE(status)) { return; } SimpleFormatter compiledFormatter(simpleFormat, 0, 1, status); if (U_FAILURE(status)) { return; } - fModifiers[i] = SimpleModifier(compiledFormatter, field, false, {this, 0, plural}); + fModifiers[i] = SimpleModifier(compiledFormatter, field, false, {this, SIGNUM_ZERO, plural}); } } @@ -306,7 +325,7 @@ void LongNameHandler::multiSimpleFormatsToModifiers(const UnicodeString *leadFor if (U_FAILURE(status)) { return; } SimpleFormatter compoundCompiled(compoundFormat, 0, 1, status); if (U_FAILURE(status)) { return; } - fModifiers[i] = SimpleModifier(compoundCompiled, field, false, {this, 0, plural}); + fModifiers[i] = SimpleModifier(compoundCompiled, field, false, {this, SIGNUM_ZERO, plural}); } } @@ -317,7 +336,7 @@ void LongNameHandler::processQuantity(DecimalQuantity &quantity, MicroProps &mic micros.modOuter = &fModifiers[pluralForm]; } -const Modifier* LongNameHandler::getModifier(int8_t /*signum*/, StandardPlural::Form plural) const { +const Modifier* LongNameHandler::getModifier(Signum /*signum*/, StandardPlural::Form plural) const { return &fModifiers[plural]; } diff --git a/deps/icu-small/source/i18n/number_longnames.h b/deps/icu-small/source/i18n/number_longnames.h index 76fb82d744b6d4..a19425aa268af6 100644 --- a/deps/icu-small/source/i18n/number_longnames.h +++ b/deps/icu-small/source/i18n/number_longnames.h @@ -22,6 +22,13 @@ class LongNameHandler : public MicroPropsGenerator, public ModifierStore, public UNumberUnitWidth width, UErrorCode& status); + static UnicodeString getUnitPattern( + const Locale& loc, + const MeasureUnit& unit, + UNumberUnitWidth width, + StandardPlural::Form pluralForm, + UErrorCode& status); + static LongNameHandler* forCurrencyLongNames(const Locale &loc, const CurrencyUnit ¤cy, const PluralRules *rules, const MicroPropsGenerator *parent, UErrorCode &status); @@ -34,7 +41,7 @@ class LongNameHandler : public MicroPropsGenerator, public ModifierStore, public void processQuantity(DecimalQuantity &quantity, MicroProps µs, UErrorCode &status) const U_OVERRIDE; - const Modifier* getModifier(int8_t signum, StandardPlural::Form plural) const U_OVERRIDE; + const Modifier* getModifier(Signum signum, StandardPlural::Form plural) const U_OVERRIDE; private: SimpleModifier fModifiers[StandardPlural::Form::COUNT]; diff --git a/deps/icu-small/source/i18n/number_mapper.h b/deps/icu-small/source/i18n/number_mapper.h index d28e9cec393a05..de7d9c3865c8df 100644 --- a/deps/icu-small/source/i18n/number_mapper.h +++ b/deps/icu-small/source/i18n/number_mapper.h @@ -126,8 +126,14 @@ struct DecimalFormatWarehouse { * TODO: Make some of these fields by value instead of by LocalPointer? */ struct DecimalFormatFields : public UMemory { + + DecimalFormatFields() {} + + DecimalFormatFields(const DecimalFormatProperties& propsToCopy) + : properties(propsToCopy) {} + /** The property bag corresponding to user-specified settings and settings from the pattern string. */ - LocalPointer properties; + DecimalFormatProperties properties; /** The symbols for the current locale. */ LocalPointer symbols; @@ -136,7 +142,7 @@ struct DecimalFormatFields : public UMemory { * The pre-computed formatter object. Setters cause this to be re-computed atomically. The {@link * #format} method uses the formatter directly without needing to synchronize. */ - LocalPointer formatter; + LocalizedNumberFormatter formatter; /** The lazy-computed parser for .parse() */ std::atomic<::icu::numparse::impl::NumberParserImpl*> atomicParser = {}; @@ -148,7 +154,7 @@ struct DecimalFormatFields : public UMemory { DecimalFormatWarehouse warehouse; /** The effective properties as exported from the formatter object. Used by some getters. */ - LocalPointer exportedProperties; + DecimalFormatProperties exportedProperties; // Data for fastpath bool canUseFastFormat = false; diff --git a/deps/icu-small/source/i18n/number_modifiers.cpp b/deps/icu-small/source/i18n/number_modifiers.cpp index 1fcbe7b9b79301..3a44f8f6f15328 100644 --- a/deps/icu-small/source/i18n/number_modifiers.cpp +++ b/deps/icu-small/source/i18n/number_modifiers.cpp @@ -57,7 +57,7 @@ Modifier::Parameters::Parameters() : obj(nullptr) {} Modifier::Parameters::Parameters( - const ModifierStore* _obj, int8_t _signum, StandardPlural::Form _plural) + const ModifierStore* _obj, Signum _signum, StandardPlural::Form _plural) : obj(_obj), signum(_signum), plural(_plural) {} ModifierStore::~ModifierStore() = default; @@ -69,7 +69,7 @@ AdoptingModifierStore::~AdoptingModifierStore() { } -int32_t ConstantAffixModifier::apply(NumberStringBuilder &output, int leftIndex, int rightIndex, +int32_t ConstantAffixModifier::apply(FormattedStringBuilder &output, int leftIndex, int rightIndex, UErrorCode &status) const { // Insert the suffix first since inserting the prefix will change the rightIndex int length = output.insert(rightIndex, fSuffix, fField, status); @@ -154,7 +154,7 @@ SimpleModifier::SimpleModifier() : fField(UNUM_FIELD_COUNT), fStrong(false), fPrefixLength(0), fSuffixLength(0) { } -int32_t SimpleModifier::apply(NumberStringBuilder &output, int leftIndex, int rightIndex, +int32_t SimpleModifier::apply(FormattedStringBuilder &output, int leftIndex, int rightIndex, UErrorCode &status) const { return formatAsPrefixSuffix(output, leftIndex, rightIndex, status); } @@ -203,7 +203,7 @@ bool SimpleModifier::semanticallyEquivalent(const Modifier& other) const { int32_t -SimpleModifier::formatAsPrefixSuffix(NumberStringBuilder &result, int32_t startIndex, int32_t endIndex, +SimpleModifier::formatAsPrefixSuffix(FormattedStringBuilder &result, int32_t startIndex, int32_t endIndex, UErrorCode &status) const { if (fSuffixOffset == -1 && fPrefixLength + fSuffixLength > 0) { // There is no argument for the inner number; overwrite the entire segment with our string. @@ -227,7 +227,7 @@ SimpleModifier::formatAsPrefixSuffix(NumberStringBuilder &result, int32_t startI int32_t -SimpleModifier::formatTwoArgPattern(const SimpleFormatter& compiled, NumberStringBuilder& result, +SimpleModifier::formatTwoArgPattern(const SimpleFormatter& compiled, FormattedStringBuilder& result, int32_t index, int32_t* outPrefixLength, int32_t* outSuffixLength, Field field, UErrorCode& status) { const UnicodeString& compiledPattern = compiled.compiledPattern; @@ -284,7 +284,7 @@ SimpleModifier::formatTwoArgPattern(const SimpleFormatter& compiled, NumberStrin } -int32_t ConstantMultiFieldModifier::apply(NumberStringBuilder &output, int leftIndex, int rightIndex, +int32_t ConstantMultiFieldModifier::apply(FormattedStringBuilder &output, int leftIndex, int rightIndex, UErrorCode &status) const { int32_t length = output.insert(leftIndex, fPrefix, status); if (fOverwrite) { @@ -333,8 +333,8 @@ bool ConstantMultiFieldModifier::semanticallyEquivalent(const Modifier& other) c } -CurrencySpacingEnabledModifier::CurrencySpacingEnabledModifier(const NumberStringBuilder &prefix, - const NumberStringBuilder &suffix, +CurrencySpacingEnabledModifier::CurrencySpacingEnabledModifier(const FormattedStringBuilder &prefix, + const FormattedStringBuilder &suffix, bool overwrite, bool strong, const DecimalFormatSymbols &symbols, @@ -374,7 +374,7 @@ CurrencySpacingEnabledModifier::CurrencySpacingEnabledModifier(const NumberStrin } } -int32_t CurrencySpacingEnabledModifier::apply(NumberStringBuilder &output, int leftIndex, int rightIndex, +int32_t CurrencySpacingEnabledModifier::apply(FormattedStringBuilder &output, int leftIndex, int rightIndex, UErrorCode &status) const { // Currency spacing logic int length = 0; @@ -395,7 +395,7 @@ int32_t CurrencySpacingEnabledModifier::apply(NumberStringBuilder &output, int l } int32_t -CurrencySpacingEnabledModifier::applyCurrencySpacing(NumberStringBuilder &output, int32_t prefixStart, +CurrencySpacingEnabledModifier::applyCurrencySpacing(FormattedStringBuilder &output, int32_t prefixStart, int32_t prefixLen, int32_t suffixStart, int32_t suffixLen, const DecimalFormatSymbols &symbols, @@ -414,7 +414,7 @@ CurrencySpacingEnabledModifier::applyCurrencySpacing(NumberStringBuilder &output } int32_t -CurrencySpacingEnabledModifier::applyCurrencySpacingAffix(NumberStringBuilder &output, int32_t index, +CurrencySpacingEnabledModifier::applyCurrencySpacingAffix(FormattedStringBuilder &output, int32_t index, EAffix affix, const DecimalFormatSymbols &symbols, UErrorCode &status) { diff --git a/deps/icu-small/source/i18n/number_modifiers.h b/deps/icu-small/source/i18n/number_modifiers.h index 495128bb149dcf..c84c6aa273ed76 100644 --- a/deps/icu-small/source/i18n/number_modifiers.h +++ b/deps/icu-small/source/i18n/number_modifiers.h @@ -12,7 +12,7 @@ #include "unicode/uniset.h" #include "unicode/simpleformatter.h" #include "standardplural.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "number_types.h" U_NAMESPACE_BEGIN namespace number { @@ -28,7 +28,7 @@ class U_I18N_API ConstantAffixModifier : public Modifier, public UObject { bool strong) : fPrefix(prefix), fSuffix(suffix), fField(field), fStrong(strong) {} - int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex, + int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const U_OVERRIDE; int32_t getPrefixLength() const U_OVERRIDE; @@ -64,7 +64,7 @@ class U_I18N_API SimpleModifier : public Modifier, public UMemory { // Default constructor for LongNameHandler.h SimpleModifier(); - int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex, + int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const U_OVERRIDE; int32_t getPrefixLength() const U_OVERRIDE; @@ -81,7 +81,7 @@ class U_I18N_API SimpleModifier : public Modifier, public UMemory { /** * TODO: This belongs in SimpleFormatterImpl. The only reason I haven't moved it there yet is because - * NumberStringBuilder is an internal class and SimpleFormatterImpl feels like it should not depend on it. + * FormattedStringBuilder is an internal class and SimpleFormatterImpl feels like it should not depend on it. * *

* Formats a value that is already stored inside the StringBuilder result between the indices @@ -100,22 +100,22 @@ class U_I18N_API SimpleModifier : public Modifier, public UMemory { * @return The number of characters (UTF-16 code points) that were added to the StringBuilder. */ int32_t - formatAsPrefixSuffix(NumberStringBuilder& result, int32_t startIndex, int32_t endIndex, + formatAsPrefixSuffix(FormattedStringBuilder& result, int32_t startIndex, int32_t endIndex, UErrorCode& status) const; /** * TODO: Like above, this belongs with the rest of the SimpleFormatterImpl code. - * I put it here so that the SimpleFormatter uses in NumberStringBuilder are near each other. + * I put it here so that the SimpleFormatter uses in FormattedStringBuilder are near each other. * *

- * Applies the compiled two-argument pattern to the NumberStringBuilder. + * Applies the compiled two-argument pattern to the FormattedStringBuilder. * *

* This method is optimized for the case where the prefix and suffix are often empty, such as * in the range pattern like "{0}-{1}". */ static int32_t - formatTwoArgPattern(const SimpleFormatter& compiled, NumberStringBuilder& result, + formatTwoArgPattern(const SimpleFormatter& compiled, FormattedStringBuilder& result, int32_t index, int32_t* outPrefixLength, int32_t* outSuffixLength, Field field, UErrorCode& status); @@ -131,13 +131,13 @@ class U_I18N_API SimpleModifier : public Modifier, public UMemory { /** * An implementation of {@link Modifier} that allows for multiple types of fields in the same modifier. Constructed - * based on the contents of two {@link NumberStringBuilder} instances (one for the prefix, one for the suffix). + * based on the contents of two {@link FormattedStringBuilder} instances (one for the prefix, one for the suffix). */ class U_I18N_API ConstantMultiFieldModifier : public Modifier, public UMemory { public: ConstantMultiFieldModifier( - const NumberStringBuilder &prefix, - const NumberStringBuilder &suffix, + const FormattedStringBuilder &prefix, + const FormattedStringBuilder &suffix, bool overwrite, bool strong, const Modifier::Parameters parameters) @@ -148,8 +148,8 @@ class U_I18N_API ConstantMultiFieldModifier : public Modifier, public UMemory { fParameters(parameters) {} ConstantMultiFieldModifier( - const NumberStringBuilder &prefix, - const NumberStringBuilder &suffix, + const FormattedStringBuilder &prefix, + const FormattedStringBuilder &suffix, bool overwrite, bool strong) : fPrefix(prefix), @@ -157,7 +157,7 @@ class U_I18N_API ConstantMultiFieldModifier : public Modifier, public UMemory { fOverwrite(overwrite), fStrong(strong) {} - int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex, + int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const U_OVERRIDE; int32_t getPrefixLength() const U_OVERRIDE; @@ -173,10 +173,10 @@ class U_I18N_API ConstantMultiFieldModifier : public Modifier, public UMemory { bool semanticallyEquivalent(const Modifier& other) const U_OVERRIDE; protected: - // NOTE: In Java, these are stored as array pointers. In C++, the NumberStringBuilder is stored by + // NOTE: In Java, these are stored as array pointers. In C++, the FormattedStringBuilder is stored by // value and is treated internally as immutable. - NumberStringBuilder fPrefix; - NumberStringBuilder fSuffix; + FormattedStringBuilder fPrefix; + FormattedStringBuilder fSuffix; bool fOverwrite; bool fStrong; Modifier::Parameters fParameters; @@ -187,19 +187,19 @@ class U_I18N_API CurrencySpacingEnabledModifier : public ConstantMultiFieldModif public: /** Safe code path */ CurrencySpacingEnabledModifier( - const NumberStringBuilder &prefix, - const NumberStringBuilder &suffix, + const FormattedStringBuilder &prefix, + const FormattedStringBuilder &suffix, bool overwrite, bool strong, const DecimalFormatSymbols &symbols, UErrorCode &status); - int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex, + int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const U_OVERRIDE; /** Unsafe code path */ static int32_t - applyCurrencySpacing(NumberStringBuilder &output, int32_t prefixStart, int32_t prefixLen, + applyCurrencySpacing(FormattedStringBuilder &output, int32_t prefixStart, int32_t prefixLen, int32_t suffixStart, int32_t suffixLen, const DecimalFormatSymbols &symbols, UErrorCode &status); @@ -218,7 +218,7 @@ class U_I18N_API CurrencySpacingEnabledModifier : public ConstantMultiFieldModif }; /** Unsafe code path */ - static int32_t applyCurrencySpacingAffix(NumberStringBuilder &output, int32_t index, EAffix affix, + static int32_t applyCurrencySpacingAffix(FormattedStringBuilder &output, int32_t index, EAffix affix, const DecimalFormatSymbols &symbols, UErrorCode &status); static UnicodeSet @@ -234,7 +234,7 @@ class U_I18N_API EmptyModifier : public Modifier, public UMemory { public: explicit EmptyModifier(bool isStrong) : fStrong(isStrong) {} - int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex, + int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const U_OVERRIDE { (void)output; (void)leftIndex; @@ -289,7 +289,7 @@ class U_I18N_API AdoptingModifierStore : public ModifierStore, public UMemory { /** * Sets the Modifier with the specified signum and plural form. */ - void adoptModifier(int8_t signum, StandardPlural::Form plural, const Modifier *mod) { + void adoptModifier(Signum signum, StandardPlural::Form plural, const Modifier *mod) { U_ASSERT(mods[getModIndex(signum, plural)] == nullptr); mods[getModIndex(signum, plural)] = mod; } @@ -298,13 +298,13 @@ class U_I18N_API AdoptingModifierStore : public ModifierStore, public UMemory { * Sets the Modifier with the specified signum. * The modifier will apply to all plural forms. */ - void adoptModifierWithoutPlural(int8_t signum, const Modifier *mod) { + void adoptModifierWithoutPlural(Signum signum, const Modifier *mod) { U_ASSERT(mods[getModIndex(signum, DEFAULT_STANDARD_PLURAL)] == nullptr); mods[getModIndex(signum, DEFAULT_STANDARD_PLURAL)] = mod; } /** Returns a reference to the modifier; no ownership change. */ - const Modifier *getModifier(int8_t signum, StandardPlural::Form plural) const U_OVERRIDE { + const Modifier *getModifier(Signum signum, StandardPlural::Form plural) const U_OVERRIDE { const Modifier* modifier = mods[getModIndex(signum, plural)]; if (modifier == nullptr && plural != DEFAULT_STANDARD_PLURAL) { modifier = mods[getModIndex(signum, DEFAULT_STANDARD_PLURAL)]; @@ -313,7 +313,7 @@ class U_I18N_API AdoptingModifierStore : public ModifierStore, public UMemory { } /** Returns a reference to the modifier; no ownership change. */ - const Modifier *getModifierWithoutPlural(int8_t signum) const { + const Modifier *getModifierWithoutPlural(Signum signum) const { return mods[getModIndex(signum, DEFAULT_STANDARD_PLURAL)]; } @@ -321,7 +321,7 @@ class U_I18N_API AdoptingModifierStore : public ModifierStore, public UMemory { // NOTE: mods is zero-initialized (to nullptr) const Modifier *mods[3 * StandardPlural::COUNT] = {}; - inline static int32_t getModIndex(int8_t signum, StandardPlural::Form plural) { + inline static int32_t getModIndex(Signum signum, StandardPlural::Form plural) { U_ASSERT(signum >= -1 && signum <= 1); U_ASSERT(plural >= 0 && plural < StandardPlural::COUNT); return static_cast(plural) * 3 + (signum + 1); diff --git a/deps/icu-small/source/i18n/number_output.cpp b/deps/icu-small/source/i18n/number_output.cpp index 6f4e2482044f14..e2f069139a4b47 100644 --- a/deps/icu-small/source/i18n/number_output.cpp +++ b/deps/icu-small/source/i18n/number_output.cpp @@ -9,6 +9,7 @@ #include "number_utypes.h" #include "util.h" #include "number_decimalquantity.h" +#include "number_decnum.h" U_NAMESPACE_BEGIN namespace number { @@ -20,8 +21,7 @@ UPRV_FORMATTED_VALUE_SUBCLASS_AUTO_IMPL(FormattedNumber) UBool FormattedNumber::nextFieldPosition(FieldPosition& fieldPosition, UErrorCode& status) const { UPRV_FORMATTED_VALUE_METHOD_GUARD(FALSE) - // NOTE: MSVC sometimes complains when implicitly converting between bool and UBool - return fData->getStringRef().nextFieldPosition(fieldPosition, status) ? TRUE : FALSE; + return fData->nextFieldPosition(fieldPosition, status); } void FormattedNumber::getAllFieldPositions(FieldPositionIterator& iterator, UErrorCode& status) const { @@ -29,10 +29,17 @@ void FormattedNumber::getAllFieldPositions(FieldPositionIterator& iterator, UErr getAllFieldPositionsImpl(fpih, status); } +void FormattedNumber::toDecimalNumber(ByteSink& sink, UErrorCode& status) const { + UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG) + impl::DecNum decnum; + fData->quantity.toDecNum(decnum, status); + decnum.toString(sink, status); +} + void FormattedNumber::getAllFieldPositionsImpl(FieldPositionIteratorHandler& fpih, UErrorCode& status) const { UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG) - fData->getStringRef().getAllFieldPositions(fpih, status); + fData->getAllFieldPositions(fpih, status); } void FormattedNumber::getDecimalQuantity(impl::DecimalQuantity& output, UErrorCode& status) const { diff --git a/deps/icu-small/source/i18n/number_padding.cpp b/deps/icu-small/source/i18n/number_padding.cpp index 31684d7208b606..c68a9875b2055f 100644 --- a/deps/icu-small/source/i18n/number_padding.cpp +++ b/deps/icu-small/source/i18n/number_padding.cpp @@ -7,7 +7,7 @@ #include "unicode/numberformatter.h" #include "number_types.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "number_decimfmtprops.h" using namespace icu; @@ -17,7 +17,7 @@ using namespace icu::number::impl; namespace { int32_t -addPaddingHelper(UChar32 paddingCp, int32_t requiredPadding, NumberStringBuilder &string, int32_t index, +addPaddingHelper(UChar32 paddingCp, int32_t requiredPadding, FormattedStringBuilder &string, int32_t index, UErrorCode &status) { for (int32_t i = 0; i < requiredPadding; i++) { // TODO: If appending to the end, this will cause actual insertion operations. Improve. @@ -60,7 +60,7 @@ Padder Padder::forProperties(const DecimalFormatProperties& properties) { } int32_t Padder::padAndApply(const Modifier &mod1, const Modifier &mod2, - NumberStringBuilder &string, int32_t leftIndex, int32_t rightIndex, + FormattedStringBuilder &string, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const { int32_t modLength = mod1.getCodePointCount() + mod2.getCodePointCount(); int32_t requiredPadding = fWidth - modLength - string.codePointCount(); diff --git a/deps/icu-small/source/i18n/number_patternmodifier.cpp b/deps/icu-small/source/i18n/number_patternmodifier.cpp index 75de439f3ed2e1..724f5b9741cc52 100644 --- a/deps/icu-small/source/i18n/number_patternmodifier.cpp +++ b/deps/icu-small/source/i18n/number_patternmodifier.cpp @@ -43,7 +43,7 @@ void MutablePatternModifier::setSymbols(const DecimalFormatSymbols* symbols, fRules = rules; } -void MutablePatternModifier::setNumberProperties(int8_t signum, StandardPlural::Form plural) { +void MutablePatternModifier::setNumberProperties(Signum signum, StandardPlural::Form plural) { fSignum = signum; fPlural = plural; } @@ -79,12 +79,12 @@ MutablePatternModifier::createImmutableAndChain(const MicroPropsGenerator* paren if (needsPlurals()) { // Slower path when we require the plural keyword. for (StandardPlural::Form plural : STANDARD_PLURAL_VALUES) { - setNumberProperties(1, plural); - pm->adoptModifier(1, plural, createConstantModifier(status)); - setNumberProperties(0, plural); - pm->adoptModifier(0, plural, createConstantModifier(status)); - setNumberProperties(-1, plural); - pm->adoptModifier(-1, plural, createConstantModifier(status)); + setNumberProperties(SIGNUM_POS, plural); + pm->adoptModifier(SIGNUM_POS, plural, createConstantModifier(status)); + setNumberProperties(SIGNUM_ZERO, plural); + pm->adoptModifier(SIGNUM_ZERO, plural, createConstantModifier(status)); + setNumberProperties(SIGNUM_NEG, plural); + pm->adoptModifier(SIGNUM_NEG, plural, createConstantModifier(status)); } if (U_FAILURE(status)) { delete pm; @@ -93,12 +93,12 @@ MutablePatternModifier::createImmutableAndChain(const MicroPropsGenerator* paren return new ImmutablePatternModifier(pm, fRules, parent); // adopts pm } else { // Faster path when plural keyword is not needed. - setNumberProperties(1, StandardPlural::Form::COUNT); - pm->adoptModifierWithoutPlural(1, createConstantModifier(status)); - setNumberProperties(0, StandardPlural::Form::COUNT); - pm->adoptModifierWithoutPlural(0, createConstantModifier(status)); - setNumberProperties(-1, StandardPlural::Form::COUNT); - pm->adoptModifierWithoutPlural(-1, createConstantModifier(status)); + setNumberProperties(SIGNUM_POS, StandardPlural::Form::COUNT); + pm->adoptModifierWithoutPlural(SIGNUM_POS, createConstantModifier(status)); + setNumberProperties(SIGNUM_ZERO, StandardPlural::Form::COUNT); + pm->adoptModifierWithoutPlural(SIGNUM_ZERO, createConstantModifier(status)); + setNumberProperties(SIGNUM_NEG, StandardPlural::Form::COUNT); + pm->adoptModifierWithoutPlural(SIGNUM_NEG, createConstantModifier(status)); if (U_FAILURE(status)) { delete pm; return nullptr; @@ -108,8 +108,8 @@ MutablePatternModifier::createImmutableAndChain(const MicroPropsGenerator* paren } ConstantMultiFieldModifier* MutablePatternModifier::createConstantModifier(UErrorCode& status) { - NumberStringBuilder a; - NumberStringBuilder b; + FormattedStringBuilder a; + FormattedStringBuilder b; insertPrefix(a, 0, status); insertSuffix(b, 0, status); if (fPatternInfo->hasCurrencySign()) { @@ -140,7 +140,7 @@ void ImmutablePatternModifier::applyToMicros( } } -const Modifier* ImmutablePatternModifier::getModifier(int8_t signum, StandardPlural::Form plural) const { +const Modifier* ImmutablePatternModifier::getModifier(Signum signum, StandardPlural::Form plural) const { if (rules == nullptr) { return pm->getModifierWithoutPlural(signum); } else { @@ -170,7 +170,7 @@ void MutablePatternModifier::processQuantity(DecimalQuantity& fq, MicroProps& mi micros.modMiddle = this; } -int32_t MutablePatternModifier::apply(NumberStringBuilder& output, int32_t leftIndex, int32_t rightIndex, +int32_t MutablePatternModifier::apply(FormattedStringBuilder& output, int32_t leftIndex, int32_t rightIndex, UErrorCode& status) const { // The unsafe code path performs self-mutation, so we need a const_cast. // This method needs to be const because it overrides a const method in the parent class. @@ -248,13 +248,13 @@ bool MutablePatternModifier::semanticallyEquivalent(const Modifier& other) const UPRV_UNREACHABLE; } -int32_t MutablePatternModifier::insertPrefix(NumberStringBuilder& sb, int position, UErrorCode& status) { +int32_t MutablePatternModifier::insertPrefix(FormattedStringBuilder& sb, int position, UErrorCode& status) { prepareAffix(true); int32_t length = AffixUtils::unescape(currentAffix, sb, position, *this, fField, status); return length; } -int32_t MutablePatternModifier::insertSuffix(NumberStringBuilder& sb, int position, UErrorCode& status) { +int32_t MutablePatternModifier::insertSuffix(FormattedStringBuilder& sb, int position, UErrorCode& status) { prepareAffix(false); int32_t length = AffixUtils::unescape(currentAffix, sb, position, *this, fField, status); return length; diff --git a/deps/icu-small/source/i18n/number_patternmodifier.h b/deps/icu-small/source/i18n/number_patternmodifier.h index 27e293b64ce50f..b2c90e0af76354 100644 --- a/deps/icu-small/source/i18n/number_patternmodifier.h +++ b/deps/icu-small/source/i18n/number_patternmodifier.h @@ -48,7 +48,7 @@ class U_I18N_API ImmutablePatternModifier : public MicroPropsGenerator, public U void applyToMicros(MicroProps& micros, const DecimalQuantity& quantity, UErrorCode& status) const; - const Modifier* getModifier(int8_t signum, StandardPlural::Form plural) const; + const Modifier* getModifier(Signum signum, StandardPlural::Form plural) const; private: ImmutablePatternModifier(AdoptingModifierStore* pm, const PluralRules* rules, @@ -142,7 +142,7 @@ class U_I18N_API MutablePatternModifier * The plural form of the number, required only if the pattern contains the triple * currency sign, "¤¤¤" (and as indicated by {@link #needsPlurals()}). */ - void setNumberProperties(int8_t signum, StandardPlural::Form plural); + void setNumberProperties(Signum signum, StandardPlural::Form plural); /** * Returns true if the pattern represented by this MurkyModifier requires a plural keyword in order to localize. @@ -184,7 +184,7 @@ class U_I18N_API MutablePatternModifier void processQuantity(DecimalQuantity &, MicroProps µs, UErrorCode &status) const U_OVERRIDE; - int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex, + int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const U_OVERRIDE; int32_t getPrefixLength() const U_OVERRIDE; @@ -223,7 +223,7 @@ class U_I18N_API MutablePatternModifier const PluralRules *fRules; // Number details (initialized in setNumberProperties) - int8_t fSignum; + Signum fSignum; StandardPlural::Form fPlural; // QuantityChain details (initialized in addToChain) @@ -240,17 +240,17 @@ class U_I18N_API MutablePatternModifier * CREATES A NEW HEAP OBJECT; THE CALLER GETS OWNERSHIP. * * @param a - * A working NumberStringBuilder object; passed from the outside to prevent the need to create many new + * A working FormattedStringBuilder object; passed from the outside to prevent the need to create many new * instances if this method is called in a loop. * @param b - * Another working NumberStringBuilder object. + * Another working FormattedStringBuilder object. * @return The constant modifier object. */ ConstantMultiFieldModifier *createConstantModifier(UErrorCode &status); - int32_t insertPrefix(NumberStringBuilder &sb, int position, UErrorCode &status); + int32_t insertPrefix(FormattedStringBuilder &sb, int position, UErrorCode &status); - int32_t insertSuffix(NumberStringBuilder &sb, int position, UErrorCode &status); + int32_t insertSuffix(FormattedStringBuilder &sb, int position, UErrorCode &status); void prepareAffix(bool isPrefix); }; diff --git a/deps/icu-small/source/i18n/number_patternstring.cpp b/deps/icu-small/source/i18n/number_patternstring.cpp index 90754246633064..c7212c1e5c23fe 100644 --- a/deps/icu-small/source/i18n/number_patternstring.cpp +++ b/deps/icu-small/source/i18n/number_patternstring.cpp @@ -352,7 +352,7 @@ void ParsedPatternInfo::consumeIntegerFormat(UErrorCode& status) { result.groupingSizes += 1; result.integerNumerals += 1; result.integerTotal += 1; - if (!result.rounding.isZero() || state.peek() != u'0') { + if (!result.rounding.isZeroish() || state.peek() != u'0') { result.rounding.appendDigit(static_cast(state.peek() - u'0'), 0, true); } break; @@ -532,7 +532,7 @@ PatternParser::patternInfoToProperties(DecimalFormatProperties& properties, Pars properties.roundingIncrement = 0.0; properties.minimumSignificantDigits = positive.integerAtSigns; properties.maximumSignificantDigits = positive.integerAtSigns + positive.integerTrailingHashSigns; - } else if (!positive.rounding.isZero()) { + } else if (!positive.rounding.isZeroish()) { if (!ignoreRounding) { properties.minimumFractionDigits = minFrac; properties.maximumFractionDigits = positive.fractionTotal; @@ -1000,7 +1000,7 @@ PatternStringUtils::convertLocalized(const UnicodeString& input, const DecimalFo } void PatternStringUtils::patternInfoToStringBuilder(const AffixPatternProvider& patternInfo, bool isPrefix, - int8_t signum, UNumberSignDisplay signDisplay, + Signum signum, UNumberSignDisplay signDisplay, StandardPlural::Form plural, bool perMilleReplacesPercent, UnicodeString& output) { @@ -1014,6 +1014,7 @@ void PatternStringUtils::patternInfoToStringBuilder(const AffixPatternProvider& // Should we use the affix from the negative subpattern? (If not, we will use the positive // subpattern.) + // TODO: Deal with signum bool useNegativeAffixPattern = patternInfo.hasNegativeSubpattern() && ( signum == -1 || (patternInfo.negativeHasMinusSign() && plusReplacesMinusSign)); diff --git a/deps/icu-small/source/i18n/number_patternstring.h b/deps/icu-small/source/i18n/number_patternstring.h index 42e7c3916133d1..819c74d4bd886d 100644 --- a/deps/icu-small/source/i18n/number_patternstring.h +++ b/deps/icu-small/source/i18n/number_patternstring.h @@ -295,7 +295,7 @@ class U_I18N_API PatternStringUtils { * substitution, and plural forms for CurrencyPluralInfo. */ static void patternInfoToStringBuilder(const AffixPatternProvider& patternInfo, bool isPrefix, - int8_t signum, UNumberSignDisplay signDisplay, + Signum signum, UNumberSignDisplay signDisplay, StandardPlural::Form plural, bool perMilleReplacesPercent, UnicodeString& output); diff --git a/deps/icu-small/source/i18n/number_rounding.cpp b/deps/icu-small/source/i18n/number_rounding.cpp index 9e369f7925fe2f..813d4b680d497b 100644 --- a/deps/icu-small/source/i18n/number_rounding.cpp +++ b/deps/icu-small/source/i18n/number_rounding.cpp @@ -33,7 +33,7 @@ int32_t getRoundingMagnitudeSignificant(const DecimalQuantity &value, int maxSig if (maxSig == -1) { return INT32_MIN; } - int magnitude = value.isZero() ? 0 : value.getMagnitude(); + int magnitude = value.isZeroish() ? 0 : value.getMagnitude(); return magnitude - maxSig + 1; } @@ -45,7 +45,7 @@ int32_t getDisplayMagnitudeFraction(int minFrac) { } int32_t getDisplayMagnitudeSignificant(const DecimalQuantity &value, int minSig) { - int magnitude = value.isZero() ? 0 : value.getMagnitude(); + int magnitude = value.isZeroish() ? 0 : value.getMagnitude(); return magnitude - minSig + 1; } @@ -306,8 +306,8 @@ bool RoundingImpl::isSignificantDigits() const { int32_t RoundingImpl::chooseMultiplierAndApply(impl::DecimalQuantity &input, const impl::MultiplierProducer &producer, UErrorCode &status) { - // Do not call this method with zero. - U_ASSERT(!input.isZero()); + // Do not call this method with zero, NaN, or infinity. + U_ASSERT(!input.isZeroish()); // Perform the first attempt at rounding. int magnitude = input.getMagnitude(); @@ -316,7 +316,7 @@ RoundingImpl::chooseMultiplierAndApply(impl::DecimalQuantity &input, const impl: apply(input, status); // If the number rounded to zero, exit. - if (input.isZero() || U_FAILURE(status)) { + if (input.isZeroish() || U_FAILURE(status)) { return multiplier; } @@ -374,7 +374,7 @@ void RoundingImpl::apply(impl::DecimalQuantity &value, UErrorCode& status) const value.setMinFraction( uprv_max(0, -getDisplayMagnitudeSignificant(value, fPrecision.fUnion.fracSig.fMinSig))); // Make sure that digits are displayed on zero. - if (value.isZero() && fPrecision.fUnion.fracSig.fMinSig > 0) { + if (value.isZeroish() && fPrecision.fUnion.fracSig.fMinSig > 0) { value.setMinInteger(1); } break; @@ -436,7 +436,7 @@ void RoundingImpl::apply(impl::DecimalQuantity &value, UErrorCode& status) const void RoundingImpl::apply(impl::DecimalQuantity &value, int32_t minInt, UErrorCode /*status*/) { // This method is intended for the one specific purpose of helping print "00.000E0". U_ASSERT(isSignificantDigits()); - U_ASSERT(value.isZero()); + U_ASSERT(value.isZeroish()); value.setMinFraction(fPrecision.fUnion.fracSig.fMinSig - minInt); } diff --git a/deps/icu-small/source/i18n/number_scientific.cpp b/deps/icu-small/source/i18n/number_scientific.cpp index 6df07b9cc9e988..20aa45bff01959 100644 --- a/deps/icu-small/source/i18n/number_scientific.cpp +++ b/deps/icu-small/source/i18n/number_scientific.cpp @@ -8,7 +8,7 @@ #include #include "number_scientific.h" #include "number_utils.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "unicode/unum.h" #include "number_microprops.h" @@ -36,7 +36,7 @@ void ScientificModifier::set(int32_t exponent, const ScientificHandler *handler) fHandler = handler; } -int32_t ScientificModifier::apply(NumberStringBuilder &output, int32_t /*leftIndex*/, int32_t rightIndex, +int32_t ScientificModifier::apply(FormattedStringBuilder &output, int32_t /*leftIndex*/, int32_t rightIndex, UErrorCode &status) const { // FIXME: Localized exponent separator location. int i = rightIndex; @@ -123,9 +123,15 @@ void ScientificHandler::processQuantity(DecimalQuantity &quantity, MicroProps &m fParent->processQuantity(quantity, micros, status); if (U_FAILURE(status)) { return; } + // Do not apply scientific notation to special doubles + if (quantity.isInfinite() || quantity.isNaN()) { + micros.modInner = µs.helpers.emptyStrongModifier; + return; + } + // Treat zero as if it had magnitude 0 int32_t exponent; - if (quantity.isZero()) { + if (quantity.isZeroish()) { if (fSettings.fRequireMinInt && micros.rounder.isSignificantDigits()) { // Show "00.000E0" on pattern "00.000E0" micros.rounder.apply(quantity, fSettings.fEngineeringInterval, status); diff --git a/deps/icu-small/source/i18n/number_scientific.h b/deps/icu-small/source/i18n/number_scientific.h index e377bd941efaeb..1c9ce1efa80a3f 100644 --- a/deps/icu-small/source/i18n/number_scientific.h +++ b/deps/icu-small/source/i18n/number_scientific.h @@ -21,7 +21,7 @@ class U_I18N_API ScientificModifier : public UMemory, public Modifier { void set(int32_t exponent, const ScientificHandler *handler); - int32_t apply(NumberStringBuilder &output, int32_t leftIndex, int32_t rightIndex, + int32_t apply(FormattedStringBuilder &output, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const U_OVERRIDE; int32_t getPrefixLength() const U_OVERRIDE; diff --git a/deps/icu-small/source/i18n/number_skeletons.cpp b/deps/icu-small/source/i18n/number_skeletons.cpp index 4c280ad11dd8da..4025539239b786 100644 --- a/deps/icu-small/source/i18n/number_skeletons.cpp +++ b/deps/icu-small/source/i18n/number_skeletons.cpp @@ -20,6 +20,7 @@ #include "unicode/numberformatter.h" #include "uinvchar.h" #include "charstr.h" +#include "string_segment.h" using namespace icu; using namespace icu::number; @@ -119,17 +120,17 @@ inline void appendMultiple(UnicodeString& sb, UChar32 cp, int32_t count) { #define CHECK_NULL(seen, field, status) (void)(seen); /* for auto-format line wrapping */ \ -{ \ +UPRV_BLOCK_MACRO_BEGIN { \ if ((seen).field) { \ (status) = U_NUMBER_SKELETON_SYNTAX_ERROR; \ return STATE_NULL; \ } \ (seen).field = true; \ -} +} UPRV_BLOCK_MACRO_END #define SKELETON_UCHAR_TO_CHAR(dest, src, start, end, status) (void)(dest); \ -{ \ +UPRV_BLOCK_MACRO_BEGIN { \ UErrorCode conversionStatus = U_ZERO_ERROR; \ (dest).appendInvariantChars({FALSE, (src).getBuffer() + (start), (end) - (start)}, conversionStatus); \ if (conversionStatus == U_INVARIANT_CONVERSION_ERROR) { \ @@ -140,7 +141,7 @@ inline void appendMultiple(UnicodeString& sb, UChar32 cp, int32_t count) { (status) = conversionStatus; \ return; \ } \ -} +} UPRV_BLOCK_MACRO_END } // anonymous namespace @@ -1217,7 +1218,7 @@ void blueprint_helpers::parseIntegerWidthOption(const StringSegment& segment, Ma maxInt = 0; } for (; offset < segment.length(); offset++) { - if (segment.charAt(offset) == u'#') { + if (maxInt != -1 && segment.charAt(offset) == u'#') { maxInt++; } else { break; diff --git a/deps/icu-small/source/i18n/number_skeletons.h b/deps/icu-small/source/i18n/number_skeletons.h index bc228bd0d7408e..59af771928fbd0 100644 --- a/deps/icu-small/source/i18n/number_skeletons.h +++ b/deps/icu-small/source/i18n/number_skeletons.h @@ -10,10 +10,10 @@ #include "number_types.h" #include "numparse_types.h" #include "unicode/ucharstrie.h" +#include "string_segment.h" -using icu::numparse::impl::StringSegment; - -U_NAMESPACE_BEGIN namespace number { +U_NAMESPACE_BEGIN +namespace number { namespace impl { // Forward-declaration diff --git a/deps/icu-small/source/i18n/number_stringbuilder.h b/deps/icu-small/source/i18n/number_stringbuilder.h deleted file mode 100644 index d48f6e106cf87e..00000000000000 --- a/deps/icu-small/source/i18n/number_stringbuilder.h +++ /dev/null @@ -1,164 +0,0 @@ -// © 2017 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html - -#include "unicode/utypes.h" - -#if !UCONFIG_NO_FORMATTING -#ifndef __NUMBER_STRINGBUILDER_H__ -#define __NUMBER_STRINGBUILDER_H__ - - -#include -#include "unicode/numfmt.h" -#include "unicode/ustring.h" -#include "cstring.h" -#include "uassert.h" -#include "number_types.h" -#include "fphdlimp.h" - -U_NAMESPACE_BEGIN namespace number { -namespace impl { - -class U_I18N_API NumberStringBuilder : public UMemory { - private: - static const int32_t DEFAULT_CAPACITY = 40; - - template - union ValueOrHeapArray { - T value[DEFAULT_CAPACITY]; - struct { - T *ptr; - int32_t capacity; - } heap; - }; - - public: - NumberStringBuilder(); - - ~NumberStringBuilder(); - - NumberStringBuilder(const NumberStringBuilder &other); - - NumberStringBuilder &operator=(const NumberStringBuilder &other); - - int32_t length() const; - - int32_t codePointCount() const; - - inline char16_t charAt(int32_t index) const { - U_ASSERT(index >= 0); - U_ASSERT(index < fLength); - return getCharPtr()[fZero + index]; - } - - inline Field fieldAt(int32_t index) const { - U_ASSERT(index >= 0); - U_ASSERT(index < fLength); - return getFieldPtr()[fZero + index]; - } - - UChar32 getFirstCodePoint() const; - - UChar32 getLastCodePoint() const; - - UChar32 codePointAt(int32_t index) const; - - UChar32 codePointBefore(int32_t index) const; - - NumberStringBuilder &clear(); - - int32_t appendCodePoint(UChar32 codePoint, Field field, UErrorCode &status); - - int32_t insertCodePoint(int32_t index, UChar32 codePoint, Field field, UErrorCode &status); - - int32_t append(const UnicodeString &unistr, Field field, UErrorCode &status); - - int32_t insert(int32_t index, const UnicodeString &unistr, Field field, UErrorCode &status); - - int32_t insert(int32_t index, const UnicodeString &unistr, int32_t start, int32_t end, Field field, - UErrorCode &status); - - int32_t splice(int32_t startThis, int32_t endThis, const UnicodeString &unistr, - int32_t startOther, int32_t endOther, Field field, UErrorCode& status); - - int32_t append(const NumberStringBuilder &other, UErrorCode &status); - - int32_t insert(int32_t index, const NumberStringBuilder &other, UErrorCode &status); - - void writeTerminator(UErrorCode& status); - - /** - * Gets a "safe" UnicodeString that can be used even after the NumberStringBuilder is destructed. - * */ - UnicodeString toUnicodeString() const; - - /** - * Gets an "unsafe" UnicodeString that is valid only as long as the NumberStringBuilder is alive and - * unchanged. Slightly faster than toUnicodeString(). - */ - const UnicodeString toTempUnicodeString() const; - - UnicodeString toDebugString() const; - - const char16_t *chars() const; - - bool contentEquals(const NumberStringBuilder &other) const; - - bool nextFieldPosition(FieldPosition& fp, UErrorCode& status) const; - - void getAllFieldPositions(FieldPositionIteratorHandler& fpih, UErrorCode& status) const; - - bool nextPosition(ConstrainedFieldPosition& cfpos, Field numericField, UErrorCode& status) const; - - bool containsField(Field field) const; - - private: - bool fUsingHeap = false; - ValueOrHeapArray fChars; - ValueOrHeapArray fFields; - int32_t fZero = DEFAULT_CAPACITY / 2; - int32_t fLength = 0; - - inline char16_t *getCharPtr() { - return fUsingHeap ? fChars.heap.ptr : fChars.value; - } - - inline const char16_t *getCharPtr() const { - return fUsingHeap ? fChars.heap.ptr : fChars.value; - } - - inline Field *getFieldPtr() { - return fUsingHeap ? fFields.heap.ptr : fFields.value; - } - - inline const Field *getFieldPtr() const { - return fUsingHeap ? fFields.heap.ptr : fFields.value; - } - - inline int32_t getCapacity() const { - return fUsingHeap ? fChars.heap.capacity : DEFAULT_CAPACITY; - } - - int32_t prepareForInsert(int32_t index, int32_t count, UErrorCode &status); - - int32_t prepareForInsertHelper(int32_t index, int32_t count, UErrorCode &status); - - int32_t remove(int32_t index, int32_t count); - - static bool isIntOrGroup(Field field); - - static bool isNumericField(Field field); - - int32_t trimBack(int32_t limit) const; - - int32_t trimFront(int32_t start) const; -}; - -} // namespace impl -} // namespace number -U_NAMESPACE_END - - -#endif //__NUMBER_STRINGBUILDER_H__ - -#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/number_types.h b/deps/icu-small/source/i18n/number_types.h index 225d1e57750490..d62aa6a66b30d3 100644 --- a/deps/icu-small/source/i18n/number_types.h +++ b/deps/icu-small/source/i18n/number_types.h @@ -17,17 +17,16 @@ #include "unicode/platform.h" #include "unicode/uniset.h" #include "standardplural.h" +#include "formatted_string_builder.h" -U_NAMESPACE_BEGIN namespace number { +U_NAMESPACE_BEGIN +namespace number { namespace impl { -// Typedef several enums for brevity and for easier comparison to Java. +// For convenience and historical reasons, import the Field typedef to the namespace. +typedef FormattedStringBuilder::Field Field; -// Convention: bottom 4 bits for field, top 4 bits for field category. -// Field category 0 implies the number category so that the number field -// literals can be directly passed as a Field type. -// See the helper functions in "NumFieldUtils" in number_utils.h -typedef uint8_t Field; +// Typedef several enums for brevity and for easier comparison to Java. typedef UNumberFormatRoundingMode RoundingMode; @@ -49,7 +48,6 @@ static constexpr char16_t kFallbackPaddingString[] = u" "; class Modifier; class MutablePatternModifier; class DecimalQuantity; -class NumberStringBuilder; class ModifierStore; struct MicroProps; @@ -93,6 +91,12 @@ enum CompactType { TYPE_DECIMAL, TYPE_CURRENCY }; +enum Signum { + SIGNUM_NEG = -1, + SIGNUM_ZERO = 0, + SIGNUM_POS = 1 +}; + class U_I18N_API AffixPatternProvider { public: @@ -160,7 +164,7 @@ class U_I18N_API Modifier { * formatted. * @return The number of characters (UTF-16 code units) that were added to the string builder. */ - virtual int32_t apply(NumberStringBuilder& output, int leftIndex, int rightIndex, + virtual int32_t apply(FormattedStringBuilder& output, int leftIndex, int rightIndex, UErrorCode& status) const = 0; /** @@ -196,11 +200,11 @@ class U_I18N_API Modifier { */ struct U_I18N_API Parameters { const ModifierStore* obj = nullptr; - int8_t signum; + Signum signum; StandardPlural::Form plural; Parameters(); - Parameters(const ModifierStore* _obj, int8_t _signum, StandardPlural::Form _plural); + Parameters(const ModifierStore* _obj, Signum _signum, StandardPlural::Form _plural); }; /** @@ -231,7 +235,7 @@ class U_I18N_API ModifierStore { /** * Returns a Modifier with the given parameters (best-effort). */ - virtual const Modifier* getModifier(int8_t signum, StandardPlural::Form plural) const = 0; + virtual const Modifier* getModifier(Signum signum, StandardPlural::Form plural) const = 0; }; diff --git a/deps/icu-small/source/i18n/number_utils.cpp b/deps/icu-small/source/i18n/number_utils.cpp index 0983b7b0726ec2..91d7f335cd82d3 100644 --- a/deps/icu-small/source/i18n/number_utils.cpp +++ b/deps/icu-small/source/i18n/number_utils.cpp @@ -252,4 +252,15 @@ bool DecNum::isZero() const { return decNumberIsZero(fData.getAlias()); } +void DecNum::toString(ByteSink& output, UErrorCode& status) const { + if (U_FAILURE(status)) { + return; + } + // "string must be at least dn->digits+14 characters long" + int32_t minCapacity = fData.getAlias()->digits + 14; + MaybeStackArray buffer(minCapacity); + uprv_decNumberToString(fData, buffer.getAlias()); + output.Append(buffer.getAlias(), static_cast(uprv_strlen(buffer.getAlias()))); +} + #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/number_utils.h b/deps/icu-small/source/i18n/number_utils.h index 203dec6d83b92b..93195f080b2787 100644 --- a/deps/icu-small/source/i18n/number_utils.h +++ b/deps/icu-small/source/i18n/number_utils.h @@ -17,6 +17,7 @@ #include "number_roundingutils.h" #include "decNumber.h" #include "charstr.h" +#include "formatted_string_builder.h" U_NAMESPACE_BEGIN @@ -32,52 +33,10 @@ enum CldrPatternStyle { CLDR_PATTERN_STYLE_COUNT, }; - -/** - * Helper functions for dealing with the Field typedef, which stores fields - * in a compressed format. - */ -class NumFieldUtils { -public: - struct CategoryFieldPair { - int32_t category; - int32_t field; - }; - - /** Compile-time function to construct a Field from a category and a field */ - template - static constexpr Field compress() { - static_assert(category != 0, "cannot use Undefined category in NumFieldUtils"); - static_assert(category <= 0xf, "only 4 bits for category"); - static_assert(field <= 0xf, "only 4 bits for field"); - return static_cast((category << 4) | field); - } - - /** Runtime inline function to unpack the category and field from the Field */ - static inline CategoryFieldPair expand(Field field) { - if (field == UNUM_FIELD_COUNT) { - return {UFIELD_CATEGORY_UNDEFINED, 0}; - } - CategoryFieldPair ret = { - (field >> 4), - (field & 0xf) - }; - if (ret.category == 0) { - ret.category = UFIELD_CATEGORY_NUMBER; - } - return ret; - } - - static inline bool isNumericField(Field field) { - int8_t category = field >> 4; - return category == 0 || category == UFIELD_CATEGORY_NUMBER; - } -}; - // Namespace for naked functions namespace utils { -inline int32_t insertDigitFromSymbols(NumberStringBuilder& output, int32_t index, int8_t digit, +inline int32_t insertDigitFromSymbols(FormattedStringBuilder& output, int32_t index, int8_t digit, const DecimalFormatSymbols& symbols, Field field, UErrorCode& status) { if (symbols.getCodePointZero() != -1) { diff --git a/deps/icu-small/source/i18n/number_utypes.h b/deps/icu-small/source/i18n/number_utypes.h index 88b493cbc254c9..6dbe5bee68fb71 100644 --- a/deps/icu-small/source/i18n/number_utypes.h +++ b/deps/icu-small/source/i18n/number_utypes.h @@ -10,7 +10,7 @@ #include "unicode/numberformatter.h" #include "number_types.h" #include "number_decimalquantity.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "formattedval_impl.h" U_NAMESPACE_BEGIN namespace number { @@ -31,9 +31,9 @@ const DecimalQuantity* validateUFormattedNumberToDecimalQuantity( * The DecimalQuantity is not currently being used by FormattedNumber, but at some point it could be used * to add a toDecNumber() or similar method. */ -class UFormattedNumberData : public FormattedValueNumberStringBuilderImpl { +class UFormattedNumberData : public FormattedValueStringBuilderImpl { public: - UFormattedNumberData() : FormattedValueNumberStringBuilderImpl(0) {} + UFormattedNumberData() : FormattedValueStringBuilderImpl(0) {} virtual ~UFormattedNumberData(); DecimalQuantity quantity; diff --git a/deps/icu-small/source/i18n/numfmt.cpp b/deps/icu-small/source/i18n/numfmt.cpp index 21efd184558778..bf78179bcddefe 100644 --- a/deps/icu-small/source/i18n/numfmt.cpp +++ b/deps/icu-small/source/i18n/numfmt.cpp @@ -569,7 +569,7 @@ NumberFormat::format(const Formattable& obj, if(arg.wasCurrency() && u_strcmp(iso, getCurrency())) { // trying to format a different currency. // Right now, we clone. - LocalPointer cloneFmt((NumberFormat*)this->clone()); + LocalPointer cloneFmt(this->clone()); cloneFmt->setCurrency(iso, status); // next line should NOT recurse, because n is numeric whereas obj was a wrapper around currency amount. return cloneFmt->format(*n, appendTo, pos, status); @@ -624,7 +624,7 @@ NumberFormat::format(const Formattable& obj, if(arg.wasCurrency() && u_strcmp(iso, getCurrency())) { // trying to format a different currency. // Right now, we clone. - LocalPointer cloneFmt((NumberFormat*)this->clone()); + LocalPointer cloneFmt(this->clone()); cloneFmt->setCurrency(iso, status); // next line should NOT recurse, because n is numeric whereas obj was a wrapper around currency amount. return cloneFmt->format(*n, appendTo, posIter, status); @@ -986,15 +986,19 @@ static UBool haveService() { URegistryKey U_EXPORT2 NumberFormat::registerFactory(NumberFormatFactory* toAdopt, UErrorCode& status) { - ICULocaleService *service = getNumberFormatService(); - if (service) { - NFFactory *tempnnf = new NFFactory(toAdopt); - if (tempnnf != NULL) { - return service->registerFactory(tempnnf, status); - } - } - status = U_MEMORY_ALLOCATION_ERROR; - return NULL; + if (U_FAILURE(status)) { + delete toAdopt; + return nullptr; + } + ICULocaleService *service = getNumberFormatService(); + if (service) { + NFFactory *tempnnf = new NFFactory(toAdopt); + if (tempnnf != NULL) { + return service->registerFactory(tempnnf, status); + } + } + status = U_MEMORY_ALLOCATION_ERROR; + return NULL; } // ------------------------------------- @@ -1055,7 +1059,7 @@ NumberFormat::createInstance(const Locale& loc, UNumberFormatStyle kind, UErrorC if (U_FAILURE(status)) { return NULL; } - NumberFormat *result = static_cast((*shared)->clone()); + NumberFormat *result = (*shared)->clone(); shared->removeRef(); if (result == NULL) { status = U_MEMORY_ALLOCATION_ERROR; @@ -1362,7 +1366,7 @@ NumberFormat::makeInstance(const Locale& desiredLocale, // TODO: Bad hash key usage, see ticket #8504. int32_t hashKey = desiredLocale.hashCode(); - static icu::UMutex nscacheMutex = U_MUTEX_INITIALIZER; + static UMutex nscacheMutex; Mutex lock(&nscacheMutex); ns = (NumberingSystem *)uhash_iget(NumberingSystem_cache, hashKey); if (ns == NULL) { diff --git a/deps/icu-small/source/i18n/numparse_affixes.cpp b/deps/icu-small/source/i18n/numparse_affixes.cpp index 12543a641b5946..4f83e0dd4076c3 100644 --- a/deps/icu-small/source/i18n/numparse_affixes.cpp +++ b/deps/icu-small/source/i18n/numparse_affixes.cpp @@ -13,6 +13,7 @@ #include "numparse_affixes.h" #include "numparse_utils.h" #include "number_utils.h" +#include "string_segment.h" using namespace icu; using namespace icu::numparse; @@ -280,7 +281,9 @@ void AffixMatcherWarehouse::createAffixMatchers(const AffixPatternProvider& patt AffixPatternMatcher* posSuffix = nullptr; // Pre-process the affix strings to resolve LDML rules like sign display. - for (int8_t signum = 1; signum >= -1; signum--) { + for (int8_t signumInt = 1; signumInt >= -1; signumInt--) { + auto signum = static_cast(signumInt); + // Generate Prefix bool hasPrefix = false; PatternStringUtils::patternInfoToStringBuilder( diff --git a/deps/icu-small/source/i18n/numparse_compositions.cpp b/deps/icu-small/source/i18n/numparse_compositions.cpp index 19253da805f0bf..2f7e1ab28d1d22 100644 --- a/deps/icu-small/source/i18n/numparse_compositions.cpp +++ b/deps/icu-small/source/i18n/numparse_compositions.cpp @@ -11,6 +11,7 @@ #include "numparse_types.h" #include "numparse_compositions.h" +#include "string_segment.h" #include "unicode/uniset.h" using namespace icu; diff --git a/deps/icu-small/source/i18n/numparse_currency.cpp b/deps/icu-small/source/i18n/numparse_currency.cpp index 598ace56533c36..6b53a73edf3b85 100644 --- a/deps/icu-small/source/i18n/numparse_currency.cpp +++ b/deps/icu-small/source/i18n/numparse_currency.cpp @@ -14,6 +14,7 @@ #include "ucurrimp.h" #include "unicode/errorcode.h" #include "numparse_utils.h" +#include "string_segment.h" using namespace icu; using namespace icu::numparse; diff --git a/deps/icu-small/source/i18n/numparse_decimal.cpp b/deps/icu-small/source/i18n/numparse_decimal.cpp index b120c5c6ad2f91..cf1e8156726d01 100644 --- a/deps/icu-small/source/i18n/numparse_decimal.cpp +++ b/deps/icu-small/source/i18n/numparse_decimal.cpp @@ -16,6 +16,7 @@ #include "unicode/uchar.h" #include "putilimp.h" #include "number_decimalquantity.h" +#include "string_segment.h" using namespace icu; using namespace icu::numparse; diff --git a/deps/icu-small/source/i18n/numparse_impl.cpp b/deps/icu-small/source/i18n/numparse_impl.cpp index 412ea89c86b651..bf5829061a1511 100644 --- a/deps/icu-small/source/i18n/numparse_impl.cpp +++ b/deps/icu-small/source/i18n/numparse_impl.cpp @@ -39,7 +39,7 @@ NumberParserImpl::createSimpleParser(const Locale& locale, const UnicodeString& LocalPointer parser(new NumberParserImpl(parseFlags)); DecimalFormatSymbols symbols(locale, status); - parser->fLocalMatchers.ignorables = {unisets::DEFAULT_IGNORABLES}; + parser->fLocalMatchers.ignorables = {parseFlags}; IgnorablesMatcher& ignorables = parser->fLocalMatchers.ignorables; DecimalFormatSymbols dfs(locale, status); @@ -114,6 +114,7 @@ NumberParserImpl::createParserFromProperties(const number::impl::DecimalFormatPr parseFlags |= PARSE_FLAG_STRICT_SEPARATORS; parseFlags |= PARSE_FLAG_USE_FULL_AFFIXES; parseFlags |= PARSE_FLAG_EXACT_AFFIX; + parseFlags |= PARSE_FLAG_STRICT_IGNORABLES; } else { parseFlags |= PARSE_FLAG_INCLUDE_UNPAIRED_AFFIXES; } @@ -129,8 +130,7 @@ NumberParserImpl::createParserFromProperties(const number::impl::DecimalFormatPr LocalPointer parser(new NumberParserImpl(parseFlags)); - parser->fLocalMatchers.ignorables = { - isStrict ? unisets::STRICT_IGNORABLES : unisets::DEFAULT_IGNORABLES}; + parser->fLocalMatchers.ignorables = {parseFlags}; IgnorablesMatcher& ignorables = parser->fLocalMatchers.ignorables; ////////////////////// diff --git a/deps/icu-small/source/i18n/numparse_impl.h b/deps/icu-small/source/i18n/numparse_impl.h index 7d5f0b6f0bd07b..380d9aa4c64289 100644 --- a/deps/icu-small/source/i18n/numparse_impl.h +++ b/deps/icu-small/source/i18n/numparse_impl.h @@ -18,6 +18,7 @@ #include "unicode/localpointer.h" #include "numparse_validators.h" #include "number_multiplier.h" +#include "string_segment.h" U_NAMESPACE_BEGIN diff --git a/deps/icu-small/source/i18n/numparse_parsednumber.cpp b/deps/icu-small/source/i18n/numparse_parsednumber.cpp index 3145f718dc26b5..4b373a3c312254 100644 --- a/deps/icu-small/source/i18n/numparse_parsednumber.cpp +++ b/deps/icu-small/source/i18n/numparse_parsednumber.cpp @@ -11,6 +11,7 @@ #include "numparse_types.h" #include "number_decimalquantity.h" +#include "string_segment.h" #include "putilimp.h" #include @@ -73,7 +74,7 @@ double ParsedNumber::getDouble(UErrorCode& status) const { status = U_INVALID_STATE_ERROR; return 0.0; } - if (quantity.isZero() && quantity.isNegative()) { + if (quantity.isZeroish() && quantity.isNegative()) { return -0.0; } @@ -106,7 +107,7 @@ void ParsedNumber::populateFormattable(Formattable& output, parse_flags_t parseF } } U_ASSERT(!quantity.bogus); - if (quantity.isZero() && quantity.isNegative() && !integerOnly) { + if (quantity.isZeroish() && quantity.isNegative() && !integerOnly) { output.setDouble(-0.0); return; } diff --git a/deps/icu-small/source/i18n/numparse_scientific.cpp b/deps/icu-small/source/i18n/numparse_scientific.cpp index de38957440817c..4b88cd998fee09 100644 --- a/deps/icu-small/source/i18n/numparse_scientific.cpp +++ b/deps/icu-small/source/i18n/numparse_scientific.cpp @@ -12,6 +12,7 @@ #include "numparse_types.h" #include "numparse_scientific.h" #include "static_unicode_sets.h" +#include "string_segment.h" using namespace icu; using namespace icu::numparse; @@ -33,7 +34,8 @@ inline const UnicodeSet& plusSignSet() { ScientificMatcher::ScientificMatcher(const DecimalFormatSymbols& dfs, const Grouper& grouper) : fExponentSeparatorString(dfs.getConstSymbol(DecimalFormatSymbols::kExponentialSymbol)), - fExponentMatcher(dfs, grouper, PARSE_FLAG_INTEGER_ONLY | PARSE_FLAG_GROUPING_DISABLED) { + fExponentMatcher(dfs, grouper, PARSE_FLAG_INTEGER_ONLY | PARSE_FLAG_GROUPING_DISABLED), + fIgnorablesMatcher(PARSE_FLAG_STRICT_IGNORABLES) { const UnicodeString& minusSign = dfs.getConstSymbol(DecimalFormatSymbols::kMinusSignSymbol); if (minusSignSet().contains(minusSign)) { @@ -63,15 +65,25 @@ bool ScientificMatcher::match(StringSegment& segment, ParsedNumber& result, UErr // First match the scientific separator, and then match another number after it. // NOTE: This is guarded by the smoke test; no need to check fExponentSeparatorString length again. - int overlap1 = segment.getCommonPrefixLength(fExponentSeparatorString); - if (overlap1 == fExponentSeparatorString.length()) { + int32_t initialOffset = segment.getOffset(); + int32_t overlap = segment.getCommonPrefixLength(fExponentSeparatorString); + if (overlap == fExponentSeparatorString.length()) { // Full exponent separator match. // First attempt to get a code point, returning true if we can't get one. - if (segment.length() == overlap1) { + if (segment.length() == overlap) { + return true; + } + segment.adjustOffset(overlap); + + // Allow ignorables before the sign. + // Note: call site is guarded by the segment.length() check above. + // Note: the ignorables matcher should not touch the result. + fIgnorablesMatcher.match(segment, result, status); + if (segment.length() == 0) { + segment.setOffset(initialOffset); return true; } - segment.adjustOffset(overlap1); // Allow a sign, and then try to match digits. int8_t exponentSign = 1; @@ -81,24 +93,37 @@ bool ScientificMatcher::match(StringSegment& segment, ParsedNumber& result, UErr } else if (segment.startsWith(plusSignSet())) { segment.adjustOffsetByCodePoint(); } else if (segment.startsWith(fCustomMinusSign)) { - // Note: call site is guarded with startsWith, which returns false on empty string - int32_t overlap2 = segment.getCommonPrefixLength(fCustomMinusSign); - if (overlap2 != fCustomMinusSign.length()) { - // Partial custom sign match; un-match the exponent separator. - segment.adjustOffset(-overlap1); + overlap = segment.getCommonPrefixLength(fCustomMinusSign); + if (overlap != fCustomMinusSign.length()) { + // Partial custom sign match + segment.setOffset(initialOffset); return true; } exponentSign = -1; - segment.adjustOffset(overlap2); + segment.adjustOffset(overlap); } else if (segment.startsWith(fCustomPlusSign)) { - // Note: call site is guarded with startsWith, which returns false on empty string - int32_t overlap2 = segment.getCommonPrefixLength(fCustomPlusSign); - if (overlap2 != fCustomPlusSign.length()) { - // Partial custom sign match; un-match the exponent separator. - segment.adjustOffset(-overlap1); + overlap = segment.getCommonPrefixLength(fCustomPlusSign); + if (overlap != fCustomPlusSign.length()) { + // Partial custom sign match + segment.setOffset(initialOffset); return true; } - segment.adjustOffset(overlap2); + segment.adjustOffset(overlap); + } + + // Return true if the segment is empty. + if (segment.length() == 0) { + segment.setOffset(initialOffset); + return true; + } + + // Allow ignorables after the sign. + // Note: call site is guarded by the segment.length() check above. + // Note: the ignorables matcher should not touch the result. + fIgnorablesMatcher.match(segment, result, status); + if (segment.length() == 0) { + segment.setOffset(initialOffset); + return true; } // We are supposed to accept E0 after NaN, so we need to make sure result.quantity is available. @@ -112,12 +137,12 @@ bool ScientificMatcher::match(StringSegment& segment, ParsedNumber& result, UErr // At least one exponent digit was matched. result.flags |= FLAG_HAS_EXPONENT; } else { - // No exponent digits were matched; un-match the exponent separator. - segment.adjustOffset(-overlap1); + // No exponent digits were matched + segment.setOffset(initialOffset); } return digitsReturnValue; - } else if (overlap1 == segment.length()) { + } else if (overlap == segment.length()) { // Partial exponent separator match return true; } diff --git a/deps/icu-small/source/i18n/numparse_scientific.h b/deps/icu-small/source/i18n/numparse_scientific.h index ddecf858af3584..5617c0c6a60822 100644 --- a/deps/icu-small/source/i18n/numparse_scientific.h +++ b/deps/icu-small/source/i18n/numparse_scientific.h @@ -9,6 +9,7 @@ #include "numparse_types.h" #include "numparse_decimal.h" +#include "numparse_symbols.h" #include "unicode/numberformatter.h" using icu::number::impl::Grouper; @@ -32,6 +33,7 @@ class ScientificMatcher : public NumberParseMatcher, public UMemory { private: UnicodeString fExponentSeparatorString; DecimalMatcher fExponentMatcher; + IgnorablesMatcher fIgnorablesMatcher; UnicodeString fCustomMinusSign; UnicodeString fCustomPlusSign; }; diff --git a/deps/icu-small/source/i18n/numparse_stringsegment.h b/deps/icu-small/source/i18n/numparse_stringsegment.h deleted file mode 100644 index 7a84444d414889..00000000000000 --- a/deps/icu-small/source/i18n/numparse_stringsegment.h +++ /dev/null @@ -1,24 +0,0 @@ -// © 2018 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html - -#include "unicode/utypes.h" - -#if !UCONFIG_NO_FORMATTING -#ifndef __NUMPARSE_STRINGSEGMENT_H__ -#define __NUMPARSE_STRINGSEGMENT_H__ - -#include "numparse_types.h" -#include "number_types.h" -#include "unicode/unistr.h" - -U_NAMESPACE_BEGIN -namespace numparse { -namespace impl { - - -} // namespace impl -} // namespace numparse -U_NAMESPACE_END - -#endif //__NUMPARSE_STRINGSEGMENT_H__ -#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/numparse_symbols.cpp b/deps/icu-small/source/i18n/numparse_symbols.cpp index e0daab9374f8b1..608f4f5c8b0ee7 100644 --- a/deps/icu-small/source/i18n/numparse_symbols.cpp +++ b/deps/icu-small/source/i18n/numparse_symbols.cpp @@ -12,6 +12,7 @@ #include "numparse_types.h" #include "numparse_symbols.h" #include "numparse_utils.h" +#include "string_segment.h" using namespace icu; using namespace icu::numparse; @@ -68,8 +69,12 @@ UnicodeString SymbolMatcher::toString() const { } -IgnorablesMatcher::IgnorablesMatcher(unisets::Key key) - : SymbolMatcher({}, key) { +IgnorablesMatcher::IgnorablesMatcher(parse_flags_t parseFlags) : + SymbolMatcher( + {}, + (0 != (parseFlags & PARSE_FLAG_STRICT_IGNORABLES)) ? + unisets::STRICT_IGNORABLES : + unisets::DEFAULT_IGNORABLES) { } bool IgnorablesMatcher::isFlexible() const { diff --git a/deps/icu-small/source/i18n/numparse_symbols.h b/deps/icu-small/source/i18n/numparse_symbols.h index 8912ee95b0d009..beb133f7d07a53 100644 --- a/deps/icu-small/source/i18n/numparse_symbols.h +++ b/deps/icu-small/source/i18n/numparse_symbols.h @@ -50,7 +50,7 @@ class U_I18N_API IgnorablesMatcher : public SymbolMatcher { public: IgnorablesMatcher() = default; // WARNING: Leaves the object in an unusable state - IgnorablesMatcher(unisets::Key key); + IgnorablesMatcher(parse_flags_t parseFlags); bool isFlexible() const override; diff --git a/deps/icu-small/source/i18n/numparse_types.h b/deps/icu-small/source/i18n/numparse_types.h index f837d8d2795a2b..b4007c2ff5b52c 100644 --- a/deps/icu-small/source/i18n/numparse_types.h +++ b/deps/icu-small/source/i18n/numparse_types.h @@ -9,12 +9,13 @@ #include "unicode/uobject.h" #include "number_decimalquantity.h" +#include "string_segment.h" -U_NAMESPACE_BEGIN namespace numparse { +U_NAMESPACE_BEGIN +namespace numparse { namespace impl { // Forward-declarations -class StringSegment; class ParsedNumber; typedef int32_t result_flags_t; @@ -50,6 +51,7 @@ enum ParseFlags { // PARSE_FLAG_FORCE_BIG_DECIMAL = 0x1000, // not used in ICU4C PARSE_FLAG_NO_FOREIGN_CURRENCY = 0x2000, PARSE_FLAG_ALLOW_INFINITE_RECURSION = 0x4000, + PARSE_FLAG_STRICT_IGNORABLES = 0x8000, }; @@ -169,115 +171,6 @@ class U_I18N_API ParsedNumber { }; -/** - * A mutable class allowing for a String with a variable offset and length. The charAt, length, and - * subSequence methods all operate relative to the fixed offset into the String. - * - * @author sffc - */ -// Exported as U_I18N_API for tests -class U_I18N_API StringSegment : public UMemory { - public: - StringSegment(const UnicodeString& str, bool ignoreCase); - - int32_t getOffset() const; - - void setOffset(int32_t start); - - /** - * Equivalent to setOffset(getOffset()+delta). - * - *

- * This method is usually called by a Matcher to register that a char was consumed. If the char is - * strong (it usually is, except for things like whitespace), follow this with a call to - * {@link ParsedNumber#setCharsConsumed}. For more information on strong chars, see that method. - */ - void adjustOffset(int32_t delta); - - /** - * Adjusts the offset by the width of the current code point, either 1 or 2 chars. - */ - void adjustOffsetByCodePoint(); - - void setLength(int32_t length); - - void resetLength(); - - int32_t length() const; - - char16_t charAt(int32_t index) const; - - UChar32 codePointAt(int32_t index) const; - - UnicodeString toUnicodeString() const; - - const UnicodeString toTempUnicodeString() const; - - /** - * Returns the first code point in the string segment, or -1 if the string starts with an invalid - * code point. - * - *

- * Important: Most of the time, you should use {@link #matches}, which handles case - * folding logic, instead of this method. - */ - UChar32 getCodePoint() const; - - /** - * Returns true if the first code point of this StringSegment equals the given code point. - * - *

- * This method will perform case folding if case folding is enabled for the parser. - */ - bool startsWith(UChar32 otherCp) const; - - /** - * Returns true if the first code point of this StringSegment is in the given UnicodeSet. - */ - bool startsWith(const UnicodeSet& uniset) const; - - /** - * Returns true if there is at least one code point of overlap between this StringSegment and the - * given UnicodeString. - */ - bool startsWith(const UnicodeString& other) const; - - /** - * Returns the length of the prefix shared by this StringSegment and the given CharSequence. For - * example, if this string segment is "aab", and the char sequence is "aac", this method returns 2, - * since the first 2 characters are the same. - * - *

- * This method only returns offsets along code point boundaries. - * - *

- * This method will perform case folding if case folding was enabled in the constructor. - * - *

- * IMPORTANT: The given UnicodeString must not be empty! It is the caller's responsibility to check. - */ - int32_t getCommonPrefixLength(const UnicodeString& other); - - /** - * Like {@link #getCommonPrefixLength}, but never performs case folding, even if case folding is - * enabled for the parser. - */ - int32_t getCaseSensitivePrefixLength(const UnicodeString& other); - - bool operator==(const UnicodeString& other) const; - - private: - const UnicodeString& fStr; - int32_t fStart; - int32_t fEnd; - bool fFoldCase; - - int32_t getPrefixLengthInternal(const UnicodeString& other, bool foldCase); - - static bool codePointsEqual(UChar32 cp1, UChar32 cp2, bool foldCase); -}; - - /** * The core interface implemented by all matchers used for number parsing. * diff --git a/deps/icu-small/source/i18n/numrange_fluent.cpp b/deps/icu-small/source/i18n/numrange_fluent.cpp index b284561cdc2b6f..654cafaf00bc82 100644 --- a/deps/icu-small/source/i18n/numrange_fluent.cpp +++ b/deps/icu-small/source/i18n/numrange_fluent.cpp @@ -382,7 +382,7 @@ UPRV_FORMATTED_VALUE_SUBCLASS_AUTO_IMPL(FormattedNumberRange) UBool FormattedNumberRange::nextFieldPosition(FieldPosition& fieldPosition, UErrorCode& status) const { UPRV_FORMATTED_VALUE_METHOD_GUARD(FALSE) // NOTE: MSVC sometimes complains when implicitly converting between bool and UBool - return fData->getStringRef().nextFieldPosition(fieldPosition, status) ? TRUE : FALSE; + return fData->nextFieldPosition(fieldPosition, status); } void FormattedNumberRange::getAllFieldPositions(FieldPositionIterator& iterator, UErrorCode& status) const { @@ -393,7 +393,7 @@ void FormattedNumberRange::getAllFieldPositions(FieldPositionIterator& iterator, void FormattedNumberRange::getAllFieldPositionsImpl( FieldPositionIteratorHandler& fpih, UErrorCode& status) const { UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG) - fData->getStringRef().getAllFieldPositions(fpih, status); + fData->getAllFieldPositions(fpih, status); } UnicodeString FormattedNumberRange::getFirstDecimal(UErrorCode& status) const { diff --git a/deps/icu-small/source/i18n/numrange_impl.cpp b/deps/icu-small/source/i18n/numrange_impl.cpp index 05eb2b84de3d87..7d732b31ec177a 100644 --- a/deps/icu-small/source/i18n/numrange_impl.cpp +++ b/deps/icu-small/source/i18n/numrange_impl.cpp @@ -397,7 +397,7 @@ void NumberRangeFormatterImpl::formatRange(UFormattedNumberRangeData& data, break; } - NumberStringBuilder& string = data.getStringRef(); + FormattedStringBuilder& string = data.getStringRef(); int32_t lengthPrefix = 0; int32_t length1 = 0; int32_t lengthInfix = 0; diff --git a/deps/icu-small/source/i18n/numrange_impl.h b/deps/icu-small/source/i18n/numrange_impl.h index dc25dd4d67bfeb..f88e300913642d 100644 --- a/deps/icu-small/source/i18n/numrange_impl.h +++ b/deps/icu-small/source/i18n/numrange_impl.h @@ -13,7 +13,7 @@ #include "number_types.h" #include "number_decimalquantity.h" #include "number_formatimpl.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "formattedval_impl.h" U_NAMESPACE_BEGIN namespace number { @@ -29,9 +29,9 @@ namespace impl { * Possible magic number: 0x46445200 * Reads in ASCII as "FDR" (FormatteDnumberRange with room at the end) */ -class UFormattedNumberRangeData : public FormattedValueNumberStringBuilderImpl { +class UFormattedNumberRangeData : public FormattedValueStringBuilderImpl { public: - UFormattedNumberRangeData() : FormattedValueNumberStringBuilderImpl(0) {} + UFormattedNumberRangeData() : FormattedValueStringBuilderImpl(0) {} virtual ~UFormattedNumberRangeData(); DecimalQuantity quantity1; diff --git a/deps/icu-small/source/i18n/numsys.cpp b/deps/icu-small/source/i18n/numsys.cpp index 80056f925b027f..e3fe54bc1b3f7e 100644 --- a/deps/icu-small/source/i18n/numsys.cpp +++ b/deps/icu-small/source/i18n/numsys.cpp @@ -37,7 +37,7 @@ U_NAMESPACE_BEGIN // Useful constants -#define DEFAULT_DIGITS UNICODE_STRING_SIMPLE("0123456789"); +#define DEFAULT_DIGITS UNICODE_STRING_SIMPLE("0123456789") static const char gNumberingSystems[] = "numberingSystems"; static const char gNumberElements[] = "NumberElements"; static const char gDefault[] = "default"; diff --git a/deps/icu-small/source/i18n/olsontz.cpp b/deps/icu-small/source/i18n/olsontz.cpp index 95fc56bcd71b54..dd01180f8cc078 100644 --- a/deps/icu-small/source/i18n/olsontz.cpp +++ b/deps/icu-small/source/i18n/olsontz.cpp @@ -287,8 +287,7 @@ OlsonTimeZone& OlsonTimeZone::operator=(const OlsonTimeZone& other) { typeMapData = other.typeMapData; delete finalZone; - finalZone = (other.finalZone != 0) ? - (SimpleTimeZone*) other.finalZone->clone() : 0; + finalZone = (other.finalZone != 0) ? other.finalZone->clone() : 0; finalStartYear = other.finalStartYear; finalStartMillis = other.finalStartMillis; @@ -319,7 +318,7 @@ UBool OlsonTimeZone::operator==(const TimeZone& other) const { /** * TimeZone API. */ -TimeZone* OlsonTimeZone::clone() const { +OlsonTimeZone* OlsonTimeZone::clone() const { return new OlsonTimeZone(*this); } @@ -816,7 +815,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { * For now, we do not set the valid start year when the construction time * and create a clone and set the start year when extracting rules. */ - finalZoneWithStartYear = (SimpleTimeZone*)finalZone->clone(); + finalZoneWithStartYear = finalZone->clone(); // Check to make sure finalZone was actually cloned. if (finalZoneWithStartYear == NULL) { status = U_MEMORY_ALLOCATION_ERROR; @@ -837,7 +836,7 @@ OlsonTimeZone::initTransitionRules(UErrorCode& status) { startTime = tzt.getTime(); } else { // final rule with no transitions - finalZoneWithStartYear = (SimpleTimeZone*)finalZone->clone(); + finalZoneWithStartYear = finalZone->clone(); // Check to make sure finalZone was actually cloned. if (finalZoneWithStartYear == NULL) { status = U_MEMORY_ALLOCATION_ERROR; diff --git a/deps/icu-small/source/i18n/olsontz.h b/deps/icu-small/source/i18n/olsontz.h index 6f0d36e5de5db0..79601546984a23 100644 --- a/deps/icu-small/source/i18n/olsontz.h +++ b/deps/icu-small/source/i18n/olsontz.h @@ -151,7 +151,7 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone { /** * TimeZone API. */ - virtual TimeZone* clone() const; + virtual OlsonTimeZone* clone() const; /** * TimeZone API. @@ -398,7 +398,7 @@ class U_I18N_API OlsonTimeZone: public BasicTimeZone { TimeArrayTimeZoneRule **historicRules; int16_t historicRuleCount; SimpleTimeZone *finalZoneWithStartYear; // hack - UInitOnce transitionRulesInitOnce; + UInitOnce transitionRulesInitOnce = U_INITONCE_INITIALIZER; }; inline int16_t diff --git a/deps/icu-small/source/i18n/persncal.cpp b/deps/icu-small/source/i18n/persncal.cpp index 3d391f4e3fbe8e..4d366d41f0dffe 100644 --- a/deps/icu-small/source/i18n/persncal.cpp +++ b/deps/icu-small/source/i18n/persncal.cpp @@ -74,7 +74,7 @@ const char *PersianCalendar::getType() const { return "persian"; } -Calendar* PersianCalendar::clone() const { +PersianCalendar* PersianCalendar::clone() const { return new PersianCalendar(*this); } diff --git a/deps/icu-small/source/i18n/persncal.h b/deps/icu-small/source/i18n/persncal.h index ec818822b33a41..a9d940db78e6c7 100644 --- a/deps/icu-small/source/i18n/persncal.h +++ b/deps/icu-small/source/i18n/persncal.h @@ -164,7 +164,7 @@ class PersianCalendar : public Calendar { // TODO: copy c'tor, etc // clone - virtual Calendar* clone() const; + virtual PersianCalendar* clone() const; private: /** diff --git a/deps/icu-small/source/i18n/plurfmt.cpp b/deps/icu-small/source/i18n/plurfmt.cpp index 678d91b9c824bc..b99437630e67b5 100644 --- a/deps/icu-small/source/i18n/plurfmt.cpp +++ b/deps/icu-small/source/i18n/plurfmt.cpp @@ -159,7 +159,7 @@ PluralFormat::copyObjects(const PluralFormat& other) { if (other.numberFormat == NULL) { numberFormat = NumberFormat::createInstance(locale, status); } else { - numberFormat = (NumberFormat*)other.numberFormat->clone(); + numberFormat = other.numberFormat->clone(); } if (other.pluralRulesWrapper.pluralRules == NULL) { pluralRulesWrapper.pluralRules = PluralRules::forLocale(locale, status); @@ -277,7 +277,14 @@ PluralFormat::format(const Formattable& numberObject, double number, UnicodeString numberString; auto *decFmt = dynamic_cast(numberFormat); if(decFmt != nullptr) { - decFmt->toNumberFormatter().formatImpl(&data, status); // mutates &data + const number::LocalizedNumberFormatter* lnf = decFmt->toNumberFormatter(status); + if (U_FAILURE(status)) { + return appendTo; + } + lnf->formatImpl(&data, status); // mutates &data + if (U_FAILURE(status)) { + return appendTo; + } numberString = data.getStringRef().toUnicodeString(); } else { if (offset == 0) { @@ -346,7 +353,7 @@ PluralFormat::setNumberFormat(const NumberFormat* format, UErrorCode& status) { if (U_FAILURE(status)) { return; } - NumberFormat* nf = (NumberFormat*)format->clone(); + NumberFormat* nf = format->clone(); if (nf != NULL) { delete numberFormat; numberFormat = nf; @@ -355,7 +362,7 @@ PluralFormat::setNumberFormat(const NumberFormat* format, UErrorCode& status) { } } -Format* +PluralFormat* PluralFormat::clone() const { return new PluralFormat(*this); diff --git a/deps/icu-small/source/i18n/quant.cpp b/deps/icu-small/source/i18n/quant.cpp index 1908a504846b07..b0e7a3ed52c240 100644 --- a/deps/icu-small/source/i18n/quant.cpp +++ b/deps/icu-small/source/i18n/quant.cpp @@ -47,7 +47,7 @@ Quantifier::~Quantifier() { /** * Implement UnicodeFunctor */ -UnicodeFunctor* Quantifier::clone() const { +Quantifier* Quantifier::clone() const { return new Quantifier(*this); } diff --git a/deps/icu-small/source/i18n/quant.h b/deps/icu-small/source/i18n/quant.h index 1abb0db61aa386..d5aa8e5eeeedee 100644 --- a/deps/icu-small/source/i18n/quant.h +++ b/deps/icu-small/source/i18n/quant.h @@ -45,7 +45,7 @@ class Quantifier : public UnicodeFunctor, public UnicodeMatcher { * Implement UnicodeFunctor * @return a copy of the object. */ - virtual UnicodeFunctor* clone() const; + virtual Quantifier* clone() const; /** * Implement UnicodeMatcher diff --git a/deps/icu-small/source/i18n/quantityformatter.cpp b/deps/icu-small/source/i18n/quantityformatter.cpp index 9182f9e7d379a8..e88b70fbd71795 100644 --- a/deps/icu-small/source/i18n/quantityformatter.cpp +++ b/deps/icu-small/source/i18n/quantityformatter.cpp @@ -26,7 +26,7 @@ #include "uassert.h" #include "number_decimalquantity.h" #include "number_utypes.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" U_NAMESPACE_BEGIN @@ -180,7 +180,7 @@ void QuantityFormatter::formatAndSelect( double quantity, const NumberFormat& fmt, const PluralRules& rules, - number::impl::NumberStringBuilder& output, + FormattedStringBuilder& output, StandardPlural::Form& pluralForm, UErrorCode& status) { UnicodeString pluralKeyword; @@ -188,7 +188,11 @@ void QuantityFormatter::formatAndSelect( if (df != nullptr) { number::impl::UFormattedNumberData fn; fn.quantity.setToDouble(quantity); - df->toNumberFormatter().formatImpl(&fn, status); + const number::LocalizedNumberFormatter* lnf = df->toNumberFormatter(status); + if (U_FAILURE(status)) { + return; + } + lnf->formatImpl(&fn, status); if (U_FAILURE(status)) { return; } diff --git a/deps/icu-small/source/i18n/quantityformatter.h b/deps/icu-small/source/i18n/quantityformatter.h index 3e3f29de57323d..88c3f3844e924d 100644 --- a/deps/icu-small/source/i18n/quantityformatter.h +++ b/deps/icu-small/source/i18n/quantityformatter.h @@ -26,12 +26,7 @@ class PluralRules; class NumberFormat; class Formattable; class FieldPosition; - -namespace number { -namespace impl { -class NumberStringBuilder; -} -} +class FormattedStringBuilder; /** * A plural aware formatter that is good for expressing a single quantity and @@ -129,7 +124,7 @@ class U_I18N_API QuantityFormatter : public UMemory { /** * Formats a quantity and selects its plural form. The output is appended - * to a NumberStringBuilder in order to retain field information. + * to a FormattedStringBuilder in order to retain field information. * * @param quantity The number to format. * @param fmt The formatter to use to format the number. @@ -144,7 +139,7 @@ class U_I18N_API QuantityFormatter : public UMemory { double quantity, const NumberFormat& fmt, const PluralRules& rules, - number::impl::NumberStringBuilder& output, + FormattedStringBuilder& output, StandardPlural::Form& pluralForm, UErrorCode& status); diff --git a/deps/icu-small/source/i18n/rbnf.cpp b/deps/icu-small/source/i18n/rbnf.cpp index 74707ccd22d2ac..c25e61e6b28d94 100644 --- a/deps/icu-small/source/i18n/rbnf.cpp +++ b/deps/icu-small/source/i18n/rbnf.cpp @@ -355,10 +355,16 @@ class LocDataParser { }; #ifdef RBNF_DEBUG -#define ERROR(msg) parseError(msg); return NULL; +#define ERROR(msg) UPRV_BLOCK_MACRO_BEGIN { \ + parseError(msg); \ + return NULL; \ +} UPRV_BLOCK_MACRO_END #define EXPLANATION_ARG explanationArg #else -#define ERROR(msg) parseError(NULL); return NULL; +#define ERROR(msg) UPRV_BLOCK_MACRO_BEGIN { \ + parseError(NULL); \ + return NULL; \ +} UPRV_BLOCK_MACRO_END #define EXPLANATION_ARG #endif @@ -924,8 +930,8 @@ RuleBasedNumberFormat::~RuleBasedNumberFormat() dispose(); } -Format* -RuleBasedNumberFormat::clone(void) const +RuleBasedNumberFormat* +RuleBasedNumberFormat::clone() const { return new RuleBasedNumberFormat(*this); } @@ -1110,45 +1116,6 @@ RuleBasedNumberFormat::findRuleSet(const UnicodeString& name, UErrorCode& status return NULL; } -UnicodeString& -RuleBasedNumberFormat::format(const DecimalQuantity &number, - UnicodeString &appendTo, - FieldPositionIterator *posIter, - UErrorCode &status) const { - if (U_FAILURE(status)) { - return appendTo; - } - DecimalQuantity copy(number); - if (copy.fitsInLong()) { - format(number.toLong(), appendTo, posIter, status); - } - else { - copy.roundToMagnitude(0, number::impl::RoundingMode::UNUM_ROUND_HALFEVEN, status); - if (copy.fitsInLong()) { - format(number.toDouble(), appendTo, posIter, status); - } - else { - // We're outside of our normal range that this framework can handle. - // The DecimalFormat will provide more accurate results. - - // TODO this section should probably be optimized. The DecimalFormat is shared in ICU4J. - LocalPointer decimalFormat(NumberFormat::createInstance(locale, UNUM_DECIMAL, status), status); - if (decimalFormat.isNull()) { - return appendTo; - } - Formattable f; - LocalPointer decimalQuantity(new DecimalQuantity(number), status); - if (decimalQuantity.isNull()) { - return appendTo; - } - f.adoptDecimalQuantity(decimalQuantity.orphan()); // f now owns decimalQuantity. - decimalFormat->format(f, appendTo, posIter, status); - } - } - return appendTo; -} - - UnicodeString& RuleBasedNumberFormat::format(const DecimalQuantity &number, UnicodeString& appendTo, diff --git a/deps/icu-small/source/i18n/rbt.cpp b/deps/icu-small/source/i18n/rbt.cpp index 8ba6a60ff42218..02d0ce6ceb20f8 100644 --- a/deps/icu-small/source/i18n/rbt.cpp +++ b/deps/icu-small/source/i18n/rbt.cpp @@ -191,8 +191,8 @@ RuleBasedTransliterator::~RuleBasedTransliterator() { } } -Transliterator* // Covariant return NOT ALLOWED (for portability) -RuleBasedTransliterator::clone(void) const { +RuleBasedTransliterator* +RuleBasedTransliterator::clone() const { return new RuleBasedTransliterator(*this); } @@ -253,7 +253,7 @@ RuleBasedTransliterator::handleTransliterate(Replaceable& text, UTransPosition& // // TODO(andy): Need a better scheme for handling this. - static UMutex transliteratorDataMutex = U_MUTEX_INITIALIZER; + static UMutex transliteratorDataMutex; UBool needToLock; { Mutex m; diff --git a/deps/icu-small/source/i18n/rbt.h b/deps/icu-small/source/i18n/rbt.h index a18452ab2ecb49..b450dc23f4975c 100644 --- a/deps/icu-small/source/i18n/rbt.h +++ b/deps/icu-small/source/i18n/rbt.h @@ -144,7 +144,7 @@ class RuleBasedTransliterator : public Transliterator { * Implement Transliterator API. * @internal Use transliterator factory methods instead since this class will be removed in that release. */ - virtual Transliterator* clone(void) const; + virtual RuleBasedTransliterator* clone() const; protected: /** diff --git a/deps/icu-small/source/i18n/rbt_pars.cpp b/deps/icu-small/source/i18n/rbt_pars.cpp index e07cc8b63a408c..3eb58a2a904a46 100644 --- a/deps/icu-small/source/i18n/rbt_pars.cpp +++ b/deps/icu-small/source/i18n/rbt_pars.cpp @@ -1111,7 +1111,7 @@ void TransliteratorParser::parseRules(const UnicodeString& rule, int32_t p = UHASH_FIRST; const UHashElement* he = variableNames.nextElement(p); while (he != NULL) { - UnicodeString* tempus = (UnicodeString*)(((UnicodeString*)(he->value.pointer))->clone()); + UnicodeString* tempus = ((UnicodeString*)(he->value.pointer))->clone(); if (tempus == NULL) { status = U_MEMORY_ALLOCATION_ERROR; return; diff --git a/deps/icu-small/source/i18n/rbt_rule.cpp b/deps/icu-small/source/i18n/rbt_rule.cpp index db02f76035c9ea..cd7bd5d9dfb655 100644 --- a/deps/icu-small/source/i18n/rbt_rule.cpp +++ b/deps/icu-small/source/i18n/rbt_rule.cpp @@ -180,13 +180,13 @@ TransliterationRule::TransliterationRule(TransliterationRule& other) : } if (other.anteContext != NULL) { - anteContext = (StringMatcher*) other.anteContext->clone(); + anteContext = other.anteContext->clone(); } if (other.key != NULL) { - key = (StringMatcher*) other.key->clone(); + key = other.key->clone(); } if (other.postContext != NULL) { - postContext = (StringMatcher*) other.postContext->clone(); + postContext = other.postContext->clone(); } output = other.output->clone(); } diff --git a/deps/icu-small/source/i18n/rbtz.cpp b/deps/icu-small/source/i18n/rbtz.cpp index b8dca395fc0403..2c3747abdafeaf 100644 --- a/deps/icu-small/source/i18n/rbtz.cpp +++ b/deps/icu-small/source/i18n/rbtz.cpp @@ -149,7 +149,7 @@ RuleBasedTimeZone::addTransitionRule(TimeZoneRule* rule, UErrorCode& status) { void RuleBasedTimeZone::completeConst(UErrorCode& status) const { - static UMutex gLock = U_MUTEX_INITIALIZER; + static UMutex gLock; if (U_FAILURE(status)) { return; } @@ -356,8 +356,8 @@ RuleBasedTimeZone::complete(UErrorCode& status) { fUpToDate = FALSE; } -TimeZone* -RuleBasedTimeZone::clone(void) const { +RuleBasedTimeZone* +RuleBasedTimeZone::clone() const { return new RuleBasedTimeZone(*this); } diff --git a/deps/icu-small/source/i18n/regexcmp.cpp b/deps/icu-small/source/i18n/regexcmp.cpp index 8d60986fd32ca6..3a6368b07afe73 100644 --- a/deps/icu-small/source/i18n/regexcmp.cpp +++ b/deps/icu-small/source/i18n/regexcmp.cpp @@ -561,7 +561,7 @@ UBool RegexCompile::doParseActions(int32_t action) // sequence; don't change without making updates there too. // // Compiles to - // 1 START_LA dataLoc Saves SP, Input Pos + // 1 LA_START dataLoc Saves SP, Input Pos, Active input region. // 2. STATE_SAVE 4 on failure of lookahead, goto 4 // 3 JMP 6 continue ... // @@ -575,10 +575,14 @@ UBool RegexCompile::doParseActions(int32_t action) // 8. code for parenthesized stuff. // 9. LA_END // - // Two data slots are reserved, for saving the stack ptr and the input position. + // Four data slots are reserved, for saving state on entry to the look-around + // 0: stack pointer on entry. + // 1: input position on entry. + // 2: fActiveStart, the active bounds start on entry. + // 3: fActiveLimit, the active bounds limit on entry. { fixLiterals(); - int32_t dataLoc = allocateData(2); + int32_t dataLoc = allocateData(4); appendOp(URX_LA_START, dataLoc); appendOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+ 2); appendOp(URX_JMP, fRXPat->fCompiledPat->size()+ 3); @@ -599,18 +603,23 @@ UBool RegexCompile::doParseActions(int32_t action) case doOpenLookAheadNeg: // Negated Lookahead. (?! stuff ) // Compiles to - // 1. START_LA dataloc + // 1. LA_START dataloc // 2. SAVE_STATE 7 // Fail within look-ahead block restores to this state, // // which continues with the match. // 3. NOP // Std. Open Paren sequence, for possible '|' // 4. code for parenthesized stuff. - // 5. END_LA // Cut back stack, remove saved state from step 2. + // 5. LA_END // Cut back stack, remove saved state from step 2. // 6. BACKTRACK // code in block succeeded, so neg. lookahead fails. // 7. END_LA // Restore match region, in case look-ahead was using // an alternate (transparent) region. + // Four data slots are reserved, for saving state on entry to the look-around + // 0: stack pointer on entry. + // 1: input position on entry. + // 2: fActiveStart, the active bounds start on entry. + // 3: fActiveLimit, the active bounds limit on entry. { fixLiterals(); - int32_t dataLoc = allocateData(2); + int32_t dataLoc = allocateData(4); appendOp(URX_LA_START, dataLoc); appendOp(URX_STATE_SAVE, 0); // dest address will be patched later. appendOp(URX_NOP, 0); @@ -644,14 +653,16 @@ UBool RegexCompile::doParseActions(int32_t action) // Allocate a block of matcher data, to contain (when running a match) // 0: Stack ptr on entry // 1: Input Index on entry - // 2: Start index of match current match attempt. - // 3: Original Input String len. + // 2: fActiveStart, the active bounds start on entry. + // 3: fActiveLimit, the active bounds limit on entry. + // 4: Start index of match current match attempt. + // The first four items must match the layout of data for LA_START / LA_END // Generate match code for any pending literals. fixLiterals(); // Allocate data space - int32_t dataLoc = allocateData(4); + int32_t dataLoc = allocateData(5); // Emit URX_LB_START appendOp(URX_LB_START, dataLoc); @@ -696,14 +707,16 @@ UBool RegexCompile::doParseActions(int32_t action) // Allocate a block of matcher data, to contain (when running a match) // 0: Stack ptr on entry // 1: Input Index on entry - // 2: Start index of match current match attempt. - // 3: Original Input String len. + // 2: fActiveStart, the active bounds start on entry. + // 3: fActiveLimit, the active bounds limit on entry. + // 4: Start index of match current match attempt. + // The first four items must match the layout of data for LA_START / LA_END // Generate match code for any pending literals. fixLiterals(); // Allocate data space - int32_t dataLoc = allocateData(4); + int32_t dataLoc = allocateData(5); // Emit URX_LB_START appendOp(URX_LB_START, dataLoc); @@ -2285,7 +2298,7 @@ void RegexCompile::handleCloseParen() { error(U_REGEX_LOOK_BEHIND_LIMIT); break; } - if (minML == INT32_MAX && maxML == 0) { + if (minML == INT32_MAX) { // This condition happens when no match is possible, such as with a // [set] expression containing no elements. // In principle, the generated code to evaluate the expression could be deleted, @@ -2328,7 +2341,7 @@ void RegexCompile::handleCloseParen() { error(U_REGEX_LOOK_BEHIND_LIMIT); break; } - if (minML == INT32_MAX && maxML == 0) { + if (minML == INT32_MAX) { // This condition happens when no match is possible, such as with a // [set] expression containing no elements. // In principle, the generated code to evaluate the expression could be deleted, @@ -3381,7 +3394,7 @@ int32_t RegexCompile::minMatchLength(int32_t start, int32_t end) { // it assumes that the look-ahead match might be zero-length. // TODO: Positive lookahead could recursively do the block, then continue // with the longer of the block or the value coming in. Ticket 6060 - int32_t depth = (opType == URX_LA_START? 2: 1);; + int32_t depth = (opType == URX_LA_START? 2: 1); for (;;) { loc++; op = (int32_t)fRXPat->fCompiledPat->elementAti(loc); @@ -3463,7 +3476,6 @@ int32_t RegexCompile::maxMatchLength(int32_t start, int32_t end) { U_ASSERT(start <= end); U_ASSERT(end < fRXPat->fCompiledPat->size()); - int32_t loc; int32_t op; int32_t opType; @@ -3672,7 +3684,7 @@ int32_t RegexCompile::maxMatchLength(int32_t start, int32_t end) { case URX_CTR_LOOP: case URX_CTR_LOOP_NG: - // These opcodes will be skipped over by code for URX_CRT_INIT. + // These opcodes will be skipped over by code for URX_CTR_INIT. // We shouldn't encounter them here. UPRV_UNREACHABLE; @@ -3700,21 +3712,15 @@ int32_t RegexCompile::maxMatchLength(int32_t start, int32_t end) { { // Look-behind. Scan forward until the matching look-around end, // without processing the look-behind block. - int32_t depth = 0; - for (;;) { - loc++; + int32_t dataLoc = URX_VAL(op); + for (loc = loc + 1; loc < end; ++loc) { op = (int32_t)fRXPat->fCompiledPat->elementAti(loc); - if (URX_TYPE(op) == URX_LA_START || URX_TYPE(op) == URX_LB_START) { - depth++; - } - if (URX_TYPE(op) == URX_LA_END || URX_TYPE(op)==URX_LBN_END) { - if (depth == 0) { - break; - } - depth--; + int32_t opType = URX_TYPE(op); + if ((opType == URX_LA_END || opType == URX_LBN_END) && (URX_VAL(op) == dataLoc)) { + break; } - U_ASSERT(loc < end); } + U_ASSERT(loc < end); } break; diff --git a/deps/icu-small/source/i18n/regeximp.h b/deps/icu-small/source/i18n/regeximp.h index da4a861bde52dd..9155cd3a31bbe1 100644 --- a/deps/icu-small/source/i18n/regeximp.h +++ b/deps/icu-small/source/i18n/regeximp.h @@ -123,7 +123,7 @@ enum { // saved input position, FAIL rather than taking // the JMP URX_LA_START = 37, // Starting a LookAround expression. - // Save InputPos and SP in static data. + // Save InputPos, SP and active region in static data. // Operand: Static data offset for the save URX_LA_END = 38, // Ending a Lookaround expression. // Restore InputPos and Stack to saved values. diff --git a/deps/icu-small/source/i18n/region.cpp b/deps/icu-small/source/i18n/region.cpp index f182f61486e6d3..198bea8f643a5b 100644 --- a/deps/icu-small/source/i18n/region.cpp +++ b/deps/icu-small/source/i18n/region.cpp @@ -25,7 +25,6 @@ #include "unicode/uobject.h" #include "unicode/unistr.h" #include "unicode/ures.h" -#include "unicode/decimfmt.h" #include "ucln_in.h" #include "cstring.h" #include "mutex.h" @@ -33,6 +32,7 @@ #include "umutex.h" #include "uresimp.h" #include "region_impl.h" +#include "util.h" #if !UCONFIG_NO_FORMATTING @@ -87,7 +87,6 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { LocalUHashtablePointer newRegionIDMap(uhash_open(uhash_hashUnicodeString, uhash_compareUnicodeString, NULL, &status)); LocalUHashtablePointer newNumericCodeMap(uhash_open(uhash_hashLong,uhash_compareLong,NULL,&status)); LocalUHashtablePointer newRegionAliases(uhash_open(uhash_hashUnicodeString,uhash_compareUnicodeString,NULL,&status)); - LocalPointer df(new DecimalFormat(status), status); LocalPointer continents(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); LocalPointer groupings(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status); @@ -115,7 +114,6 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { } // now, initialize - df->setParseIntegerOnly(TRUE); uhash_setValueDeleter(newRegionIDMap.getAlias(), deleteRegion); // regionIDMap owns objs uhash_setKeyDeleter(newRegionAliases.getAlias(), uprv_deleteUObject); // regionAliases owns the string keys @@ -192,11 +190,10 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { r->idStr.extract(0,r->idStr.length(),r->id,sizeof(r->id),US_INV); r->fType = URGN_TERRITORY; // Only temporary - figure out the real type later once the aliases are known. - Formattable result; - UErrorCode ps = U_ZERO_ERROR; - df->parse(r->idStr,result,ps); - if ( U_SUCCESS(ps) ) { - r->code = result.getLong(); // Convert string to number + int32_t pos = 0; + int32_t result = ICU_Utility::parseAsciiInteger(r->idStr, pos); + if (pos > 0) { + r->code = result; // Convert string to number uhash_iput(newNumericCodeMap.getAlias(),r->code,(void *)(r.getAlias()),&status); r->fType = URGN_SUBCONTINENT; } else { @@ -230,11 +227,10 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { aliasFromRegion->idStr.setTo(*aliasFromStr); aliasFromRegion->idStr.extract(0,aliasFromRegion->idStr.length(),aliasFromRegion->id,sizeof(aliasFromRegion->id),US_INV); uhash_put(newRegionIDMap.getAlias(),(void *)&(aliasFromRegion->idStr),(void *)aliasFromRegion,&status); - Formattable result; - UErrorCode ps = U_ZERO_ERROR; - df->parse(aliasFromRegion->idStr,result,ps); - if ( U_SUCCESS(ps) ) { - aliasFromRegion->code = result.getLong(); // Convert string to number + int32_t pos = 0; + int32_t result = ICU_Utility::parseAsciiInteger(aliasFromRegion->idStr, pos); + if ( pos > 0 ) { + aliasFromRegion->code = result; // Convert string to number uhash_iput(newNumericCodeMap.getAlias(),aliasFromRegion->code,(void *)aliasFromRegion,&status); } else { aliasFromRegion->code = -1; @@ -279,11 +275,10 @@ void U_CALLCONV Region::loadRegionData(UErrorCode &status) { Region *r = (Region *)uhash_get(newRegionIDMap.getAlias(),(void *)&codeMappingID); if ( r ) { - Formattable result; - UErrorCode ps = U_ZERO_ERROR; - df->parse(codeMappingNumber,result,ps); - if ( U_SUCCESS(ps) ) { - r->code = result.getLong(); // Convert string to number + int32_t pos = 0; + int32_t result = ICU_Utility::parseAsciiInteger(codeMappingNumber, pos); + if ( pos > 0 ) { + r->code = result; // Convert string to number uhash_iput(newNumericCodeMap.getAlias(),r->code,(void *)r,&status); } LocalPointer code3(new UnicodeString(codeMapping3Letter), status); @@ -516,15 +511,8 @@ Region::getInstance (int32_t code, UErrorCode &status) { Region *r = (Region *)uhash_iget(numericCodeMap,code); if ( !r ) { // Just in case there's an alias that's numeric, try to find it. - UnicodeString pat = UNICODE_STRING_SIMPLE("0"); - LocalPointer df(new DecimalFormat(pat,status), status); - if( U_FAILURE(status) ) { - return NULL; - } UnicodeString id; - id.remove(); - FieldPosition posIter; - df->format(code,id, posIter, status); + ICU_Utility::appendNumber(id, code, 10, 1); r = (Region *)uhash_get(regionAliases,&id); } diff --git a/deps/icu-small/source/i18n/reldatefmt.cpp b/deps/icu-small/source/i18n/reldatefmt.cpp index cda2564b9a0539..f2568a858d1d20 100644 --- a/deps/icu-small/source/i18n/reldatefmt.cpp +++ b/deps/icu-small/source/i18n/reldatefmt.cpp @@ -43,7 +43,7 @@ #include "standardplural.h" #include "unifiedcache.h" #include "util.h" -#include "number_stringbuilder.h" +#include "formatted_string_builder.h" #include "number_utypes.h" #include "number_modifiers.h" #include "formattedval_impl.h" @@ -315,6 +315,10 @@ struct RelDateTimeFmtDataSink : public ResourceSink { return UDAT_ABSOLUTE_FRIDAY; case SATURDAY: return UDAT_ABSOLUTE_SATURDAY; + case HOUR: + return UDAT_ABSOLUTE_HOUR; + case MINUTE: + return UDAT_ABSOLUTE_MINUTE; default: return -1; } @@ -725,14 +729,14 @@ const RelativeDateTimeCacheData *LocaleCacheKey::crea static constexpr number::impl::Field kRDTNumericField - = number::impl::NumFieldUtils::compress(); + = StringBuilderFieldUtils::compress(); static constexpr number::impl::Field kRDTLiteralField - = number::impl::NumFieldUtils::compress(); + = StringBuilderFieldUtils::compress(); -class FormattedRelativeDateTimeData : public FormattedValueNumberStringBuilderImpl { +class FormattedRelativeDateTimeData : public FormattedValueStringBuilderImpl { public: - FormattedRelativeDateTimeData() : FormattedValueNumberStringBuilderImpl(kRDTNumericField) {} + FormattedRelativeDateTimeData() : FormattedValueStringBuilderImpl(kRDTNumericField) {} virtual ~FormattedRelativeDateTimeData(); }; @@ -1157,6 +1161,8 @@ void RelativeDateTimeFormatter::formatRelativeImpl( case UDAT_REL_UNIT_THURSDAY: absunit = UDAT_ABSOLUTE_THURSDAY; break; case UDAT_REL_UNIT_FRIDAY: absunit = UDAT_ABSOLUTE_FRIDAY; break; case UDAT_REL_UNIT_SATURDAY: absunit = UDAT_ABSOLUTE_SATURDAY; break; + case UDAT_REL_UNIT_HOUR: absunit = UDAT_ABSOLUTE_HOUR; break; + case UDAT_REL_UNIT_MINUTE: absunit = UDAT_ABSOLUTE_MINUTE; break; default: break; } if (direction != UDAT_DIRECTION_COUNT && absunit != UDAT_ABSOLUTE_UNIT_COUNT) { @@ -1184,7 +1190,7 @@ UnicodeString& RelativeDateTimeFormatter::adjustForContext(UnicodeString &str) c // Must guarantee that one thread at a time accesses the shared break // iterator. - static icu::UMutex gBrkIterMutex = U_MUTEX_INITIALIZER; + static UMutex gBrkIterMutex; Mutex lock(&gBrkIterMutex); str.toTitle( fOptBreakIterator->get(), diff --git a/deps/icu-small/source/i18n/reldtfmt.cpp b/deps/icu-small/source/i18n/reldtfmt.cpp index 753672d905f16b..c74c30c20ca383 100644 --- a/deps/icu-small/source/i18n/reldtfmt.cpp +++ b/deps/icu-small/source/i18n/reldtfmt.cpp @@ -51,7 +51,7 @@ RelativeDateFormat::RelativeDateFormat(const RelativeDateFormat& other) : fCapitalizationBrkIter(NULL) { if(other.fDateTimeFormatter != NULL) { - fDateTimeFormatter = (SimpleDateFormat*)other.fDateTimeFormatter->clone(); + fDateTimeFormatter = other.fDateTimeFormatter->clone(); } if(other.fCombinedFormat != NULL) { fCombinedFormat = new SimpleFormatter(*other.fCombinedFormat); @@ -131,7 +131,7 @@ RelativeDateFormat::~RelativeDateFormat() { } -Format* RelativeDateFormat::clone(void) const { +RelativeDateFormat* RelativeDateFormat::clone() const { return new RelativeDateFormat(*this); } diff --git a/deps/icu-small/source/i18n/reldtfmt.h b/deps/icu-small/source/i18n/reldtfmt.h index 0403da11efda76..b36171ce1c6b55 100644 --- a/deps/icu-small/source/i18n/reldtfmt.h +++ b/deps/icu-small/source/i18n/reldtfmt.h @@ -71,7 +71,7 @@ class RelativeDateFormat : public DateFormat { * @return A copy of the object. * @internal ICU 3.8 */ - virtual Format* clone(void) const; + virtual RelativeDateFormat* clone() const; /** * Return true if the given Format objects are semantically equal. Objects diff --git a/deps/icu-small/source/i18n/rematch.cpp b/deps/icu-small/source/i18n/rematch.cpp index 3b8d2333d82098..d9af2b3ddaa77e 100644 --- a/deps/icu-small/source/i18n/rematch.cpp +++ b/deps/icu-small/source/i18n/rematch.cpp @@ -2069,7 +2069,7 @@ int32_t RegexMatcher::split(UText *input, // if (U_FAILURE(status)) { return 0; - }; + } if (destCapacity < 1) { status = U_ILLEGAL_ARGUMENT_ERROR; @@ -3805,11 +3805,13 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { case URX_LA_START: { - // Entering a lookahead block. + // Entering a look around block. // Save Stack Ptr, Input Pos. - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+3fDataSize); fData[opValue] = fStack->size(); fData[opValue+1] = fp->fInputIdx; + fData[opValue+2] = fActiveStart; + fData[opValue+3] = fActiveLimit; fActiveStart = fLookStart; // Set the match region change for fActiveLimit = fLookLimit; // transparent bounds. } @@ -3819,7 +3821,7 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { { // Leaving a look-ahead block. // restore Stack Ptr, Input Pos to positions they had on entry to block. - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+3fDataSize); int32_t stackSize = fStack->size(); int32_t newStackSize =(int32_t)fData[opValue]; U_ASSERT(stackSize >= newStackSize); @@ -3839,8 +3841,10 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { // Restore the active region bounds in the input string; they may have // been changed because of transparent bounds on a Region. - fActiveStart = fRegionStart; - fActiveLimit = fRegionLimit; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); } break; @@ -3916,17 +3920,19 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { case URX_LB_START: { // Entering a look-behind block. - // Save Stack Ptr, Input Pos. + // Save Stack Ptr, Input Pos and active input region. // TODO: implement transparent bounds. Ticket #6067 - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+4fDataSize); fData[opValue] = fStack->size(); fData[opValue+1] = fp->fInputIdx; - // Init the variable containing the start index for attempted matches. - fData[opValue+2] = -1; // Save input string length, then reset to pin any matches to end at // the current position. + fData[opValue+2] = fActiveStart; fData[opValue+3] = fActiveLimit; + fActiveStart = fRegionStart; fActiveLimit = fp->fInputIdx; + // Init the variable containing the start index for attempted matches. + fData[opValue+4] = -1; } break; @@ -3949,8 +3955,8 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { U_ASSERT(minML >= 0); // Fetch (from data) the last input index where a match was attempted. - U_ASSERT(opValue>=0 && opValue+1fDataSize); - int64_t &lbStartIdx = fData[opValue+2]; + U_ASSERT(opValue>=0 && opValue+4fDataSize); + int64_t &lbStartIdx = fData[opValue+4]; if (lbStartIdx < 0) { // First time through loop. lbStartIdx = fp->fInputIdx - minML; @@ -3976,10 +3982,10 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { // getting a match. Backtrack out, and out of the // Look Behind altogether. fp = (REStackFrame *)fStack->popFrame(fFrameSize); - int64_t restoreInputLen = fData[opValue+3]; - U_ASSERT(restoreInputLen >= fActiveLimit); - U_ASSERT(restoreInputLen <= fInputLength); - fActiveLimit = restoreInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); break; } @@ -3993,7 +3999,7 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { case URX_LB_END: // End of a look-behind block, after a successful match. { - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+4fDataSize); if (fp->fInputIdx != fActiveLimit) { // The look-behind expression matched, but the match did not // extend all the way to the point that we are looking behind from. @@ -4004,13 +4010,13 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { break; } - // Look-behind match is good. Restore the orignal input string length, + // Look-behind match is good. Restore the orignal input string region, // which had been truncated to pin the end of the lookbehind match to the // position being looked-behind. - int64_t originalInputLen = fData[opValue+3]; - U_ASSERT(originalInputLen >= fActiveLimit); - U_ASSERT(originalInputLen <= fInputLength); - fActiveLimit = originalInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); } break; @@ -4035,8 +4041,8 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { U_ASSERT(continueLoc > fp->fPatIdx); // Fetch (from data) the last input index where a match was attempted. - U_ASSERT(opValue>=0 && opValue+1fDataSize); - int64_t &lbStartIdx = fData[opValue+2]; + U_ASSERT(opValue>=0 && opValue+4fDataSize); + int64_t &lbStartIdx = fData[opValue+4]; if (lbStartIdx < 0) { // First time through loop. lbStartIdx = fp->fInputIdx - minML; @@ -4061,10 +4067,10 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { // We have tried all potential match starting points without // getting a match, which means that the negative lookbehind as // a whole has succeeded. Jump forward to the continue location - int64_t restoreInputLen = fData[opValue+3]; - U_ASSERT(restoreInputLen >= fActiveLimit); - U_ASSERT(restoreInputLen <= fInputLength); - fActiveLimit = restoreInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); fp->fPatIdx = continueLoc; break; } @@ -4079,7 +4085,7 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { case URX_LBN_END: // End of a negative look-behind block, after a successful match. { - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+4fDataSize); if (fp->fInputIdx != fActiveLimit) { // The look-behind expression matched, but the match did not // extend all the way to the point that we are looking behind from. @@ -4096,10 +4102,10 @@ void RegexMatcher::MatchAt(int64_t startIdx, UBool toEnd, UErrorCode &status) { // Restore the orignal input string length, which had been truncated // inorder to pin the end of the lookbehind match // to the position being looked-behind. - int64_t originalInputLen = fData[opValue+3]; - U_ASSERT(originalInputLen >= fActiveLimit); - U_ASSERT(originalInputLen <= fInputLength); - fActiveLimit = originalInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); // Restore original stack position, discarding any state saved // by the successful pattern match. @@ -5336,11 +5342,13 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu case URX_LA_START: { - // Entering a lookahead block. + // Entering a look around block. // Save Stack Ptr, Input Pos. - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+3fDataSize); fData[opValue] = fStack->size(); fData[opValue+1] = fp->fInputIdx; + fData[opValue+2] = fActiveStart; + fData[opValue+3] = fActiveLimit; fActiveStart = fLookStart; // Set the match region change for fActiveLimit = fLookLimit; // transparent bounds. } @@ -5348,9 +5356,9 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu case URX_LA_END: { - // Leaving a look-ahead block. + // Leaving a look around block. // restore Stack Ptr, Input Pos to positions they had on entry to block. - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+3fDataSize); int32_t stackSize = fStack->size(); int32_t newStackSize = (int32_t)fData[opValue]; U_ASSERT(stackSize >= newStackSize); @@ -5370,8 +5378,10 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu // Restore the active region bounds in the input string; they may have // been changed because of transparent bounds on a Region. - fActiveStart = fRegionStart; - fActiveLimit = fRegionLimit; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); } break; @@ -5434,17 +5444,19 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu case URX_LB_START: { // Entering a look-behind block. - // Save Stack Ptr, Input Pos. + // Save Stack Ptr, Input Pos and active input region. // TODO: implement transparent bounds. Ticket #6067 - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+4fDataSize); fData[opValue] = fStack->size(); fData[opValue+1] = fp->fInputIdx; - // Init the variable containing the start index for attempted matches. - fData[opValue+2] = -1; // Save input string length, then reset to pin any matches to end at // the current position. + fData[opValue+2] = fActiveStart; fData[opValue+3] = fActiveLimit; + fActiveStart = fRegionStart; fActiveLimit = fp->fInputIdx; + // Init the variable containing the start index for attempted matches. + fData[opValue+4] = -1; } break; @@ -5462,8 +5474,8 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu U_ASSERT(minML >= 0); // Fetch (from data) the last input index where a match was attempted. - U_ASSERT(opValue>=0 && opValue+1fDataSize); - int64_t &lbStartIdx = fData[opValue+2]; + U_ASSERT(opValue>=0 && opValue+4fDataSize); + int64_t &lbStartIdx = fData[opValue+4]; if (lbStartIdx < 0) { // First time through loop. lbStartIdx = fp->fInputIdx - minML; @@ -5485,10 +5497,10 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu // getting a match. Backtrack out, and out of the // Look Behind altogether. fp = (REStackFrame *)fStack->popFrame(fFrameSize); - int64_t restoreInputLen = fData[opValue+3]; - U_ASSERT(restoreInputLen >= fActiveLimit); - U_ASSERT(restoreInputLen <= fInputLength); - fActiveLimit = restoreInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); break; } @@ -5502,7 +5514,7 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu case URX_LB_END: // End of a look-behind block, after a successful match. { - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+4fDataSize); if (fp->fInputIdx != fActiveLimit) { // The look-behind expression matched, but the match did not // extend all the way to the point that we are looking behind from. @@ -5513,13 +5525,13 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu break; } - // Look-behind match is good. Restore the orignal input string length, + // Look-behind match is good. Restore the orignal input string region, // which had been truncated to pin the end of the lookbehind match to the // position being looked-behind. - int64_t originalInputLen = fData[opValue+3]; - U_ASSERT(originalInputLen >= fActiveLimit); - U_ASSERT(originalInputLen <= fInputLength); - fActiveLimit = originalInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); } break; @@ -5539,8 +5551,8 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu U_ASSERT(continueLoc > fp->fPatIdx); // Fetch (from data) the last input index where a match was attempted. - U_ASSERT(opValue>=0 && opValue+1fDataSize); - int64_t &lbStartIdx = fData[opValue+2]; + U_ASSERT(opValue>=0 && opValue+4fDataSize); + int64_t &lbStartIdx = fData[opValue+4]; if (lbStartIdx < 0) { // First time through loop. lbStartIdx = fp->fInputIdx - minML; @@ -5561,10 +5573,10 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu // We have tried all potential match starting points without // getting a match, which means that the negative lookbehind as // a whole has succeeded. Jump forward to the continue location - int64_t restoreInputLen = fData[opValue+3]; - U_ASSERT(restoreInputLen >= fActiveLimit); - U_ASSERT(restoreInputLen <= fInputLength); - fActiveLimit = restoreInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); fp->fPatIdx = continueLoc; break; } @@ -5579,7 +5591,7 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu case URX_LBN_END: // End of a negative look-behind block, after a successful match. { - U_ASSERT(opValue>=0 && opValue+1fDataSize); + U_ASSERT(opValue>=0 && opValue+4fDataSize); if (fp->fInputIdx != fActiveLimit) { // The look-behind expression matched, but the match did not // extend all the way to the point that we are looking behind from. @@ -5596,10 +5608,10 @@ void RegexMatcher::MatchChunkAt(int32_t startIdx, UBool toEnd, UErrorCode &statu // Restore the orignal input string length, which had been truncated // inorder to pin the end of the lookbehind match // to the position being looked-behind. - int64_t originalInputLen = fData[opValue+3]; - U_ASSERT(originalInputLen >= fActiveLimit); - U_ASSERT(originalInputLen <= fInputLength); - fActiveLimit = originalInputLen; + fActiveStart = fData[opValue+2]; + fActiveLimit = fData[opValue+3]; + U_ASSERT(fActiveStart >= 0); + U_ASSERT(fActiveLimit <= fInputLength); // Restore original stack position, discarding any state saved // by the successful pattern match. diff --git a/deps/icu-small/source/i18n/remtrans.cpp b/deps/icu-small/source/i18n/remtrans.cpp index 70a6ed3935b579..03b878575ca86c 100644 --- a/deps/icu-small/source/i18n/remtrans.cpp +++ b/deps/icu-small/source/i18n/remtrans.cpp @@ -48,10 +48,10 @@ RemoveTransliterator::RemoveTransliterator() : Transliterator(UnicodeString(TRUE RemoveTransliterator::~RemoveTransliterator() {} -Transliterator* RemoveTransliterator::clone(void) const { - Transliterator* result = new RemoveTransliterator(); +RemoveTransliterator* RemoveTransliterator::clone() const { + RemoveTransliterator* result = new RemoveTransliterator(); if (result != NULL && getFilter() != 0) { - result->adoptFilter((UnicodeFilter*)(getFilter()->clone())); + result->adoptFilter(getFilter()->clone()); } return result; } diff --git a/deps/icu-small/source/i18n/remtrans.h b/deps/icu-small/source/i18n/remtrans.h index ed038d5f2fe0d5..13de01594a3fd9 100644 --- a/deps/icu-small/source/i18n/remtrans.h +++ b/deps/icu-small/source/i18n/remtrans.h @@ -47,7 +47,7 @@ class RemoveTransliterator : public Transliterator { * Transliterator API. * @return A copy of the object. */ - virtual Transliterator* clone(void) const; + virtual RemoveTransliterator* clone() const; /** * Implements {@link Transliterator#handleTransliterate}. diff --git a/deps/icu-small/source/i18n/repattrn.cpp b/deps/icu-small/source/i18n/repattrn.cpp index b03873066c9016..6976056dc1f6e4 100644 --- a/deps/icu-small/source/i18n/repattrn.cpp +++ b/deps/icu-small/source/i18n/repattrn.cpp @@ -646,7 +646,7 @@ int32_t RegexPattern::split(const UnicodeString &input, { if (U_FAILURE(status)) { return 0; - }; + } RegexMatcher m(this); int32_t r = 0; @@ -667,7 +667,7 @@ int32_t RegexPattern::split(UText *input, { if (U_FAILURE(status)) { return 0; - }; + } RegexMatcher m(this); int32_t r = 0; diff --git a/deps/icu-small/source/i18n/rulebasedcollator.cpp b/deps/icu-small/source/i18n/rulebasedcollator.cpp index 92fa5385971889..60acf17815a5ee 100644 --- a/deps/icu-small/source/i18n/rulebasedcollator.cpp +++ b/deps/icu-small/source/i18n/rulebasedcollator.cpp @@ -220,7 +220,7 @@ RuleBasedCollator::adoptTailoring(CollationTailoring *t, UErrorCode &errorCode) actualLocaleIsSameAsValid = FALSE; } -Collator * +RuleBasedCollator * RuleBasedCollator::clone() const { return new RuleBasedCollator(*this); } diff --git a/deps/icu-small/source/i18n/scientificnumberformatter.cpp b/deps/icu-small/source/i18n/scientificnumberformatter.cpp index 03d98dd6e100e2..6c2cb3aeed2743 100644 --- a/deps/icu-small/source/i18n/scientificnumberformatter.cpp +++ b/deps/icu-small/source/i18n/scientificnumberformatter.cpp @@ -121,7 +121,7 @@ ScientificNumberFormatter *ScientificNumberFormatter::createInstance( return result; } -ScientificNumberFormatter::Style *ScientificNumberFormatter::SuperscriptStyle::clone() const { +ScientificNumberFormatter::SuperscriptStyle *ScientificNumberFormatter::SuperscriptStyle::clone() const { return new ScientificNumberFormatter::SuperscriptStyle(*this); } @@ -195,7 +195,7 @@ UnicodeString &ScientificNumberFormatter::SuperscriptStyle::format( return appendTo; } -ScientificNumberFormatter::Style *ScientificNumberFormatter::MarkupStyle::clone() const { +ScientificNumberFormatter::MarkupStyle *ScientificNumberFormatter::MarkupStyle::clone() const { return new ScientificNumberFormatter::MarkupStyle(*this); } diff --git a/deps/icu-small/source/i18n/selfmt.cpp b/deps/icu-small/source/i18n/selfmt.cpp index 29aee3645751f2..47e53d75dec36f 100644 --- a/deps/icu-small/source/i18n/selfmt.cpp +++ b/deps/icu-small/source/i18n/selfmt.cpp @@ -151,7 +151,7 @@ int32_t SelectFormat::findSubMessage(const MessagePattern& pattern, int32_t part return msgStart; } -Format* SelectFormat::clone() const +SelectFormat* SelectFormat::clone() const { return new SelectFormat(*this); } diff --git a/deps/icu-small/source/i18n/simpletz.cpp b/deps/icu-small/source/i18n/simpletz.cpp index 1af5292a823324..12c220595cd2c1 100644 --- a/deps/icu-small/source/i18n/simpletz.cpp +++ b/deps/icu-small/source/i18n/simpletz.cpp @@ -33,6 +33,7 @@ #include "unicode/gregocal.h" #include "unicode/smpdtfmt.h" +#include "cmemory.h" #include "gregoimp.h" #include "umutex.h" @@ -242,7 +243,7 @@ SimpleTimeZone::operator==(const TimeZone& that) const // ------------------------------------- // Called by TimeZone::createDefault() inside a Mutex - be careful. -TimeZone* +SimpleTimeZone* SimpleTimeZone::clone() const { return new SimpleTimeZone(*this); @@ -1083,7 +1084,7 @@ SimpleTimeZone::checkTransitionRules(UErrorCode& status) const { if (U_FAILURE(status)) { return; } - static UMutex gLock = U_MUTEX_INITIALIZER; + static UMutex gLock; umtx_lock(&gLock); if (!transitionRulesInitialized) { SimpleTimeZone *ncThis = const_cast(this); diff --git a/deps/icu-small/source/i18n/smpdtfmt.cpp b/deps/icu-small/source/i18n/smpdtfmt.cpp index e67c4538287b9e..5fcbb5875b2bfb 100644 --- a/deps/icu-small/source/i18n/smpdtfmt.cpp +++ b/deps/icu-small/source/i18n/smpdtfmt.cpp @@ -230,10 +230,7 @@ static const int32_t gFieldRangeBias[] = { static const int32_t HEBREW_CAL_CUR_MILLENIUM_START_YEAR = 5000; static const int32_t HEBREW_CAL_CUR_MILLENIUM_END_YEAR = 6000; -static UMutex *LOCK() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex LOCK; UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SimpleDateFormat) @@ -623,7 +620,7 @@ SimpleDateFormat& SimpleDateFormat::operator=(const SimpleDateFormat& other) //---------------------------------------------------------------------- -Format* +SimpleDateFormat* SimpleDateFormat::clone() const { return new SimpleDateFormat(*this); @@ -1223,10 +1220,14 @@ _appendSymbolWithMonthPattern(UnicodeString& dst, int32_t value, const UnicodeSt //---------------------------------------------------------------------- static number::LocalizedNumberFormatter* -createFastFormatter(const DecimalFormat* df, int32_t minInt, int32_t maxInt) { - return new number::LocalizedNumberFormatter( - df->toNumberFormatter() - .integerWidth(number::IntegerWidth::zeroFillTo(minInt).truncateAt(maxInt))); +createFastFormatter(const DecimalFormat* df, int32_t minInt, int32_t maxInt, UErrorCode& status) { + const number::LocalizedNumberFormatter* lnfBase = df->toNumberFormatter(status); + if (U_FAILURE(status)) { + return nullptr; + } + return lnfBase->integerWidth( + number::IntegerWidth::zeroFillTo(minInt).truncateAt(maxInt) + ).clone().orphan(); } void SimpleDateFormat::initFastNumberFormatters(UErrorCode& status) { @@ -1237,11 +1238,11 @@ void SimpleDateFormat::initFastNumberFormatters(UErrorCode& status) { if (df == nullptr) { return; } - fFastNumberFormatters[SMPDTFMT_NF_1x10] = createFastFormatter(df, 1, 10); - fFastNumberFormatters[SMPDTFMT_NF_2x10] = createFastFormatter(df, 2, 10); - fFastNumberFormatters[SMPDTFMT_NF_3x10] = createFastFormatter(df, 3, 10); - fFastNumberFormatters[SMPDTFMT_NF_4x10] = createFastFormatter(df, 4, 10); - fFastNumberFormatters[SMPDTFMT_NF_2x2] = createFastFormatter(df, 2, 2); + fFastNumberFormatters[SMPDTFMT_NF_1x10] = createFastFormatter(df, 1, 10, status); + fFastNumberFormatters[SMPDTFMT_NF_2x10] = createFastFormatter(df, 2, 10, status); + fFastNumberFormatters[SMPDTFMT_NF_3x10] = createFastFormatter(df, 3, 10, status); + fFastNumberFormatters[SMPDTFMT_NF_4x10] = createFastFormatter(df, 4, 10, status); + fFastNumberFormatters[SMPDTFMT_NF_2x2] = createFastFormatter(df, 2, 2, status); } void SimpleDateFormat::freeFastNumberFormatters() { @@ -1266,14 +1267,14 @@ SimpleDateFormat::initNumberFormatters(const Locale &locale,UErrorCode &status) if ( fDateOverride.isBogus() && fTimeOverride.isBogus() ) { return; } - umtx_lock(LOCK()); + umtx_lock(&LOCK); if (fSharedNumberFormatters == NULL) { fSharedNumberFormatters = allocSharedNumberFormatters(); if (fSharedNumberFormatters == NULL) { status = U_MEMORY_ALLOCATION_ERROR; } } - umtx_unlock(LOCK()); + umtx_unlock(&LOCK); if (U_FAILURE(status)) { return; @@ -1980,9 +1981,11 @@ SimpleDateFormat::subFormat(UnicodeString &appendTo, break; } if (titlecase) { + BreakIterator* const mutableCapitalizationBrkIter = fCapitalizationBrkIter->clone(); UnicodeString firstField(appendTo, beginOffset); - firstField.toTitle(fCapitalizationBrkIter, fLocale, U_TITLECASE_NO_LOWERCASE | U_TITLECASE_NO_BREAK_ADJUSTMENT); + firstField.toTitle(mutableCapitalizationBrkIter, fLocale, U_TITLECASE_NO_LOWERCASE | U_TITLECASE_NO_BREAK_ADJUSTMENT); appendTo.replaceBetween(beginOffset, appendTo.length(), firstField); + delete mutableCapitalizationBrkIter; } } #endif @@ -2107,7 +2110,7 @@ SimpleDateFormat::zeroPaddingNumber( // Fall back to slow path (clone and mutate the NumberFormat) if (currentNumberFormat != nullptr) { FieldPosition pos(FieldPosition::DONT_CARE); - LocalPointer nf(dynamic_cast(currentNumberFormat->clone())); + LocalPointer nf(currentNumberFormat->clone()); nf->setMinimumIntegerDigits(minDigits); nf->setMaximumIntegerDigits(maxDigits); nf->format(value, appendTo, pos); // 3rd arg is there to speed up processing @@ -3770,7 +3773,7 @@ void SimpleDateFormat::parseInt(const UnicodeString& text, auto* fmtAsDF = dynamic_cast(fmt); LocalPointer df; if (!allowNegative && fmtAsDF != nullptr) { - df.adoptInstead(dynamic_cast(fmtAsDF->clone())); + df.adoptInstead(fmtAsDF->clone()); if (df.isNull()) { // Memory allocation error return; @@ -3901,11 +3904,11 @@ SimpleDateFormat::applyPattern(const UnicodeString& pattern) } else if (fDateOverride.isBogus() && fHasHanYearChar) { // No current override (=> no Gannen numbering) but new pattern needs it; // use procedures from initNUmberFormatters / adoptNumberFormat - umtx_lock(LOCK()); + umtx_lock(&LOCK); if (fSharedNumberFormatters == NULL) { fSharedNumberFormatters = allocSharedNumberFormatters(); } - umtx_unlock(LOCK()); + umtx_unlock(&LOCK); if (fSharedNumberFormatters != NULL) { Locale ovrLoc(fLocale.getLanguage(),fLocale.getCountry(),fLocale.getVariant(),"numbers=jpanyear"); UErrorCode status = U_ZERO_ERROR; @@ -3998,6 +4001,7 @@ void SimpleDateFormat::adoptCalendar(Calendar* calendarToAdopt) DateFormatSymbols *newSymbols = DateFormatSymbols::createForLocale(calLocale, status); if (U_FAILURE(status)) { + delete calendarToAdopt; return; } DateFormat::adoptCalendar(calendarToAdopt); @@ -4237,7 +4241,7 @@ SimpleDateFormat::skipUWhiteSpace(const UnicodeString& text, int32_t pos) const TimeZoneFormat * SimpleDateFormat::tzFormat(UErrorCode &status) const { if (fTimeZoneFormat == NULL) { - umtx_lock(LOCK()); + umtx_lock(&LOCK); { if (fTimeZoneFormat == NULL) { TimeZoneFormat *tzfmt = TimeZoneFormat::createInstance(fLocale, status); @@ -4248,7 +4252,7 @@ SimpleDateFormat::tzFormat(UErrorCode &status) const { const_cast(this)->fTimeZoneFormat = tzfmt; } } - umtx_unlock(LOCK()); + umtx_unlock(&LOCK); } return fTimeZoneFormat; } diff --git a/deps/icu-small/source/i18n/numparse_stringsegment.cpp b/deps/icu-small/source/i18n/string_segment.cpp similarity index 96% rename from deps/icu-small/source/i18n/numparse_stringsegment.cpp rename to deps/icu-small/source/i18n/string_segment.cpp index 3db4fe618a603a..5d19ac57f5e0d1 100644 --- a/deps/icu-small/source/i18n/numparse_stringsegment.cpp +++ b/deps/icu-small/source/i18n/string_segment.cpp @@ -10,14 +10,12 @@ #define UNISTR_FROM_STRING_EXPLICIT #include "numparse_types.h" -#include "numparse_stringsegment.h" +#include "string_segment.h" #include "putilimp.h" #include "unicode/utf16.h" #include "unicode/uniset.h" -using namespace icu; -using namespace icu::numparse; -using namespace icu::numparse::impl; +U_NAMESPACE_BEGIN StringSegment::StringSegment(const UnicodeString& str, bool ignoreCase) @@ -143,4 +141,5 @@ bool StringSegment::operator==(const UnicodeString& other) const { } +U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/string_segment.h b/deps/icu-small/source/i18n/string_segment.h new file mode 100644 index 00000000000000..b581f7e57599eb --- /dev/null +++ b/deps/icu-small/source/i18n/string_segment.h @@ -0,0 +1,134 @@ +// © 2018 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +#include "unicode/utypes.h" + +#if !UCONFIG_NO_FORMATTING +#ifndef __NUMPARSE_STRINGSEGMENT_H__ +#define __NUMPARSE_STRINGSEGMENT_H__ + +#include "unicode/unistr.h" +#include "unicode/uniset.h" + +U_NAMESPACE_BEGIN + + +/** + * A mutable UnicodeString wrapper with a variable offset and length and + * support for case folding. The charAt, length, and subSequence methods all + * operate relative to the fixed offset into the UnicodeString. + * + * Intended to be useful for parsing. + * + * CAUTION: Since this class is mutable, it must not be used anywhere that an + * immutable object is required, like in a cache or as the key of a hash map. + * + * @author sffc (Shane Carr) + */ +// Exported as U_I18N_API for tests +class U_I18N_API StringSegment : public UMemory { + public: + StringSegment(const UnicodeString& str, bool ignoreCase); + + int32_t getOffset() const; + + void setOffset(int32_t start); + + /** + * Equivalent to setOffset(getOffset()+delta). + * + *

+ * This method is usually called by a Matcher to register that a char was consumed. If the char is + * strong (it usually is, except for things like whitespace), follow this with a call to + * {@link ParsedNumber#setCharsConsumed}. For more information on strong chars, see that method. + */ + void adjustOffset(int32_t delta); + + /** + * Adjusts the offset by the width of the current code point, either 1 or 2 chars. + */ + void adjustOffsetByCodePoint(); + + void setLength(int32_t length); + + void resetLength(); + + int32_t length() const; + + char16_t charAt(int32_t index) const; + + UChar32 codePointAt(int32_t index) const; + + UnicodeString toUnicodeString() const; + + const UnicodeString toTempUnicodeString() const; + + /** + * Returns the first code point in the string segment, or -1 if the string starts with an invalid + * code point. + * + *

+ * Important: Most of the time, you should use {@link #startsWith}, which handles case + * folding logic, instead of this method. + */ + UChar32 getCodePoint() const; + + /** + * Returns true if the first code point of this StringSegment equals the given code point. + * + *

+ * This method will perform case folding if case folding is enabled for the parser. + */ + bool startsWith(UChar32 otherCp) const; + + /** + * Returns true if the first code point of this StringSegment is in the given UnicodeSet. + */ + bool startsWith(const UnicodeSet& uniset) const; + + /** + * Returns true if there is at least one code point of overlap between this StringSegment and the + * given UnicodeString. + */ + bool startsWith(const UnicodeString& other) const; + + /** + * Returns the length of the prefix shared by this StringSegment and the given UnicodeString. For + * example, if this string segment is "aab", and the char sequence is "aac", this method returns 2, + * since the first 2 characters are the same. + * + *

+ * This method only returns offsets along code point boundaries. + * + *

+ * This method will perform case folding if case folding was enabled in the constructor. + * + *

+ * IMPORTANT: The given UnicodeString must not be empty! It is the caller's responsibility to check. + */ + int32_t getCommonPrefixLength(const UnicodeString& other); + + /** + * Like {@link #getCommonPrefixLength}, but never performs case folding, even if case folding is + * enabled for the parser. + */ + int32_t getCaseSensitivePrefixLength(const UnicodeString& other); + + bool operator==(const UnicodeString& other) const; + + private: + const UnicodeString& fStr; + int32_t fStart; + int32_t fEnd; + bool fFoldCase; + + int32_t getPrefixLengthInternal(const UnicodeString& other, bool foldCase); + + static bool codePointsEqual(UChar32 cp1, UChar32 cp2, bool foldCase); +}; + + +U_NAMESPACE_END + +#endif //__NUMPARSE_STRINGSEGMENT_H__ +#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/strmatch.cpp b/deps/icu-small/source/i18n/strmatch.cpp index d5b018aa6b62b6..97c0fba6f1ddb7 100644 --- a/deps/icu-small/source/i18n/strmatch.cpp +++ b/deps/icu-small/source/i18n/strmatch.cpp @@ -58,7 +58,7 @@ StringMatcher::~StringMatcher() { /** * Implement UnicodeFunctor */ -UnicodeFunctor* StringMatcher::clone() const { +StringMatcher* StringMatcher::clone() const { return new StringMatcher(*this); } diff --git a/deps/icu-small/source/i18n/strmatch.h b/deps/icu-small/source/i18n/strmatch.h index 7152a24a0765e4..09d04ede13e61a 100644 --- a/deps/icu-small/source/i18n/strmatch.h +++ b/deps/icu-small/source/i18n/strmatch.h @@ -78,7 +78,7 @@ class StringMatcher : public UnicodeFunctor, public UnicodeMatcher, public Unico * Implement UnicodeFunctor * @return a copy of the object. */ - virtual UnicodeFunctor* clone() const; + virtual StringMatcher* clone() const; /** * UnicodeFunctor API. Cast 'this' to a UnicodeMatcher* pointer diff --git a/deps/icu-small/source/i18n/strrepl.cpp b/deps/icu-small/source/i18n/strrepl.cpp index 132c844c2dff27..e9e71ee540606a 100644 --- a/deps/icu-small/source/i18n/strrepl.cpp +++ b/deps/icu-small/source/i18n/strrepl.cpp @@ -87,7 +87,7 @@ StringReplacer::~StringReplacer() { /** * Implement UnicodeFunctor */ -UnicodeFunctor* StringReplacer::clone() const { +StringReplacer* StringReplacer::clone() const { return new StringReplacer(*this); } diff --git a/deps/icu-small/source/i18n/strrepl.h b/deps/icu-small/source/i18n/strrepl.h index feec058152a8a3..7f74d0d94507f6 100644 --- a/deps/icu-small/source/i18n/strrepl.h +++ b/deps/icu-small/source/i18n/strrepl.h @@ -111,7 +111,7 @@ class StringReplacer : public UnicodeFunctor, public UnicodeReplacer { /** * Implement UnicodeFunctor */ - virtual UnicodeFunctor* clone() const; + virtual StringReplacer* clone() const; /** * UnicodeFunctor API. Cast 'this' to a UnicodeReplacer* pointer diff --git a/deps/icu-small/source/i18n/stsearch.cpp b/deps/icu-small/source/i18n/stsearch.cpp index bf4d80b6db8ed0..32481a14004075 100644 --- a/deps/icu-small/source/i18n/stsearch.cpp +++ b/deps/icu-small/source/i18n/stsearch.cpp @@ -282,7 +282,7 @@ void StringSearch::reset() usearch_reset(m_strsrch_); } -SearchIterator * StringSearch::safeClone(void) const +StringSearch * StringSearch::safeClone() const { UErrorCode status = U_ZERO_ERROR; StringSearch *result = new StringSearch(m_pattern_, m_text_, diff --git a/deps/icu-small/source/i18n/taiwncal.cpp b/deps/icu-small/source/i18n/taiwncal.cpp index e2757dbd550dd9..1a6a0e2e78d201 100644 --- a/deps/icu-small/source/i18n/taiwncal.cpp +++ b/deps/icu-small/source/i18n/taiwncal.cpp @@ -53,7 +53,7 @@ TaiwanCalendar& TaiwanCalendar::operator= ( const TaiwanCalendar& right) return *this; } -Calendar* TaiwanCalendar::clone(void) const +TaiwanCalendar* TaiwanCalendar::clone() const { return new TaiwanCalendar(*this); } diff --git a/deps/icu-small/source/i18n/taiwncal.h b/deps/icu-small/source/i18n/taiwncal.h index 99bbfb53f2b1ab..daadc124f40a18 100644 --- a/deps/icu-small/source/i18n/taiwncal.h +++ b/deps/icu-small/source/i18n/taiwncal.h @@ -91,7 +91,7 @@ class TaiwanCalendar : public GregorianCalendar { * @return return a polymorphic copy of this calendar. * @internal */ - virtual Calendar* clone(void) const; + virtual TaiwanCalendar* clone() const; public: /** diff --git a/deps/icu-small/source/i18n/timezone.cpp b/deps/icu-small/source/i18n/timezone.cpp index 70169b5c1f576d..b90b78614aa00f 100644 --- a/deps/icu-small/source/i18n/timezone.cpp +++ b/deps/icu-small/source/i18n/timezone.cpp @@ -527,6 +527,8 @@ TimeZone::detectHostTimeZone() // ------------------------------------- +static UMutex gDefaultZoneMutex; + /** * Initialize DEFAULT_ZONE from the system default time zone. * Upon return, DEFAULT_ZONE will not be NULL, unless operator new() @@ -536,6 +538,7 @@ static void U_CALLCONV initDefault() { ucln_i18n_registerCleanup(UCLN_I18N_TIMEZONE, timeZone_cleanup); + Mutex lock(&gDefaultZoneMutex); // If setDefault() has already been called we can skip getting the // default zone information from the system. if (DEFAULT_ZONE != NULL) { @@ -557,9 +560,6 @@ static void U_CALLCONV initDefault() TimeZone *default_zone = TimeZone::detectHostTimeZone(); - // The only way for DEFAULT_ZONE to be non-null at this point is if the user - // made a thread-unsafe call to setDefault() or adoptDefault() in another - // thread while this thread was doing something that required getting the default. U_ASSERT(DEFAULT_ZONE == NULL); DEFAULT_ZONE = default_zone; @@ -571,7 +571,10 @@ TimeZone* U_EXPORT2 TimeZone::createDefault() { umtx_initOnce(gDefaultZoneInitOnce, initDefault); - return (DEFAULT_ZONE != NULL) ? DEFAULT_ZONE->clone() : NULL; + { + Mutex lock(&gDefaultZoneMutex); + return (DEFAULT_ZONE != NULL) ? DEFAULT_ZONE->clone() : NULL; + } } // ------------------------------------- @@ -581,9 +584,12 @@ TimeZone::adoptDefault(TimeZone* zone) { if (zone != NULL) { - TimeZone *old = DEFAULT_ZONE; - DEFAULT_ZONE = zone; - delete old; + { + Mutex lock(&gDefaultZoneMutex); + TimeZone *old = DEFAULT_ZONE; + DEFAULT_ZONE = zone; + delete old; + } ucln_i18n_registerCleanup(UCLN_I18N_TIMEZONE, timeZone_cleanup); } } diff --git a/deps/icu-small/source/i18n/titletrn.cpp b/deps/icu-small/source/i18n/titletrn.cpp index 4e75c824a0f7f1..a6beac214915cc 100644 --- a/deps/icu-small/source/i18n/titletrn.cpp +++ b/deps/icu-small/source/i18n/titletrn.cpp @@ -60,7 +60,7 @@ TitlecaseTransliterator::TitlecaseTransliterator(const TitlecaseTransliterator& /** * Transliterator API. */ -Transliterator* TitlecaseTransliterator::clone(void) const { +TitlecaseTransliterator* TitlecaseTransliterator::clone() const { return new TitlecaseTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/titletrn.h b/deps/icu-small/source/i18n/titletrn.h index 166378fe9da5c2..4e45ac6f81fabc 100644 --- a/deps/icu-small/source/i18n/titletrn.h +++ b/deps/icu-small/source/i18n/titletrn.h @@ -52,7 +52,7 @@ class TitlecaseTransliterator : public CaseMapTransliterator { * Transliterator API. * @return a copy of the object. */ - virtual Transliterator* clone(void) const; + virtual TitlecaseTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/tmunit.cpp b/deps/icu-small/source/i18n/tmunit.cpp index 3e980105153da5..b96dfbb5726b6f 100644 --- a/deps/icu-small/source/i18n/tmunit.cpp +++ b/deps/icu-small/source/i18n/tmunit.cpp @@ -102,7 +102,7 @@ TimeUnit::TimeUnit(const TimeUnit& other) : MeasureUnit(other), fTimeUnitField(other.fTimeUnitField) { } -UObject* +TimeUnit* TimeUnit::clone() const { return new TimeUnit(*this); } diff --git a/deps/icu-small/source/i18n/tmutamt.cpp b/deps/icu-small/source/i18n/tmutamt.cpp index 0e2b91fbb2bb6f..a143bcf8f7c2ac 100644 --- a/deps/icu-small/source/i18n/tmutamt.cpp +++ b/deps/icu-small/source/i18n/tmutamt.cpp @@ -50,7 +50,7 @@ TimeUnitAmount::operator==(const UObject& other) const { return Measure::operator==(other); } -UObject* +TimeUnitAmount* TimeUnitAmount::clone() const { return new TimeUnitAmount(*this); } diff --git a/deps/icu-small/source/i18n/tmutfmt.cpp b/deps/icu-small/source/i18n/tmutfmt.cpp index dad8825e70ff33..231ea5799c3764 100644 --- a/deps/icu-small/source/i18n/tmutfmt.cpp +++ b/deps/icu-small/source/i18n/tmutfmt.cpp @@ -136,8 +136,8 @@ TimeUnitFormat::~TimeUnitFormat() { } -Format* -TimeUnitFormat::clone(void) const { +TimeUnitFormat* +TimeUnitFormat::clone() const { return new TimeUnitFormat(*this); } @@ -685,7 +685,7 @@ TimeUnitFormat::setNumberFormat(const NumberFormat& format, UErrorCode& status){ if (U_FAILURE(status)) { return; } - adoptNumberFormat((NumberFormat *)format.clone(), status); + adoptNumberFormat(format.clone(), status); } @@ -721,8 +721,8 @@ TimeUnitFormat::copyHash(const Hashtable* source, Hashtable* target, UErrorCode& const UHashTok valueTok = element->value; const MessageFormat** value = (const MessageFormat**)valueTok.pointer; MessageFormat** newVal = (MessageFormat**)uprv_malloc(UTMUTFMT_FORMAT_STYLE_COUNT*sizeof(MessageFormat*)); - newVal[0] = (MessageFormat*)value[0]->clone(); - newVal[1] = (MessageFormat*)value[1]->clone(); + newVal[0] = value[0]->clone(); + newVal[1] = value[1]->clone(); target->put(UnicodeString(*key), newVal, status); if ( U_FAILURE(status) ) { delete newVal[0]; diff --git a/deps/icu-small/source/i18n/tolowtrn.cpp b/deps/icu-small/source/i18n/tolowtrn.cpp index 063cc88d1c40ce..02ec05cd52ad7a 100644 --- a/deps/icu-small/source/i18n/tolowtrn.cpp +++ b/deps/icu-small/source/i18n/tolowtrn.cpp @@ -58,7 +58,7 @@ LowercaseTransliterator::LowercaseTransliterator(const LowercaseTransliterator& /** * Transliterator API. */ -Transliterator* LowercaseTransliterator::clone(void) const { +LowercaseTransliterator* LowercaseTransliterator::clone() const { return new LowercaseTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/tolowtrn.h b/deps/icu-small/source/i18n/tolowtrn.h index e311431224e5c2..2fbfb90e1bface 100644 --- a/deps/icu-small/source/i18n/tolowtrn.h +++ b/deps/icu-small/source/i18n/tolowtrn.h @@ -50,7 +50,7 @@ class LowercaseTransliterator : public CaseMapTransliterator { * Transliterator API. * @return a copy of the object. */ - virtual Transliterator* clone(void) const; + virtual LowercaseTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/toupptrn.cpp b/deps/icu-small/source/i18n/toupptrn.cpp index 098dba9a3ce4f9..2a8b78b9a69d2f 100644 --- a/deps/icu-small/source/i18n/toupptrn.cpp +++ b/deps/icu-small/source/i18n/toupptrn.cpp @@ -58,7 +58,7 @@ UppercaseTransliterator::UppercaseTransliterator(const UppercaseTransliterator& /** * Transliterator API. */ -Transliterator* UppercaseTransliterator::clone(void) const { +UppercaseTransliterator* UppercaseTransliterator::clone() const { return new UppercaseTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/toupptrn.h b/deps/icu-small/source/i18n/toupptrn.h index 677a04e5c771a9..e96ca8f0ba530a 100644 --- a/deps/icu-small/source/i18n/toupptrn.h +++ b/deps/icu-small/source/i18n/toupptrn.h @@ -50,7 +50,7 @@ class UppercaseTransliterator : public CaseMapTransliterator { * Transliterator API. * @return a copy of the object. */ - virtual Transliterator* clone(void) const; + virtual UppercaseTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/translit.cpp b/deps/icu-small/source/i18n/translit.cpp index 9f5563b4796c19..039acaf157cc93 100644 --- a/deps/icu-small/source/i18n/translit.cpp +++ b/deps/icu-small/source/i18n/translit.cpp @@ -91,10 +91,7 @@ static const char RB_RULE_BASED_IDS[] = "RuleBasedTransliteratorIDs"; /** * The mutex controlling access to registry object. */ -static icu::UMutex *registryMutex() { - static icu::UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static icu::UMutex registryMutex; /** * System transliterator registry; non-null when initialized. @@ -161,7 +158,7 @@ Transliterator::Transliterator(const Transliterator& other) : if (other.filter != 0) { // We own the filter, so we must have our own copy - filter = (UnicodeFilter*) other.filter->clone(); + filter = other.filter->clone(); } } @@ -178,7 +175,7 @@ Transliterator& Transliterator::operator=(const Transliterator& other) { ID.getTerminatedBuffer(); maximumContextLength = other.maximumContextLength; - adoptFilter((other.filter == 0) ? 0 : (UnicodeFilter*) other.filter->clone()); + adoptFilter((other.filter == 0) ? 0 : other.filter->clone()); return *this; } @@ -926,13 +923,15 @@ Transliterator::createInstance(const UnicodeString& ID, return NULL; } - UnicodeSet* globalFilter; + UnicodeSet* globalFilter = nullptr; // TODO add code for parseError...currently unused, but // later may be used by parsing code... if (!TransliteratorIDParser::parseCompoundID(ID, dir, canonID, list, globalFilter)) { status = U_INVALID_ID; + delete globalFilter; return NULL; } + LocalPointer lpGlobalFilter(globalFilter); TransliteratorIDParser::instantiateList(list, status); if (U_FAILURE(status)) { @@ -956,8 +955,8 @@ Transliterator::createInstance(const UnicodeString& ID, // Check null pointer if (t != NULL) { t->setID(canonID); - if (globalFilter != NULL) { - t->adoptFilter(globalFilter); + if (lpGlobalFilter.isValid()) { + t->adoptFilter(lpGlobalFilter.orphan()); } } else if (U_SUCCESS(status)) { @@ -981,11 +980,11 @@ Transliterator* Transliterator::createBasicInstance(const UnicodeString& id, TransliteratorAlias* alias = 0; Transliterator* t = 0; - umtx_lock(registryMutex()); + umtx_lock(®istryMutex); if (HAVE_REGISTRY(ec)) { t = registry->get(id, alias, ec); } - umtx_unlock(registryMutex()); + umtx_unlock(®istryMutex); if (U_FAILURE(ec)) { delete t; @@ -1013,11 +1012,11 @@ Transliterator* Transliterator::createBasicInstance(const UnicodeString& id, alias = 0; // Step 2. reget - umtx_lock(registryMutex()); + umtx_lock(®istryMutex); if (HAVE_REGISTRY(ec)) { t = registry->reget(id, parser, alias, ec); } - umtx_unlock(registryMutex()); + umtx_unlock(®istryMutex); // Step 3. Loop back around! } else { @@ -1104,6 +1103,10 @@ Transliterator::createFromRules(const UnicodeString& ID, UnicodeString* idBlock = (UnicodeString*)parser.idBlockVector.elementAt(i); if (!idBlock->isEmpty()) { Transliterator* temp = createInstance(*idBlock, UTRANS_FORWARD, parseError, status); + if (U_FAILURE(status)) { + delete temp; + return nullptr; + } if (temp != NULL && typeid(*temp) != typeid(NullTransliterator)) transliterators.addElement(temp, status); else @@ -1117,8 +1120,10 @@ Transliterator::createFromRules(const UnicodeString& ID, data, TRUE); // Check if NULL before adding it to transliterators to avoid future usage of NULL pointer. if (temprbt == NULL) { - status = U_MEMORY_ALLOCATION_ERROR; - return t; + if (U_SUCCESS(status)) { + status = U_MEMORY_ALLOCATION_ERROR; + } + return t; } transliterators.addElement(temprbt, status); } @@ -1215,7 +1220,7 @@ UnicodeSet& Transliterator::getTargetSet(UnicodeSet& result) const { void U_EXPORT2 Transliterator::registerFactory(const UnicodeString& id, Transliterator::Factory factory, Transliterator::Token context) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { _registerFactory(id, factory, context); @@ -1254,7 +1259,7 @@ void Transliterator::_registerSpecialInverse(const UnicodeString& target, * @see #unregister */ void U_EXPORT2 Transliterator::registerInstance(Transliterator* adoptedPrototype) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { _registerInstance(adoptedPrototype); @@ -1268,7 +1273,7 @@ void Transliterator::_registerInstance(Transliterator* adoptedPrototype) { void U_EXPORT2 Transliterator::registerAlias(const UnicodeString& aliasID, const UnicodeString& realID) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { _registerAlias(aliasID, realID); @@ -1290,7 +1295,7 @@ void Transliterator::_registerAlias(const UnicodeString& aliasID, */ void U_EXPORT2 Transliterator::unregister(const UnicodeString& ID) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { registry->remove(ID); @@ -1305,7 +1310,7 @@ void U_EXPORT2 Transliterator::unregister(const UnicodeString& ID) { */ int32_t U_EXPORT2 Transliterator::countAvailableIDs(void) { int32_t retVal = 0; - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { retVal = registry->countAvailableIDs(); @@ -1321,12 +1326,12 @@ int32_t U_EXPORT2 Transliterator::countAvailableIDs(void) { */ const UnicodeString& U_EXPORT2 Transliterator::getAvailableID(int32_t index) { const UnicodeString* result = NULL; - umtx_lock(registryMutex()); + umtx_lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { result = ®istry->getAvailableID(index); } - umtx_unlock(registryMutex()); + umtx_unlock(®istryMutex); U_ASSERT(result != NULL); // fail if no registry return *result; } @@ -1334,11 +1339,11 @@ const UnicodeString& U_EXPORT2 Transliterator::getAvailableID(int32_t index) { StringEnumeration* U_EXPORT2 Transliterator::getAvailableIDs(UErrorCode& ec) { if (U_FAILURE(ec)) return NULL; StringEnumeration* result = NULL; - umtx_lock(registryMutex()); + umtx_lock(®istryMutex); if (HAVE_REGISTRY(ec)) { result = registry->getAvailableIDs(); } - umtx_unlock(registryMutex()); + umtx_unlock(®istryMutex); if (result == NULL) { ec = U_INTERNAL_TRANSLITERATOR_ERROR; } @@ -1346,14 +1351,14 @@ StringEnumeration* U_EXPORT2 Transliterator::getAvailableIDs(UErrorCode& ec) { } int32_t U_EXPORT2 Transliterator::countAvailableSources(void) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; return HAVE_REGISTRY(ec) ? _countAvailableSources() : 0; } UnicodeString& U_EXPORT2 Transliterator::getAvailableSource(int32_t index, UnicodeString& result) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { _getAvailableSource(index, result); @@ -1362,7 +1367,7 @@ UnicodeString& U_EXPORT2 Transliterator::getAvailableSource(int32_t index, } int32_t U_EXPORT2 Transliterator::countAvailableTargets(const UnicodeString& source) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; return HAVE_REGISTRY(ec) ? _countAvailableTargets(source) : 0; } @@ -1370,7 +1375,7 @@ int32_t U_EXPORT2 Transliterator::countAvailableTargets(const UnicodeString& sou UnicodeString& U_EXPORT2 Transliterator::getAvailableTarget(int32_t index, const UnicodeString& source, UnicodeString& result) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { _getAvailableTarget(index, source, result); @@ -1380,7 +1385,7 @@ UnicodeString& U_EXPORT2 Transliterator::getAvailableTarget(int32_t index, int32_t U_EXPORT2 Transliterator::countAvailableVariants(const UnicodeString& source, const UnicodeString& target) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; return HAVE_REGISTRY(ec) ? _countAvailableVariants(source, target) : 0; } @@ -1389,7 +1394,7 @@ UnicodeString& U_EXPORT2 Transliterator::getAvailableVariant(int32_t index, const UnicodeString& source, const UnicodeString& target, UnicodeString& result) { - Mutex lock(registryMutex()); + Mutex lock(®istryMutex); UErrorCode ec = U_ZERO_ERROR; if (HAVE_REGISTRY(ec)) { _getAvailableVariant(index, source, target, result); diff --git a/deps/icu-small/source/i18n/transreg.cpp b/deps/icu-small/source/i18n/transreg.cpp index 032a73fd146559..8c90effcc2a348 100644 --- a/deps/icu-small/source/i18n/transreg.cpp +++ b/deps/icu-small/source/i18n/transreg.cpp @@ -131,7 +131,7 @@ Transliterator* TransliteratorAlias::create(UParseError& pe, return 0; } if (compoundFilter != 0) - t->adoptFilter((UnicodeSet*)compoundFilter->clone()); + t->adoptFilter(compoundFilter->clone()); break; case COMPOUND: { @@ -173,8 +173,8 @@ Transliterator* TransliteratorAlias::create(UParseError& pe, if (U_SUCCESS(ec)) { t = new CompoundTransliterator(ID, transliterators, - (compoundFilter ? (UnicodeSet*)(compoundFilter->clone()) : 0), - anonymousRBTs, pe, ec); + (compoundFilter ? compoundFilter->clone() : nullptr), + anonymousRBTs, pe, ec); if (t == 0) { ec = U_MEMORY_ALLOCATION_ERROR; return 0; @@ -946,7 +946,7 @@ void TransliteratorRegistry::registerEntry(const UnicodeString& ID, if (visible) { registerSTV(source, target, variant); if (!availableIDs.contains((void*) &ID)) { - UnicodeString *newID = (UnicodeString *)ID.clone(); + UnicodeString *newID = ID.clone(); // Check to make sure newID was created. if (newID != NULL) { // NUL-terminate the ID string diff --git a/deps/icu-small/source/i18n/tridpars.cpp b/deps/icu-small/source/i18n/tridpars.cpp index cbfdf03c427850..eb6c6bbba3a9a9 100644 --- a/deps/icu-small/source/i18n/tridpars.cpp +++ b/deps/icu-small/source/i18n/tridpars.cpp @@ -50,10 +50,7 @@ static UInitOnce gSpecialInversesInitOnce = U_INITONCE_INITIALIZER; /** * The mutex controlling access to SPECIAL_INVERSES */ -static UMutex *LOCK() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex LOCK; TransliteratorIDParser::Specs::Specs(const UnicodeString& s, const UnicodeString& t, const UnicodeString& v, UBool sawS, @@ -297,6 +294,7 @@ UnicodeSet* TransliteratorIDParser::parseGlobalFilter(const UnicodeString& id, i pos = ppos.getIndex(); if (withParens == 1 && !ICU_Utility::parseChar(id, pos, CLOSE_REV)) { + delete filter; pos = start; return NULL; } @@ -662,7 +660,7 @@ void TransliteratorIDParser::registerSpecialInverse(const UnicodeString& target, bidirectional = FALSE; } - Mutex lock(LOCK()); + Mutex lock(&LOCK); UnicodeString *tempus = new UnicodeString(inverseTarget); // Used for null pointer check before usage. if (tempus == NULL) { @@ -866,9 +864,9 @@ TransliteratorIDParser::specsToSpecialInverse(const Specs& specs, UErrorCode &st UnicodeString* inverseTarget; - umtx_lock(LOCK()); + umtx_lock(&LOCK); inverseTarget = (UnicodeString*) SPECIAL_INVERSES->get(specs.target); - umtx_unlock(LOCK()); + umtx_unlock(&LOCK); if (inverseTarget != NULL) { // If the original ID contained "Any-" then make the diff --git a/deps/icu-small/source/i18n/tzfmt.cpp b/deps/icu-small/source/i18n/tzfmt.cpp index c948c5f5e7b07c..267d507aa7eca6 100644 --- a/deps/icu-small/source/i18n/tzfmt.cpp +++ b/deps/icu-small/source/i18n/tzfmt.cpp @@ -19,12 +19,15 @@ #include "unicode/udat.h" #include "unicode/ustring.h" #include "unicode/utf16.h" +#include "bytesinkutil.h" +#include "charstr.h" #include "tzgnames.h" #include "cmemory.h" #include "cstring.h" #include "putilimp.h" #include "uassert.h" #include "ucln_in.h" +#include "ulocimp.h" #include "umutex.h" #include "uresimp.h" #include "ureslocs.h" @@ -147,10 +150,7 @@ static icu::UInitOnce gZoneIdTrieInitOnce = U_INITONCE_INITIALIZER; static TextTrieMap *gShortZoneIdTrie = NULL; static icu::UInitOnce gShortZoneIdTrieInitOnce = U_INITONCE_INITIALIZER; -static UMutex *gLock() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gLock; U_CDECL_BEGIN /** @@ -327,10 +327,13 @@ TimeZoneFormat::TimeZoneFormat(const Locale& locale, UErrorCode& status) const char* region = fLocale.getCountry(); int32_t regionLen = static_cast(uprv_strlen(region)); if (regionLen == 0) { - char loc[ULOC_FULLNAME_CAPACITY]; - uloc_addLikelySubtags(fLocale.getName(), loc, sizeof(loc), &status); + CharString loc; + { + CharStringByteSink sink(&loc); + ulocimp_addLikelySubtags(fLocale.getName(), sink, &status); + } - regionLen = uloc_getCountry(loc, fTargetRegion, sizeof(fTargetRegion), &status); + regionLen = uloc_getCountry(loc.data(), fTargetRegion, sizeof(fTargetRegion), &status); if (U_SUCCESS(status)) { fTargetRegion[regionLen] = 0; } else { @@ -502,7 +505,7 @@ TimeZoneFormat::operator==(const Format& other) const { return isEqual; } -Format* +TimeZoneFormat* TimeZoneFormat::clone() const { return new TimeZoneFormat(*this); } @@ -1385,12 +1388,12 @@ TimeZoneFormat::getTimeZoneGenericNames(UErrorCode& status) const { return NULL; } - umtx_lock(gLock()); + umtx_lock(&gLock); if (fTimeZoneGenericNames == NULL) { TimeZoneFormat *nonConstThis = const_cast(this); nonConstThis->fTimeZoneGenericNames = TimeZoneGenericNames::createInstance(fLocale, status); } - umtx_unlock(gLock()); + umtx_unlock(&gLock); return fTimeZoneGenericNames; } @@ -1401,7 +1404,7 @@ TimeZoneFormat::getTZDBTimeZoneNames(UErrorCode& status) const { return NULL; } - umtx_lock(gLock()); + umtx_lock(&gLock); if (fTZDBTimeZoneNames == NULL) { TZDBTimeZoneNames *tzdbNames = new TZDBTimeZoneNames(fLocale); if (tzdbNames == NULL) { @@ -1411,7 +1414,7 @@ TimeZoneFormat::getTZDBTimeZoneNames(UErrorCode& status) const { nonConstThis->fTZDBTimeZoneNames = tzdbNames; } } - umtx_unlock(gLock()); + umtx_unlock(&gLock); return fTZDBTimeZoneNames; } @@ -1875,7 +1878,7 @@ TimeZoneFormat::parseOffsetFieldsWithPattern(const UnicodeString& text, int32_t while (len > 0) { UChar32 ch; int32_t chLen; - U16_GET(patStr, 0, 0, len, ch) + U16_GET(patStr, 0, 0, len, ch); if (PatternProps::isWhiteSpace(ch)) { chLen = U16_LENGTH(ch); len -= chLen; diff --git a/deps/icu-small/source/i18n/tzgnames.cpp b/deps/icu-small/source/i18n/tzgnames.cpp index 4e3ecb4c6073b8..e056461dc30a63 100644 --- a/deps/icu-small/source/i18n/tzgnames.cpp +++ b/deps/icu-small/source/i18n/tzgnames.cpp @@ -21,12 +21,15 @@ #include "unicode/strenum.h" #include "unicode/vtzone.h" +#include "bytesinkutil.h" +#include "charstr.h" #include "cmemory.h" #include "cstring.h" #include "mutex.h" #include "uhash.h" #include "uassert.h" #include "umutex.h" +#include "ulocimp.h" #include "uresimp.h" #include "ureslocs.h" #include "zonemeta.h" @@ -269,10 +272,7 @@ GNameSearchHandler::getMatches(int32_t& maxMatchLen) { return results; } -static UMutex *gLock() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gLock; class TZGNCore : public UMemory { public: @@ -412,10 +412,13 @@ TZGNCore::initialize(const Locale& locale, UErrorCode& status) { const char* region = fLocale.getCountry(); int32_t regionLen = static_cast(uprv_strlen(region)); if (regionLen == 0) { - char loc[ULOC_FULLNAME_CAPACITY]; - uloc_addLikelySubtags(fLocale.getName(), loc, sizeof(loc), &status); + CharString loc; + { + CharStringByteSink sink(&loc); + ulocimp_addLikelySubtags(fLocale.getName(), sink, &status); + } - regionLen = uloc_getCountry(loc, fTargetRegion, sizeof(fTargetRegion), &status); + regionLen = uloc_getCountry(loc.data(), fTargetRegion, sizeof(fTargetRegion), &status); if (U_SUCCESS(status)) { fTargetRegion[regionLen] = 0; } else { @@ -488,11 +491,11 @@ TZGNCore::getGenericLocationName(const UnicodeString& tzCanonicalID, UnicodeStri const UChar *locname = NULL; TZGNCore *nonConstThis = const_cast(this); - umtx_lock(gLock()); + umtx_lock(&gLock); { locname = nonConstThis->getGenericLocationName(tzCanonicalID); } - umtx_unlock(gLock()); + umtx_unlock(&gLock); if (locname == NULL) { name.setToBogus(); @@ -743,11 +746,11 @@ TZGNCore::getPartialLocationName(const UnicodeString& tzCanonicalID, const UChar *uplname = NULL; TZGNCore *nonConstThis = const_cast(this); - umtx_lock(gLock()); + umtx_lock(&gLock); { uplname = nonConstThis->getPartialLocationName(tzCanonicalID, mzID, isLong, mzDisplayName); } - umtx_unlock(gLock()); + umtx_unlock(&gLock); if (uplname == NULL) { name.setToBogus(); @@ -1010,11 +1013,11 @@ TZGNCore::findLocal(const UnicodeString& text, int32_t start, uint32_t types, UE TZGNCore *nonConstThis = const_cast(this); - umtx_lock(gLock()); + umtx_lock(&gLock); { fGNamesTrie.search(text, start, (TextTrieMapSearchResultHandler *)&handler, status); } - umtx_unlock(gLock()); + umtx_unlock(&gLock); if (U_FAILURE(status)) { return NULL; @@ -1041,7 +1044,7 @@ TZGNCore::findLocal(const UnicodeString& text, int32_t start, uint32_t types, UE // All names are not yet loaded into the local trie. // Load all available names into the trie. This could be very heavy. - umtx_lock(gLock()); + umtx_lock(&gLock); { if (!fGNamesTrieFullyLoaded) { StringEnumeration *tzIDs = TimeZone::createTimeZoneIDEnumeration(UCAL_ZONE_TYPE_CANONICAL, NULL, NULL, status); @@ -1063,18 +1066,18 @@ TZGNCore::findLocal(const UnicodeString& text, int32_t start, uint32_t types, UE } } } - umtx_unlock(gLock()); + umtx_unlock(&gLock); if (U_FAILURE(status)) { return NULL; } - umtx_lock(gLock()); + umtx_lock(&gLock); { // now try it again fGNamesTrie.search(text, start, (TextTrieMapSearchResultHandler *)&handler, status); } - umtx_unlock(gLock()); + umtx_unlock(&gLock); results = handler.getMatches(maxLen); if (results != NULL && maxLen > 0) { @@ -1115,10 +1118,7 @@ typedef struct TZGNCoreRef { } TZGNCoreRef; // TZGNCore object cache handling -static UMutex *gTZGNLock() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gTZGNLock; static UHashtable *gTZGNCoreCache = NULL; static UBool gTZGNCoreCacheInitialized = FALSE; @@ -1184,13 +1184,13 @@ TimeZoneGenericNames::TimeZoneGenericNames() } TimeZoneGenericNames::~TimeZoneGenericNames() { - umtx_lock(gTZGNLock()); + umtx_lock(&gTZGNLock); { U_ASSERT(fRef->refCount > 0); // Just decrement the reference count fRef->refCount--; } - umtx_unlock(gTZGNLock()); + umtx_unlock(&gTZGNLock); } TimeZoneGenericNames* @@ -1206,7 +1206,7 @@ TimeZoneGenericNames::createInstance(const Locale& locale, UErrorCode& status) { TZGNCoreRef *cacheEntry = NULL; { - Mutex lock(gTZGNLock()); + Mutex lock(&gTZGNLock); if (!gTZGNCoreCacheInitialized) { // Create empty hashtable @@ -1298,13 +1298,13 @@ TimeZoneGenericNames* TimeZoneGenericNames::clone() const { TimeZoneGenericNames* other = new TimeZoneGenericNames(); if (other) { - umtx_lock(gTZGNLock()); + umtx_lock(&gTZGNLock); { // Just increments the reference count fRef->refCount++; other->fRef = fRef; } - umtx_unlock(gTZGNLock()); + umtx_unlock(&gTZGNLock); } return other; } diff --git a/deps/icu-small/source/i18n/tznames.cpp b/deps/icu-small/source/i18n/tznames.cpp index acd6aecdc0ce7e..d789c123630260 100644 --- a/deps/icu-small/source/i18n/tznames.cpp +++ b/deps/icu-small/source/i18n/tznames.cpp @@ -29,10 +29,7 @@ U_NAMESPACE_BEGIN // TimeZoneNames object cache handling -static UMutex *gTimeZoneNamesLock() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gTimeZoneNamesLock; static UHashtable *gTimeZoneNamesCache = NULL; static UBool gTimeZoneNamesCacheInitialized = FALSE; @@ -109,7 +106,7 @@ class TimeZoneNamesDelegate : public TimeZoneNames { virtual UBool operator==(const TimeZoneNames& other) const; virtual UBool operator!=(const TimeZoneNames& other) const {return !operator==(other);} - virtual TimeZoneNames* clone() const; + virtual TimeZoneNamesDelegate* clone() const; StringEnumeration* getAvailableMetaZoneIDs(UErrorCode& status) const; StringEnumeration* getAvailableMetaZoneIDs(const UnicodeString& tzID, UErrorCode& status) const; @@ -135,7 +132,7 @@ TimeZoneNamesDelegate::TimeZoneNamesDelegate() } TimeZoneNamesDelegate::TimeZoneNamesDelegate(const Locale& locale, UErrorCode& status) { - Mutex lock(gTimeZoneNamesLock()); + Mutex lock(&gTimeZoneNamesLock); if (!gTimeZoneNamesCacheInitialized) { // Create empty hashtable if it is not already initialized. gTimeZoneNamesCache = uhash_open(uhash_hashChars, uhash_compareChars, NULL, &status); @@ -211,7 +208,7 @@ TimeZoneNamesDelegate::TimeZoneNamesDelegate(const Locale& locale, UErrorCode& s } TimeZoneNamesDelegate::~TimeZoneNamesDelegate() { - umtx_lock(gTimeZoneNamesLock()); + umtx_lock(&gTimeZoneNamesLock); { if (fTZnamesCacheEntry) { U_ASSERT(fTZnamesCacheEntry->refCount > 0); @@ -219,7 +216,7 @@ TimeZoneNamesDelegate::~TimeZoneNamesDelegate() { fTZnamesCacheEntry->refCount--; } } - umtx_unlock(gTimeZoneNamesLock()); + umtx_unlock(&gTimeZoneNamesLock); } UBool @@ -236,17 +233,17 @@ TimeZoneNamesDelegate::operator==(const TimeZoneNames& other) const { return FALSE; } -TimeZoneNames* +TimeZoneNamesDelegate* TimeZoneNamesDelegate::clone() const { TimeZoneNamesDelegate* other = new TimeZoneNamesDelegate(); if (other != NULL) { - umtx_lock(gTimeZoneNamesLock()); + umtx_lock(&gTimeZoneNamesLock); { // Just increment the reference count fTZnamesCacheEntry->refCount++; other->fTZnamesCacheEntry = fTZnamesCacheEntry; } - umtx_unlock(gTimeZoneNamesLock()); + umtx_unlock(&gTimeZoneNamesLock); } return other; } diff --git a/deps/icu-small/source/i18n/tznames_impl.cpp b/deps/icu-small/source/i18n/tznames_impl.cpp index d6e0ee2fbb637a..180b7fefbf3623 100644 --- a/deps/icu-small/source/i18n/tznames_impl.cpp +++ b/deps/icu-small/source/i18n/tznames_impl.cpp @@ -21,11 +21,14 @@ #include "unicode/utf16.h" #include "tznames_impl.h" +#include "bytesinkutil.h" +#include "charstr.h" #include "cmemory.h" #include "cstring.h" #include "uassert.h" #include "mutex.h" #include "resource.h" +#include "ulocimp.h" #include "uresimp.h" #include "ureslocs.h" #include "zonemeta.h" @@ -49,10 +52,7 @@ static const UChar NO_NAME[] = { 0 }; // for empty no-fallback time static const char* TZDBNAMES_KEYS[] = {"ss", "sd"}; static const int32_t TZDBNAMES_KEYS_SIZE = UPRV_LENGTHOF(TZDBNAMES_KEYS); -static UMutex *gDataMutex() { - static UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static UMutex gDataMutex; static UHashtable* gTZDBNamesMap = NULL; static icu::UInitOnce gTZDBNamesMapInitOnce = U_INITONCE_INITIALIZER; @@ -388,7 +388,7 @@ TextTrieMap::search(const UnicodeString &text, int32_t start, // Don't do unless it's really required. // Mutex for protecting the lazy creation of the Trie node structure on the first call to search(). - static UMutex TextTrieMutex = U_MUTEX_INITIALIZER; + static UMutex TextTrieMutex; Mutex lock(&TextTrieMutex); if (fLazyContents != NULL) { @@ -1113,7 +1113,7 @@ TimeZoneNamesImpl::operator==(const TimeZoneNames& other) const { return FALSE; } -TimeZoneNames* +TimeZoneNamesImpl* TimeZoneNamesImpl::clone() const { UErrorCode status = U_ZERO_ERROR; return new TimeZoneNamesImpl(fLocale, status); @@ -1214,7 +1214,7 @@ TimeZoneNamesImpl::getMetaZoneDisplayName(const UnicodeString& mzID, TimeZoneNamesImpl *nonConstThis = const_cast(this); { - Mutex lock(gDataMutex()); + Mutex lock(&gDataMutex); UErrorCode status = U_ZERO_ERROR; znames = nonConstThis->loadMetaZoneNames(mzID, status); if (U_FAILURE(status)) { return name; } @@ -1240,7 +1240,7 @@ TimeZoneNamesImpl::getTimeZoneDisplayName(const UnicodeString& tzID, UTimeZoneNa TimeZoneNamesImpl *nonConstThis = const_cast(this); { - Mutex lock(gDataMutex()); + Mutex lock(&gDataMutex); UErrorCode status = U_ZERO_ERROR; tznames = nonConstThis->loadTimeZoneNames(tzID, status); if (U_FAILURE(status)) { return name; } @@ -1263,7 +1263,7 @@ TimeZoneNamesImpl::getExemplarLocationName(const UnicodeString& tzID, UnicodeStr TimeZoneNamesImpl *nonConstThis = const_cast(this); { - Mutex lock(gDataMutex()); + Mutex lock(&gDataMutex); UErrorCode status = U_ZERO_ERROR; tznames = nonConstThis->loadTimeZoneNames(tzID, status); if (U_FAILURE(status)) { return name; } @@ -1358,7 +1358,7 @@ TimeZoneNamesImpl::find(const UnicodeString& text, int32_t start, uint32_t types // Synchronize so that data is not loaded multiple times. // TODO: Consider more fine-grained synchronization. { - Mutex lock(gDataMutex()); + Mutex lock(&gDataMutex); // First try of lookup. matches = doFind(handler, text, start, status); @@ -1585,7 +1585,7 @@ void TimeZoneNamesImpl::loadAllDisplayNames(UErrorCode& status) { if (U_FAILURE(status)) return; { - Mutex lock(gDataMutex()); + Mutex lock(&gDataMutex); internalLoadAllDisplayNames(status); } } @@ -1602,7 +1602,7 @@ void TimeZoneNamesImpl::getDisplayNames(const UnicodeString& tzID, // Load the time zone strings { - Mutex lock(gDataMutex()); + Mutex lock(&gDataMutex); tznames = (void*) nonConstThis->loadTimeZoneNames(tzID, status); if (U_FAILURE(status)) { return; } } @@ -1622,7 +1622,7 @@ void TimeZoneNamesImpl::getDisplayNames(const UnicodeString& tzID, } else { // Load the meta zone strings // Mutex is scoped to the "else" statement - Mutex lock(gDataMutex()); + Mutex lock(&gDataMutex); mznames = (void*) nonConstThis->loadMetaZoneNames(mzID, status); if (U_FAILURE(status)) { return; } // Note: when the metazone doesn't exist, in Java, loadMetaZoneNames returns @@ -2135,9 +2135,12 @@ TZDBTimeZoneNames::TZDBTimeZoneNames(const Locale& locale) int32_t regionLen = static_cast(uprv_strlen(region)); if (regionLen == 0) { UErrorCode status = U_ZERO_ERROR; - char loc[ULOC_FULLNAME_CAPACITY]; - uloc_addLikelySubtags(fLocale.getName(), loc, sizeof(loc), &status); - regionLen = uloc_getCountry(loc, fRegion, sizeof(fRegion), &status); + CharString loc; + { + CharStringByteSink sink(&loc); + ulocimp_addLikelySubtags(fLocale.getName(), sink, &status); + } + regionLen = uloc_getCountry(loc.data(), fRegion, sizeof(fRegion), &status); if (U_SUCCESS(status) && regionLen < (int32_t)sizeof(fRegion)) { useWorld = FALSE; } @@ -2162,7 +2165,7 @@ TZDBTimeZoneNames::operator==(const TimeZoneNames& other) const { return FALSE; } -TimeZoneNames* +TZDBTimeZoneNames* TZDBTimeZoneNames::clone() const { return new TZDBTimeZoneNames(fLocale); } @@ -2247,7 +2250,7 @@ TZDBTimeZoneNames::getMetaZoneNames(const UnicodeString& mzID, UErrorCode& statu U_ASSERT(status == U_ZERO_ERROR); // already checked length above mzIDKey[mzID.length()] = 0; - static UMutex gTZDBNamesMapLock = U_MUTEX_INITIALIZER; + static UMutex gTZDBNamesMapLock; umtx_lock(&gTZDBNamesMapLock); { void *cacheVal = uhash_get(gTZDBNamesMap, mzIDKey); diff --git a/deps/icu-small/source/i18n/tznames_impl.h b/deps/icu-small/source/i18n/tznames_impl.h index 4db036e7475e35..1286eeb80dc503 100644 --- a/deps/icu-small/source/i18n/tznames_impl.h +++ b/deps/icu-small/source/i18n/tznames_impl.h @@ -174,7 +174,7 @@ class TimeZoneNamesImpl : public TimeZoneNames { virtual ~TimeZoneNamesImpl(); virtual UBool operator==(const TimeZoneNames& other) const; - virtual TimeZoneNames* clone() const; + virtual TimeZoneNamesImpl* clone() const; StringEnumeration* getAvailableMetaZoneIDs(UErrorCode& status) const; StringEnumeration* getAvailableMetaZoneIDs(const UnicodeString& tzID, UErrorCode& status) const; @@ -236,7 +236,7 @@ class TZDBTimeZoneNames : public TimeZoneNames { virtual ~TZDBTimeZoneNames(); virtual UBool operator==(const TimeZoneNames& other) const; - virtual TimeZoneNames* clone() const; + virtual TZDBTimeZoneNames* clone() const; StringEnumeration* getAvailableMetaZoneIDs(UErrorCode& status) const; StringEnumeration* getAvailableMetaZoneIDs(const UnicodeString& tzID, UErrorCode& status) const; diff --git a/deps/icu-small/source/i18n/tzrule.cpp b/deps/icu-small/source/i18n/tzrule.cpp index f60a5e0dd59a6a..c4bf386fd4996c 100644 --- a/deps/icu-small/source/i18n/tzrule.cpp +++ b/deps/icu-small/source/i18n/tzrule.cpp @@ -108,7 +108,7 @@ InitialTimeZoneRule::~InitialTimeZoneRule() { } InitialTimeZoneRule* -InitialTimeZoneRule::clone(void) const { +InitialTimeZoneRule::clone() const { return new InitialTimeZoneRule(*this); } diff --git a/deps/icu-small/source/i18n/ucal.cpp b/deps/icu-small/source/i18n/ucal.cpp index 4154eea83f2fa9..cca1f70cf54584 100644 --- a/deps/icu-small/source/i18n/ucal.cpp +++ b/deps/icu-small/source/i18n/ucal.cpp @@ -34,7 +34,7 @@ U_NAMESPACE_USE static TimeZone* _createTimeZone(const UChar* zoneID, int32_t len, UErrorCode* ec) { TimeZone* zone = NULL; - if (ec!=NULL && U_SUCCESS(*ec)) { + if (ec != NULL && U_SUCCESS(*ec)) { // Note that if zoneID is invalid, we get back GMT. This odd // behavior is by design and goes back to the JDK. The only // failure we will see is a memory allocation failure. @@ -69,7 +69,7 @@ ucal_openCountryTimeZones(const char* country, UErrorCode* ec) { U_CAPI int32_t U_EXPORT2 ucal_getDefaultTimeZone(UChar* result, int32_t resultCapacity, UErrorCode* ec) { int32_t len = 0; - if (ec!=NULL && U_SUCCESS(*ec)) { + if (ec != NULL && U_SUCCESS(*ec)) { TimeZone* zone = TimeZone::createDefault(); if (zone == NULL) { *ec = U_MEMORY_ALLOCATION_ERROR; @@ -91,6 +91,23 @@ ucal_setDefaultTimeZone(const UChar* zoneID, UErrorCode* ec) { } } +U_DRAFT int32_t U_EXPORT2 +ucal_getHostTimeZone(UChar* result, int32_t resultCapacity, UErrorCode* ec) { + int32_t len = 0; + if (ec != NULL && U_SUCCESS(*ec)) { + TimeZone *zone = TimeZone::detectHostTimeZone(); + if (zone == NULL) { + *ec = U_MEMORY_ALLOCATION_ERROR; + } else { + UnicodeString id; + zone->getID(id); + delete zone; + len = id.extract(result, resultCapacity, *ec); + } + } + return len; +} + U_CAPI int32_t U_EXPORT2 ucal_getDSTSavings(const UChar* zoneID, UErrorCode* ec) { int32_t result = 0; @@ -140,8 +157,8 @@ ucal_open( const UChar* zoneID, if(U_FAILURE(*status)) return 0; - TimeZone* zone = (zoneID==NULL) ? TimeZone::createDefault() - : _createTimeZone(zoneID, len, status); + LocalPointer zone( (zoneID==NULL) ? TimeZone::createDefault() + : _createTimeZone(zoneID, len, status), *status); if (U_FAILURE(*status)) { return NULL; @@ -157,9 +174,9 @@ ucal_open( const UChar* zoneID, if (U_FAILURE(*status)) { return NULL; } - return (UCalendar*)Calendar::createInstance(zone, Locale(localeBuf), *status); + return (UCalendar*)Calendar::createInstance(zone.orphan(), Locale(localeBuf), *status); } - return (UCalendar*)Calendar::createInstance(zone, Locale(locale), *status); + return (UCalendar*)Calendar::createInstance(zone.orphan(), Locale(locale), *status); } U_CAPI void U_EXPORT2 diff --git a/deps/icu-small/source/i18n/udat.cpp b/deps/icu-small/source/i18n/udat.cpp index b7d85cc179ef9a..da8befc9e3c65b 100644 --- a/deps/icu-small/source/i18n/udat.cpp +++ b/deps/icu-small/source/i18n/udat.cpp @@ -167,9 +167,13 @@ udat_open(UDateFormatStyle timeStyle, } } - if(fmt == 0) { + if(fmt == nullptr) { *status = U_MEMORY_ALLOCATION_ERROR; - return 0; + return nullptr; + } + if (U_FAILURE(*status)) { + delete fmt; + return nullptr; } if(tzID != 0) { diff --git a/deps/icu-small/source/i18n/unesctrn.cpp b/deps/icu-small/source/i18n/unesctrn.cpp index fcce9528e2f3dc..604cb0a4ba007f 100644 --- a/deps/icu-small/source/i18n/unesctrn.cpp +++ b/deps/icu-small/source/i18n/unesctrn.cpp @@ -164,7 +164,7 @@ UnescapeTransliterator::~UnescapeTransliterator() { /** * Transliterator API. */ -Transliterator* UnescapeTransliterator::clone() const { +UnescapeTransliterator* UnescapeTransliterator::clone() const { return new UnescapeTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/unesctrn.h b/deps/icu-small/source/i18n/unesctrn.h index e8e171f2bc4a69..57dd8d32cf53f3 100644 --- a/deps/icu-small/source/i18n/unesctrn.h +++ b/deps/icu-small/source/i18n/unesctrn.h @@ -77,7 +77,7 @@ class UnescapeTransliterator : public Transliterator { /** * Transliterator API. */ - virtual Transliterator* clone() const; + virtual UnescapeTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/uni2name.cpp b/deps/icu-small/source/i18n/uni2name.cpp index 86d7a4904a815e..9df3924ae5f147 100644 --- a/deps/icu-small/source/i18n/uni2name.cpp +++ b/deps/icu-small/source/i18n/uni2name.cpp @@ -60,7 +60,7 @@ UnicodeNameTransliterator::UnicodeNameTransliterator(const UnicodeNameTransliter /** * Transliterator API. */ -Transliterator* UnicodeNameTransliterator::clone(void) const { +UnicodeNameTransliterator* UnicodeNameTransliterator::clone() const { return new UnicodeNameTransliterator(*this); } diff --git a/deps/icu-small/source/i18n/uni2name.h b/deps/icu-small/source/i18n/uni2name.h index 4d6eaa0a9a6b65..99309c8e0f8785 100644 --- a/deps/icu-small/source/i18n/uni2name.h +++ b/deps/icu-small/source/i18n/uni2name.h @@ -48,7 +48,7 @@ class UnicodeNameTransliterator : public Transliterator { /** * Transliterator API. */ - virtual Transliterator* clone(void) const; + virtual UnicodeNameTransliterator* clone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. diff --git a/deps/icu-small/source/i18n/unicode/alphaindex.h b/deps/icu-small/source/i18n/unicode/alphaindex.h index dfb6110a36cf11..fe43995fe81155 100644 --- a/deps/icu-small/source/i18n/unicode/alphaindex.h +++ b/deps/icu-small/source/i18n/unicode/alphaindex.h @@ -13,6 +13,9 @@ #define INDEXCHARS_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" #include "unicode/locid.h" #include "unicode/unistr.h" @@ -757,4 +760,7 @@ class U_I18N_API AlphabeticIndex: public UObject { U_NAMESPACE_END #endif // !UCONFIG_NO_COLLATION + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/basictz.h b/deps/icu-small/source/i18n/unicode/basictz.h index eb62abaf0a679c..e1db2a8223adde 100644 --- a/deps/icu-small/source/i18n/unicode/basictz.h +++ b/deps/icu-small/source/i18n/unicode/basictz.h @@ -16,6 +16,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/timezone.h" @@ -41,6 +43,14 @@ class U_I18N_API BasicTimeZone: public TimeZone { */ virtual ~BasicTimeZone(); + /** + * Clones this object polymorphically. + * The caller owns the result and should delete it when done. + * @return clone, or nullptr if an error occurred + * @stable ICU 3.8 + */ + virtual BasicTimeZone* clone() const = 0; + /** * Gets the first time zone transition after the base time. * @param base The base time. @@ -211,6 +221,8 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // BASICTZ_H //eof diff --git a/deps/icu-small/source/i18n/unicode/calendar.h b/deps/icu-small/source/i18n/unicode/calendar.h index 023cf053f254fb..2a8c2935ca8e24 100644 --- a/deps/icu-small/source/i18n/unicode/calendar.h +++ b/deps/icu-small/source/i18n/unicode/calendar.h @@ -29,6 +29,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Calendar object @@ -184,7 +186,7 @@ class BasicTimeZone; */ class U_I18N_API Calendar : public UObject { public: - +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Field IDs for date and time. Used to specify date/time fields. ERA is calendar * specific. Example ranges given are for illustration only; see specific Calendar @@ -227,6 +229,7 @@ class U_I18N_API Calendar : public UObject { FIELD_COUNT = UCAL_FIELD_COUNT // See ucal.h for other fields. #endif /* U_HIDE_DEPRECATED_API */ }; +#endif // U_FORCE_HIDE_DEPRECATED_API #ifndef U_HIDE_DEPRECATED_API /** @@ -287,7 +290,7 @@ class U_I18N_API Calendar : public UObject { * @return a polymorphic copy of this calendar. * @stable ICU 2.0 */ - virtual Calendar* clone(void) const = 0; + virtual Calendar* clone() const = 0; /** * Creates a Calendar using the default timezone and locale. Clients are responsible @@ -518,6 +521,7 @@ class U_I18N_API Calendar : public UObject { */ UBool after(const Calendar& when, UErrorCode& status) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * UDate Arithmetic function. Adds the specified (signed) amount of time to the given * time field, based on the calendar's rules. For example, to subtract 5 days from @@ -539,6 +543,7 @@ class U_I18N_API Calendar : public UObject { * @deprecated ICU 2.6. use add(UCalendarDateFields field, int32_t amount, UErrorCode& status) instead. */ virtual void add(EDateFields field, int32_t amount, UErrorCode& status); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * UDate Arithmetic function. Adds the specified (signed) amount of time to the given @@ -632,6 +637,7 @@ class U_I18N_API Calendar : public UObject { */ inline void roll(UCalendarDateFields field, UBool up, UErrorCode& status); +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Time Field Rolling function. Rolls by the given amount on the given * time field. For example, to roll the current date up by one day, call @@ -664,6 +670,7 @@ class U_I18N_API Calendar : public UObject { * @deprecated ICU 2.6. Use roll(UCalendarDateFields field, int32_t amount, UErrorCode& status) instead. */ virtual void roll(EDateFields field, int32_t amount, UErrorCode& status); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Time Field Rolling function. Rolls by the given amount on the given @@ -698,6 +705,7 @@ class U_I18N_API Calendar : public UObject { */ virtual void roll(UCalendarDateFields field, int32_t amount, UErrorCode& status); +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Return the difference between the given time and the time this * calendar object is set to. If this calendar is set @@ -754,6 +762,7 @@ class U_I18N_API Calendar : public UObject { * @deprecated ICU 2.6. Use fieldDifference(UDate when, UCalendarDateFields field, UErrorCode& status). */ virtual int32_t fieldDifference(UDate when, EDateFields field, UErrorCode& status); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Return the difference between the given time and the time this @@ -1010,6 +1019,7 @@ class U_I18N_API Calendar : public UObject { */ uint8_t getMinimalDaysInFirstWeek(void) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Gets the minimum value for the given time field. e.g., for Gregorian * DAY_OF_MONTH, 1. @@ -1019,6 +1029,7 @@ class U_I18N_API Calendar : public UObject { * @deprecated ICU 2.6. Use getMinimum(UCalendarDateFields field) instead. */ virtual int32_t getMinimum(EDateFields field) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Gets the minimum value for the given time field. e.g., for Gregorian @@ -1030,6 +1041,7 @@ class U_I18N_API Calendar : public UObject { */ virtual int32_t getMinimum(UCalendarDateFields field) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Gets the maximum value for the given time field. e.g. for Gregorian DAY_OF_MONTH, * 31. @@ -1039,6 +1051,7 @@ class U_I18N_API Calendar : public UObject { * @deprecated ICU 2.6. Use getMaximum(UCalendarDateFields field) instead. */ virtual int32_t getMaximum(EDateFields field) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Gets the maximum value for the given time field. e.g. for Gregorian DAY_OF_MONTH, @@ -1050,6 +1063,7 @@ class U_I18N_API Calendar : public UObject { */ virtual int32_t getMaximum(UCalendarDateFields field) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Gets the highest minimum value for the given field if varies. Otherwise same as * getMinimum(). For Gregorian, no difference. @@ -1059,6 +1073,7 @@ class U_I18N_API Calendar : public UObject { * @deprecated ICU 2.6. Use getGreatestMinimum(UCalendarDateFields field) instead. */ virtual int32_t getGreatestMinimum(EDateFields field) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Gets the highest minimum value for the given field if varies. Otherwise same as @@ -1070,6 +1085,7 @@ class U_I18N_API Calendar : public UObject { */ virtual int32_t getGreatestMinimum(UCalendarDateFields field) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Gets the lowest maximum value for the given field if varies. Otherwise same as * getMaximum(). e.g., for Gregorian DAY_OF_MONTH, 28. @@ -1079,6 +1095,7 @@ class U_I18N_API Calendar : public UObject { * @deprecated ICU 2.6. Use getLeastMaximum(UCalendarDateFields field) instead. */ virtual int32_t getLeastMaximum(EDateFields field) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Gets the lowest maximum value for the given field if varies. Otherwise same as @@ -1895,11 +1912,13 @@ class U_I18N_API Calendar : public UObject { */ int32_t fFields[UCAL_FIELD_COUNT]; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * The flags which tell if a specified time field for the calendar is set. * @deprecated ICU 2.8 use (fStamp[n]!=kUnset) */ UBool fIsSet[UCAL_FIELD_COUNT]; +#endif // U_FORCE_HIDE_DEPRECATED_API /** Special values of stamp[] * @stable ICU 2.0 @@ -2281,7 +2300,6 @@ class U_I18N_API Calendar : public UObject { * should only be called if this calendar is not lenient. * @see #isLenient * @see #validateField(int, int&) - * @internal */ void validateFields(UErrorCode &status); @@ -2291,7 +2309,6 @@ class U_I18N_API Calendar : public UObject { * U_ILLEGAL_ARGUMENT_ERROR will be set. Subclasses may * use this method in their implementation of {@link * #validateField(int, int&)}. - * @internal */ void validateField(UCalendarDateFields field, int32_t min, int32_t max, UErrorCode& status); @@ -2529,4 +2546,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _CALENDAR diff --git a/deps/icu-small/source/i18n/unicode/choicfmt.h b/deps/icu-small/source/i18n/unicode/choicfmt.h index c9f0f1114f89ed..3b2f48cb1f853c 100644 --- a/deps/icu-small/source/i18n/unicode/choicfmt.h +++ b/deps/icu-small/source/i18n/unicode/choicfmt.h @@ -26,13 +26,14 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Choice Format. */ #if !UCONFIG_NO_FORMATTING -#ifndef U_HIDE_DEPRECATED_API #include "unicode/fieldpos.h" #include "unicode/format.h" @@ -40,6 +41,8 @@ #include "unicode/numfmt.h" #include "unicode/unistr.h" +#ifndef U_HIDE_DEPRECATED_API + U_NAMESPACE_BEGIN class MessageFormat; @@ -248,7 +251,7 @@ class U_I18N_API ChoiceFormat: public NumberFormat { * @return a copy of this object * @deprecated ICU 49 Use MessageFormat instead, with plural and select arguments. */ - virtual Format* clone(void) const; + virtual ChoiceFormat* clone() const; /** * Returns true if the given Format objects are semantically equal. @@ -592,5 +595,7 @@ U_NAMESPACE_END #endif // U_HIDE_DEPRECATED_API #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // CHOICFMT_H //eof diff --git a/deps/icu-small/source/i18n/unicode/coleitr.h b/deps/icu-small/source/i18n/unicode/coleitr.h index bf0e1d51a41833..809d435e509b49 100644 --- a/deps/icu-small/source/i18n/unicode/coleitr.h +++ b/deps/icu-small/source/i18n/unicode/coleitr.h @@ -35,6 +35,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_COLLATION #include "unicode/unistr.h" @@ -404,4 +406,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_COLLATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/coll.h b/deps/icu-small/source/i18n/unicode/coll.h index 653434f54ca664..f5564c73944bcb 100644 --- a/deps/icu-small/source/i18n/unicode/coll.h +++ b/deps/icu-small/source/i18n/unicode/coll.h @@ -54,6 +54,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_COLLATION #include "unicode/uobject.h" @@ -204,6 +206,7 @@ class U_I18N_API Collator : public UObject { // Cannot use #ifndef U_HIDE_DEPRECATED_API for the following, it is // used by virtual methods that cannot have that conditional. +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * LESS is returned if source string is compared to be less than target * string in the compare() method. @@ -220,6 +223,7 @@ class U_I18N_API Collator : public UObject { EQUAL = UCOL_EQUAL, // 0 GREATER = UCOL_GREATER // 1 }; +#endif // U_FORCE_HIDE_DEPRECATED_API // Collator public destructor ----------------------------------------- @@ -265,7 +269,7 @@ class U_I18N_API Collator : public UObject { * @return a copy of this object, owned by the caller * @stable ICU 2.0 */ - virtual Collator* clone(void) const = 0; + virtual Collator* clone() const = 0; /** * Creates the Collator object for the current default locale. @@ -323,6 +327,7 @@ class U_I18N_API Collator : public UObject { */ static Collator* U_EXPORT2 createInstance(const Locale& loc, UErrorCode& err); +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * The comparison function compares the character data stored in two * different strings. Returns information about whether a string is less @@ -336,6 +341,7 @@ class U_I18N_API Collator : public UObject { */ virtual EComparisonResult compare(const UnicodeString& source, const UnicodeString& target) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * The comparison function compares the character data stored in two @@ -353,6 +359,7 @@ class U_I18N_API Collator : public UObject { const UnicodeString& target, UErrorCode &status) const = 0; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Does the same thing as compare but limits the comparison to a specified * length @@ -368,6 +375,7 @@ class U_I18N_API Collator : public UObject { virtual EComparisonResult compare(const UnicodeString& source, const UnicodeString& target, int32_t length) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Does the same thing as compare but limits the comparison to a specified @@ -387,6 +395,7 @@ class U_I18N_API Collator : public UObject { int32_t length, UErrorCode &status) const = 0; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * The comparison function compares the character data stored in two * different string arrays. Returns information about whether a string array @@ -423,6 +432,7 @@ class U_I18N_API Collator : public UObject { virtual EComparisonResult compare(const char16_t* source, int32_t sourceLength, const char16_t* target, int32_t targetLength) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * The comparison function compares the character data stored in two @@ -527,6 +537,7 @@ class U_I18N_API Collator : public UObject { */ virtual int32_t hashCode(void) const = 0; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Gets the locale of the Collator * @@ -540,6 +551,7 @@ class U_I18N_API Collator : public UObject { * in ICU 3.0. */ virtual Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const = 0; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Convenience method for comparing two strings based on the collation rules. @@ -576,6 +588,7 @@ class U_I18N_API Collator : public UObject { */ UBool equals(const UnicodeString& source, const UnicodeString& target) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Determines the minimum strength that will be used in comparison or * transformation. @@ -607,6 +620,7 @@ class U_I18N_API Collator : public UObject { * @deprecated ICU 2.6 Use setAttribute(UCOL_STRENGTH...) instead */ virtual void setStrength(ECollationStrength newStrength); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Retrieves the reordering codes for this collator. @@ -904,6 +918,7 @@ class U_I18N_API Collator : public UObject { */ virtual UColReorderCode getMaxVariable() const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Sets the variable top to the primary weight of the specified string. * @@ -951,6 +966,7 @@ class U_I18N_API Collator : public UObject { * @deprecated ICU 53 Call setMaxVariable() instead. */ virtual void setVariableTop(uint32_t varTop, UErrorCode &status) = 0; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Gets the variable top value of a Collator. @@ -972,6 +988,7 @@ class U_I18N_API Collator : public UObject { */ virtual UnicodeSet *getTailoredSet(UErrorCode &status) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Same as clone(). * The base class implementation simply calls clone(). @@ -979,7 +996,8 @@ class U_I18N_API Collator : public UObject { * @see clone() * @deprecated ICU 50 no need to have two methods for cloning */ - virtual Collator* safeClone(void) const; + virtual Collator* safeClone() const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Get the sort key as an array of bytes from a UnicodeString. @@ -1271,4 +1289,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_COLLATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/compactdecimalformat.h b/deps/icu-small/source/i18n/unicode/compactdecimalformat.h index 9c1e9183f4657b..9c1e2009969279 100644 --- a/deps/icu-small/source/i18n/unicode/compactdecimalformat.h +++ b/deps/icu-small/source/i18n/unicode/compactdecimalformat.h @@ -14,6 +14,9 @@ #define __COMPACT_DECIMAL_FORMAT_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Compatibility APIs for compact decimal number formatting. @@ -102,7 +105,7 @@ class U_I18N_API CompactDecimalFormat : public DecimalFormat { * @return a polymorphic copy of this CompactDecimalFormat. * @stable ICU 51 */ - Format* clone() const U_OVERRIDE; + CompactDecimalFormat* clone() const U_OVERRIDE; using DecimalFormat::format; @@ -187,5 +190,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __COMPACT_DECIMAL_FORMAT_H__ //eof diff --git a/deps/icu-small/source/i18n/unicode/curramt.h b/deps/icu-small/source/i18n/unicode/curramt.h index 03ec856e3bf585..65e6619db30c16 100644 --- a/deps/icu-small/source/i18n/unicode/curramt.h +++ b/deps/icu-small/source/i18n/unicode/curramt.h @@ -15,6 +15,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/measure.h" @@ -79,7 +81,7 @@ class U_I18N_API CurrencyAmount: public Measure { * have the same class as returned by getDynamicClassID(). * @stable ICU 3.0 */ - virtual UObject* clone() const; + virtual CurrencyAmount* clone() const; /** * Destructor @@ -129,4 +131,7 @@ inline const char16_t* CurrencyAmount::getISOCurrency() const { U_NAMESPACE_END #endif // !UCONFIG_NO_FORMATTING + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __CURRENCYAMOUNT_H__ diff --git a/deps/icu-small/source/i18n/unicode/currpinf.h b/deps/icu-small/source/i18n/unicode/currpinf.h index 80b046251323e9..1b93be08316827 100644 --- a/deps/icu-small/source/i18n/unicode/currpinf.h +++ b/deps/icu-small/source/i18n/unicode/currpinf.h @@ -11,6 +11,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Currency Plural Information used by Decimal Format @@ -266,5 +268,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _CURRPINFO //eof diff --git a/deps/icu-small/source/i18n/unicode/currunit.h b/deps/icu-small/source/i18n/unicode/currunit.h index 63739c37fd569b..0446154e328f8f 100644 --- a/deps/icu-small/source/i18n/unicode/currunit.h +++ b/deps/icu-small/source/i18n/unicode/currunit.h @@ -15,6 +15,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/measunit.h" @@ -94,7 +96,7 @@ class U_I18N_API CurrencyUnit: public MeasureUnit { * have the same class as returned by getDynamicClassID(). * @stable ICU 3.0 */ - virtual UObject* clone() const; + virtual CurrencyUnit* clone() const; /** * Destructor @@ -140,4 +142,7 @@ inline const char16_t* CurrencyUnit::getISOCurrency() const { U_NAMESPACE_END #endif // !UCONFIG_NO_FORMATTING + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __CURRENCYUNIT_H__ diff --git a/deps/icu-small/source/i18n/unicode/datefmt.h b/deps/icu-small/source/i18n/unicode/datefmt.h index 13c63d937675ea..21217e567acf7d 100644 --- a/deps/icu-small/source/i18n/unicode/datefmt.h +++ b/deps/icu-small/source/i18n/unicode/datefmt.h @@ -23,6 +23,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/udat.h" @@ -221,6 +223,14 @@ class U_I18N_API DateFormat : public Format { */ virtual ~DateFormat(); + /** + * Clones this object polymorphically. + * The caller owns the result and should delete it when done. + * @return clone, or nullptr if an error occurred + * @stable ICU 2.0 + */ + virtual DateFormat* clone() const = 0; + /** * Equality operator. Returns true if the two formats have the same behavior. * @stable ICU 2.0 @@ -953,5 +963,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _DATEFMT //eof diff --git a/deps/icu-small/source/i18n/unicode/dcfmtsym.h b/deps/icu-small/source/i18n/unicode/dcfmtsym.h index 55e3d8a6b3b5ec..e1e0ab6b08c523 100644 --- a/deps/icu-small/source/i18n/unicode/dcfmtsym.h +++ b/deps/icu-small/source/i18n/unicode/dcfmtsym.h @@ -28,10 +28,12 @@ #define DCFMTSYM_H #include "unicode/utypes.h" -#include "unicode/uchar.h" + +#if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING +#include "unicode/uchar.h" #include "unicode/uobject.h" #include "unicode/locid.h" #include "unicode/numsys.h" @@ -455,13 +457,11 @@ class U_I18N_API DecimalFormatSymbols : public UObject { * to non-resource bundle strings, * then regular UnicodeString copies must be used instead of fastCopyFrom(). * - * @internal */ UnicodeString fSymbols[kFormatSymbolCount]; /** * Non-symbol variable for getConstSymbol(). Always empty. - * @internal */ UnicodeString fNoSymbol; @@ -582,5 +582,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _DCFMTSYM //eof diff --git a/deps/icu-small/source/i18n/unicode/decimfmt.h b/deps/icu-small/source/i18n/unicode/decimfmt.h index 097a38fb88f6b2..e539b9af233ccb 100644 --- a/deps/icu-small/source/i18n/unicode/decimfmt.h +++ b/deps/icu-small/source/i18n/unicode/decimfmt.h @@ -28,6 +28,9 @@ #define DECIMFMT_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Compatibility APIs for decimal formatting. @@ -896,7 +899,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * @return a polymorphic copy of this DecimalFormat. * @stable ICU 2.0 */ - Format* clone(void) const U_OVERRIDE; + DecimalFormat* clone() const U_OVERRIDE; /** * Return true if the given Format objects are semantically equal. @@ -1331,7 +1334,6 @@ class U_I18N_API DecimalFormat : public NumberFormat { */ virtual void setMultiplier(int32_t newValue); -#ifndef U_HIDE_DRAFT_API /** * Gets the power of ten by which number should be multiplied before formatting, which * can be combined with setMultiplier() to multiply by any arbitrary decimal value. @@ -1342,7 +1344,7 @@ class U_I18N_API DecimalFormat : public NumberFormat { * This method is analogous to UNUM_SCALE in getAttribute. * * @return the current value of the power-of-ten multiplier. - * @draft ICU 62 + * @stable ICU 62 */ int32_t getMultiplierScale(void) const; @@ -1363,10 +1365,9 @@ class U_I18N_API DecimalFormat : public NumberFormat { * This method is analogous to UNUM_SCALE in setAttribute. * * @param newValue the new value of the power-of-ten multiplier. - * @draft ICU 62 + * @stable ICU 62 */ void setMultiplierScale(int32_t newValue); -#endif /* U_HIDE_DRAFT_API */ /** * Get the rounding increment. @@ -2020,12 +2021,14 @@ class U_I18N_API DecimalFormat : public NumberFormat { */ void setCurrency(const char16_t* theCurrency, UErrorCode& ec) U_OVERRIDE; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Sets the currency used to display currency amounts. See * setCurrency(const char16_t*, UErrorCode&). * @deprecated ICU 3.0. Use setCurrency(const char16_t*, UErrorCode&). */ virtual void setCurrency(const char16_t* theCurrency); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Sets the `Currency Usage` object used to display currency. @@ -2113,22 +2116,6 @@ class U_I18N_API DecimalFormat : public NumberFormat { const number::LocalizedNumberFormatter* toNumberFormatter(UErrorCode& status) const; #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DEPRECATED_API - /** - * Deprecated: Like {@link #toNumberFormatter(UErrorCode&) const}, - * but does not take an error code. - * - * The new signature should be used in case an error occurs while returning the - * LocalizedNumberFormatter. - * - * This old signature will be removed in ICU 65. - * - * @return A reference to an internal object. - * @deprecated ICU 64 - */ - const number::LocalizedNumberFormatter& toNumberFormatter() const; -#endif /* U_HIDE_DEPRECATED_API */ - /** * Return the class ID for this class. This is useful only for * comparing to a return value from getDynamicClassID(). For example: @@ -2216,5 +2203,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _DECIMFMT //eof diff --git a/deps/icu-small/source/i18n/unicode/dtfmtsym.h b/deps/icu-small/source/i18n/unicode/dtfmtsym.h index ed7c1898465e5d..f9ec88272b2b5c 100644 --- a/deps/icu-small/source/i18n/unicode/dtfmtsym.h +++ b/deps/icu-small/source/i18n/unicode/dtfmtsym.h @@ -22,6 +22,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/calendar.h" @@ -1011,5 +1013,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _DTFMTSYM //eof diff --git a/deps/icu-small/source/i18n/unicode/dtitvfmt.h b/deps/icu-small/source/i18n/unicode/dtitvfmt.h index 42d77d041f8b28..23fc02e2a7b16b 100644 --- a/deps/icu-small/source/i18n/unicode/dtitvfmt.h +++ b/deps/icu-small/source/i18n/unicode/dtitvfmt.h @@ -16,6 +16,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Format and parse date interval in a language-independent manner. @@ -432,7 +434,7 @@ class U_I18N_API DateIntervalFormat : public Format { * @return A copy of the object. * @stable ICU 4.0 */ - virtual Format* clone(void) const; + virtual DateIntervalFormat* clone() const; /** * Return true if the given Format objects are semantically equal. Objects @@ -1151,5 +1153,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _DTITVFMT_H__ //eof diff --git a/deps/icu-small/source/i18n/unicode/dtitvinf.h b/deps/icu-small/source/i18n/unicode/dtitvinf.h index 65f568c0700218..3c666231abd060 100644 --- a/deps/icu-small/source/i18n/unicode/dtitvinf.h +++ b/deps/icu-small/source/i18n/unicode/dtitvinf.h @@ -16,6 +16,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Date/Time interval patterns for formatting date/time interval @@ -195,7 +197,7 @@ class U_I18N_API DateIntervalInfo U_FINAL : public UObject { * @return a copy of the object * @stable ICU 4.0 */ - virtual DateIntervalInfo* clone(void) const; + virtual DateIntervalInfo* clone() const; /** * Destructor. @@ -515,4 +517,6 @@ U_NAMESPACE_END #endif +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/dtptngen.h b/deps/icu-small/source/i18n/unicode/dtptngen.h index e50c01b4e360c9..a71938b31cf5d8 100644 --- a/deps/icu-small/source/i18n/unicode/dtptngen.h +++ b/deps/icu-small/source/i18n/unicode/dtptngen.h @@ -14,6 +14,10 @@ #ifndef __DTPTNGEN_H__ #define __DTPTNGEN_H__ +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/datefmt.h" #include "unicode/locid.h" #include "unicode/udat.h" @@ -279,7 +283,7 @@ class U_I18N_API DateTimePatternGenerator : public UObject { * * @param field The desired UDateTimePatternField, such as UDATPG_ERA_FIELD. * @param width The desired UDateTimePGDisplayWidth, such as UDATPG_ABBREVIATED. - * @return. The display name for field + * @return The display name for field * @stable ICU 61 */ UnicodeString getFieldDisplayName(UDateTimePatternField field, UDateTimePGDisplayWidth width) const; @@ -561,12 +565,10 @@ class U_I18N_API DateTimePatternGenerator : public UObject { void setDateTimeFromCalendar(const Locale& locale, UErrorCode& status); void setDecimalSymbols(const Locale& locale, UErrorCode& status); UDateTimePatternField getAppendFormatNumber(const char* field) const; -#ifndef U_HIDE_DRAFT_API - // The following three have to be U_HIDE_DRAFT_API (though private) because UDateTimePGDisplayWidth is + // Note for the next 3: UDateTimePGDisplayWidth is now stable ICU 61 UDateTimePatternField getFieldAndWidthIndices(const char* key, UDateTimePGDisplayWidth* widthP) const; void setFieldDisplayName(UDateTimePatternField field, UDateTimePGDisplayWidth width, const UnicodeString& value); UnicodeString& getMutableFieldDisplayName(UDateTimePatternField field, UDateTimePGDisplayWidth width); -#endif // U_HIDE_DRAFT_API void getAppendName(UDateTimePatternField field, UnicodeString& value); UnicodeString mapSkeletonMetacharacters(const UnicodeString& patternForm, int32_t* flags, UErrorCode& status); const UnicodeString* getBestRaw(DateTimeMatcher& source, int32_t includeMask, DistanceInfo* missingFields, UErrorCode& status, const PtnSkeleton** specifiedSkeletonPtr = 0); @@ -587,4 +589,6 @@ class U_I18N_API DateTimePatternGenerator : public UObject { U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/dtrule.h b/deps/icu-small/source/i18n/unicode/dtrule.h index 24dfc69de1df22..dba28bf2dc4ede 100644 --- a/deps/icu-small/source/i18n/unicode/dtrule.h +++ b/deps/icu-small/source/i18n/unicode/dtrule.h @@ -11,6 +11,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Rule for specifying date and time in an year @@ -126,7 +128,7 @@ class U_I18N_API DateTimeRule : public UObject { * @return A copy of the object. * @stable ICU 3.8 */ - DateTimeRule* clone(void) const; + DateTimeRule* clone() const; /** * Assignment operator. @@ -248,5 +250,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // DTRULE_H //eof diff --git a/deps/icu-small/source/i18n/unicode/fieldpos.h b/deps/icu-small/source/i18n/unicode/fieldpos.h index 78561a4de7d8b1..c9849d67a37d29 100644 --- a/deps/icu-small/source/i18n/unicode/fieldpos.h +++ b/deps/icu-small/source/i18n/unicode/fieldpos.h @@ -26,6 +26,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: FieldPosition identifies the fields in a formatted output. @@ -290,5 +292,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _FIELDPOS //eof diff --git a/deps/icu-small/source/i18n/unicode/fmtable.h b/deps/icu-small/source/i18n/unicode/fmtable.h index a06c23dc3bd532..7bec4f6906e7ee 100644 --- a/deps/icu-small/source/i18n/unicode/fmtable.h +++ b/deps/icu-small/source/i18n/unicode/fmtable.h @@ -19,6 +19,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Formattable is a thin wrapper for primitive types used for formatting and parsing @@ -751,5 +753,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif //_FMTABLE //eof diff --git a/deps/icu-small/source/i18n/unicode/format.h b/deps/icu-small/source/i18n/unicode/format.h index e64cc1c6eb39b4..28a09159bde1ab 100644 --- a/deps/icu-small/source/i18n/unicode/format.h +++ b/deps/icu-small/source/i18n/unicode/format.h @@ -26,6 +26,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Base class for all formats. @@ -303,5 +305,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _FORMAT //eof diff --git a/deps/icu-small/source/i18n/unicode/formattedvalue.h b/deps/icu-small/source/i18n/unicode/formattedvalue.h index 2e24c8d99e624b..1b130bbdd9d44c 100644 --- a/deps/icu-small/source/i18n/unicode/formattedvalue.h +++ b/deps/icu-small/source/i18n/unicode/formattedvalue.h @@ -5,8 +5,10 @@ #define __FORMATTEDVALUE_H__ #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING -#ifndef U_HIDE_DRAFT_API #include "unicode/appendable.h" #include "unicode/fpositer.h" @@ -24,6 +26,10 @@ U_NAMESPACE_BEGIN */ +// The following cannot have #ifndef U_HIDE_DRAFT_API because +// class FormattedValue depends on it, and FormattedValue cannot be +// hidden becauseclass FormattedNumber (stable ICU 60) depends on it. +#ifndef U_FORCE_HIDE_DRAFT_API /** * Represents a span of a string containing a given field. * @@ -52,6 +58,7 @@ class U_I18N_API ConstrainedFieldPosition : public UMemory { /** @draft ICU 64 */ ~ConstrainedFieldPosition(); +#ifndef U_HIDE_DRAFT_API /** * Resets this ConstrainedFieldPosition to its initial state, as if it were newly created: * @@ -221,17 +228,23 @@ class U_I18N_API ConstrainedFieldPosition : public UMemory { int32_t field, int32_t start, int32_t limit); +#endif /* U_HIDE_DRAFT_API */ private: int64_t fContext = 0LL; int32_t fField = 0; int32_t fStart = 0; int32_t fLimit = 0; +#ifndef U_HIDE_DRAFT_API int32_t fCategory = UFIELD_CATEGORY_UNDEFINED; +#else /* U_HIDE_DRAFT_API */ + int32_t fCategory = 0; +#endif /* U_HIDE_DRAFT_API */ int8_t fConstraint = 0; }; - +// The following cannot have #ifndef U_HIDE_DRAFT_API because +// class FormattedNumber (stable ICU 60) depends on it. /** * An abstract formatted value: a string with associated field attributes. * Many formatters format to classes implementing FormattedValue. @@ -308,10 +321,12 @@ class U_I18N_API FormattedValue /* not : public UObject because this is an inter */ virtual UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const = 0; }; - +#endif // U_FORCE_HIDE_DRAFT_API U_NAMESPACE_END -#endif /* U_HIDE_DRAFT_API */ #endif /* #if !UCONFIG_NO_FORMATTING */ + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __FORMATTEDVALUE_H__ diff --git a/deps/icu-small/source/i18n/unicode/fpositer.h b/deps/icu-small/source/i18n/unicode/fpositer.h index 81091f0ffad6b6..ba2a838315c7cb 100644 --- a/deps/icu-small/source/i18n/unicode/fpositer.h +++ b/deps/icu-small/source/i18n/unicode/fpositer.h @@ -19,6 +19,9 @@ #define FPOSITER_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" /** @@ -116,4 +119,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // FPOSITER_H diff --git a/deps/icu-small/source/i18n/unicode/gender.h b/deps/icu-small/source/i18n/unicode/gender.h index b7c31cb554a696..5ae111a3aa816a 100644 --- a/deps/icu-small/source/i18n/unicode/gender.h +++ b/deps/icu-small/source/i18n/unicode/gender.h @@ -25,6 +25,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/locid.h" @@ -114,5 +116,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _GENDER //eof diff --git a/deps/icu-small/source/i18n/unicode/gregocal.h b/deps/icu-small/source/i18n/unicode/gregocal.h index 1d881e0be76067..236bd003c160a6 100644 --- a/deps/icu-small/source/i18n/unicode/gregocal.h +++ b/deps/icu-small/source/i18n/unicode/gregocal.h @@ -28,6 +28,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/calendar.h" @@ -301,7 +303,7 @@ class U_I18N_API GregorianCalendar: public Calendar { * @return return a polymorphic copy of this calendar. * @stable ICU 2.0 */ - virtual Calendar* clone(void) const; + virtual GregorianCalendar* clone() const; /** * Sets the GregorianCalendar change date. This is the point when the switch from @@ -350,6 +352,7 @@ class U_I18N_API GregorianCalendar: public Calendar { */ virtual UBool isEquivalentTo(const Calendar& other) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * (Overrides Calendar) Rolls up or down by the given amount in the specified field. * For more information, see the documentation for Calendar::roll(). @@ -362,6 +365,7 @@ class U_I18N_API GregorianCalendar: public Calendar { * @deprecated ICU 2.6. Use roll(UCalendarDateFields field, int32_t amount, UErrorCode& status) instead. */ virtual void roll(EDateFields field, int32_t amount, UErrorCode& status); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * (Overrides Calendar) Rolls up or down by the given amount in the specified field. @@ -774,5 +778,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _GREGOCAL //eof diff --git a/deps/icu-small/source/i18n/unicode/listformatter.h b/deps/icu-small/source/i18n/unicode/listformatter.h index 9ce8ec8617ce80..88fc46cf37b2a3 100644 --- a/deps/icu-small/source/i18n/unicode/listformatter.h +++ b/deps/icu-small/source/i18n/unicode/listformatter.h @@ -21,6 +21,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #include "unicode/unistr.h" #include "unicode/locid.h" #include "unicode/formattedvalue.h" @@ -237,7 +239,7 @@ class U_I18N_API ListFormatter : public UObject{ UnicodeString& format(const UnicodeString items[], int32_t n_items, UnicodeString & appendTo, FieldPositionIterator* posIter, UErrorCode& errorCode) const; -#endif /* U_HIDE_DRAFT_API */ +#endif // U_HIDE_DRAFT_API #if !UCONFIG_NO_FORMATTING #ifndef U_HIDE_DRAFT_API @@ -298,4 +300,6 @@ class U_I18N_API ListFormatter : public UObject{ U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __LISTFORMATTER_H__ diff --git a/deps/icu-small/source/i18n/unicode/measfmt.h b/deps/icu-small/source/i18n/unicode/measfmt.h index d518665e1448b5..8f73de87fa55d6 100644 --- a/deps/icu-small/source/i18n/unicode/measfmt.h +++ b/deps/icu-small/source/i18n/unicode/measfmt.h @@ -15,6 +15,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/format.h" @@ -151,7 +153,7 @@ class U_I18N_API MeasureFormat : public Format { * Clones this object polymorphically. * @stable ICU 53 */ - virtual Format *clone() const; + virtual MeasureFormat *clone() const; /** * Formats object to produce a string. @@ -163,6 +165,7 @@ class U_I18N_API MeasureFormat : public Format { FieldPosition &pos, UErrorCode &status) const; +#ifndef U_FORCE_HIDE_DRAFT_API /** * Parse a string to produce an object. This implementation sets * status to U_UNSUPPORTED_ERROR. @@ -173,6 +176,7 @@ class U_I18N_API MeasureFormat : public Format { const UnicodeString &source, Formattable &reslt, ParsePosition &pos) const; +#endif // U_FORCE_HIDE_DRAFT_API /** * Formats measure objects to produce a string. An example of such a @@ -382,17 +386,12 @@ class U_I18N_API MeasureFormat : public Format { int32_t bitMap, // 1=hour set, 2=minute set, 4=second set UnicodeString &appendTo, UErrorCode &status) const; - - UnicodeString &formatNumeric( - UDate date, - const DateFormat &dateFmt, - UDateFormatField smallestField, - const Formattable &smallestAmount, - UnicodeString &appendTo, - UErrorCode &status) const; }; U_NAMESPACE_END #endif // #if !UCONFIG_NO_FORMATTING + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // #ifndef MEASUREFORMAT_H diff --git a/deps/icu-small/source/i18n/unicode/measunit.h b/deps/icu-small/source/i18n/unicode/measunit.h index d8e3c73956f9c3..08f337cb5bb630 100644 --- a/deps/icu-small/source/i18n/unicode/measunit.h +++ b/deps/icu-small/source/i18n/unicode/measunit.h @@ -15,6 +15,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/unistr.h" @@ -62,7 +64,7 @@ class U_I18N_API MeasureUnit: public UObject { * have the same class as returned by getDynamicClassID(). * @stable ICU 3.0 */ - virtual UObject* clone() const; + virtual MeasureUnit* clone() const; /** * Destructor @@ -604,16 +606,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getPartPerMillion(); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of concentr: percent. * Caller owns returned value and must free it. * Also see {@link #getPercent()}. * @param status ICU error code. - * @draft ICU 63 + * @stable ICU 63 */ static MeasureUnit *createPercent(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** @@ -624,16 +624,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getPercent(); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of concentr: permille. * Caller owns returned value and must free it. * Also see {@link #getPermille()}. * @param status ICU error code. - * @draft ICU 63 + * @stable ICU 63 */ static MeasureUnit *createPermille(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** @@ -878,16 +876,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getMegabyte(); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of digital: petabyte. * Caller owns returned value and must free it. * Also see {@link #getPetabyte()}. * @param status ICU error code. - * @draft ICU 63 + * @stable ICU 63 */ static MeasureUnit *createPetabyte(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** @@ -979,9 +975,7 @@ class U_I18N_API MeasureUnit: public UObject { * @draft ICU 64 */ static MeasureUnit *createDayPerson(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by value, unit of duration: day-person. * Also see {@link #createDayPerson()}. @@ -990,6 +984,24 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getDayPerson(); #endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of duration: decade. + * Caller owns returned value and must free it. + * Also see {@link #getDecade()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createDecade(UErrorCode &status); + + /** + * Returns by value, unit of duration: decade. + * Also see {@link #createDecade()}. + * @draft ICU 65 + */ + static MeasureUnit getDecade(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of duration: hour. * Caller owns returned value and must free it. @@ -1089,9 +1101,7 @@ class U_I18N_API MeasureUnit: public UObject { * @draft ICU 64 */ static MeasureUnit *createMonthPerson(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by value, unit of duration: month-person. * Also see {@link #createMonthPerson()}. @@ -1163,9 +1173,7 @@ class U_I18N_API MeasureUnit: public UObject { * @draft ICU 64 */ static MeasureUnit *createWeekPerson(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by value, unit of duration: week-person. * Also see {@link #createWeekPerson()}. @@ -1201,9 +1209,7 @@ class U_I18N_API MeasureUnit: public UObject { * @draft ICU 64 */ static MeasureUnit *createYearPerson(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by value, unit of duration: year-person. * Also see {@link #createYearPerson()}. @@ -1428,6 +1434,24 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getKilowattHour(); #endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of energy: therm-us. + * Caller owns returned value and must free it. + * Also see {@link #getThermUs()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createThermUs(UErrorCode &status); + + /** + * Returns by value, unit of energy: therm-us. + * Also see {@link #createThermUs()}. + * @draft ICU 65 + */ + static MeasureUnit getThermUs(); +#endif /* U_HIDE_DRAFT_API */ + #ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of force: newton. @@ -1536,6 +1560,132 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getMegahertz(); #endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: dot-per-centimeter. + * Caller owns returned value and must free it. + * Also see {@link #getDotPerCentimeter()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createDotPerCentimeter(UErrorCode &status); + + /** + * Returns by value, unit of graphics: dot-per-centimeter. + * Also see {@link #createDotPerCentimeter()}. + * @draft ICU 65 + */ + static MeasureUnit getDotPerCentimeter(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: dot-per-inch. + * Caller owns returned value and must free it. + * Also see {@link #getDotPerInch()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createDotPerInch(UErrorCode &status); + + /** + * Returns by value, unit of graphics: dot-per-inch. + * Also see {@link #createDotPerInch()}. + * @draft ICU 65 + */ + static MeasureUnit getDotPerInch(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: em. + * Caller owns returned value and must free it. + * Also see {@link #getEm()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createEm(UErrorCode &status); + + /** + * Returns by value, unit of graphics: em. + * Also see {@link #createEm()}. + * @draft ICU 65 + */ + static MeasureUnit getEm(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: megapixel. + * Caller owns returned value and must free it. + * Also see {@link #getMegapixel()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createMegapixel(UErrorCode &status); + + /** + * Returns by value, unit of graphics: megapixel. + * Also see {@link #createMegapixel()}. + * @draft ICU 65 + */ + static MeasureUnit getMegapixel(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: pixel. + * Caller owns returned value and must free it. + * Also see {@link #getPixel()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createPixel(UErrorCode &status); + + /** + * Returns by value, unit of graphics: pixel. + * Also see {@link #createPixel()}. + * @draft ICU 65 + */ + static MeasureUnit getPixel(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: pixel-per-centimeter. + * Caller owns returned value and must free it. + * Also see {@link #getPixelPerCentimeter()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createPixelPerCentimeter(UErrorCode &status); + + /** + * Returns by value, unit of graphics: pixel-per-centimeter. + * Also see {@link #createPixelPerCentimeter()}. + * @draft ICU 65 + */ + static MeasureUnit getPixelPerCentimeter(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of graphics: pixel-per-inch. + * Caller owns returned value and must free it. + * Also see {@link #getPixelPerInch()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createPixelPerInch(UErrorCode &status); + + /** + * Returns by value, unit of graphics: pixel-per-inch. + * Also see {@link #createPixelPerInch()}. + * @draft ICU 65 + */ + static MeasureUnit getPixelPerInch(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of length: astronomical-unit. * Caller owns returned value and must free it. @@ -2310,16 +2460,14 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getWatt(); #endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * Returns by pointer, unit of pressure: atmosphere. * Caller owns returned value and must free it. * Also see {@link #getAtmosphere()}. * @param status ICU error code. - * @draft ICU 63 + * @stable ICU 63 */ static MeasureUnit *createAtmosphere(UErrorCode &status); -#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** @@ -2330,6 +2478,24 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getAtmosphere(); #endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of pressure: bar. + * Caller owns returned value and must free it. + * Also see {@link #getBar()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createBar(UErrorCode &status); + + /** + * Returns by value, unit of pressure: bar. + * Also see {@link #createBar()}. + * @draft ICU 65 + */ + static MeasureUnit getBar(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of pressure: hectopascal. * Caller owns returned value and must free it. @@ -2438,6 +2604,24 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit getMillimeterOfMercury(); #endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of pressure: pascal. + * Caller owns returned value and must free it. + * Also see {@link #getPascal()}. + * @param status ICU error code. + * @draft ICU 65 + */ + static MeasureUnit *createPascal(UErrorCode &status); + + /** + * Returns by value, unit of pressure: pascal. + * Also see {@link #createPascal()}. + * @draft ICU 65 + */ + static MeasureUnit getPascal(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of pressure: pound-per-square-inch. * Caller owns returned value and must free it. @@ -3164,4 +3348,7 @@ class U_I18N_API MeasureUnit: public UObject { U_NAMESPACE_END #endif // !UNCONFIG_NO_FORMATTING + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __MEASUREUNIT_H__ diff --git a/deps/icu-small/source/i18n/unicode/measure.h b/deps/icu-small/source/i18n/unicode/measure.h index 71438d5c856b78..a15173d739d94f 100644 --- a/deps/icu-small/source/i18n/unicode/measure.h +++ b/deps/icu-small/source/i18n/unicode/measure.h @@ -15,6 +15,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: MeasureUnit object. @@ -72,7 +74,7 @@ class U_I18N_API Measure: public UObject { * have the same class as returned by getDynamicClassID(). * @stable ICU 3.0 */ - virtual UObject* clone() const; + virtual Measure* clone() const; /** * Destructor @@ -158,4 +160,7 @@ inline const MeasureUnit& Measure::getUnit() const { U_NAMESPACE_END #endif // !UCONFIG_NO_FORMATTING + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __MEASURE_H__ diff --git a/deps/icu-small/source/i18n/unicode/msgfmt.h b/deps/icu-small/source/i18n/unicode/msgfmt.h index 8e1bf9b45f9184..99b0eaeec1dcd8 100644 --- a/deps/icu-small/source/i18n/unicode/msgfmt.h +++ b/deps/icu-small/source/i18n/unicode/msgfmt.h @@ -21,6 +21,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Formats messages in a language-neutral way. @@ -184,7 +186,7 @@ class NumberFormat; * argSkeletonText * NumberFormatter::forSkeleton(argSkeletonText, status).locale(getLocale()).toFormat(status) * - * date + * date * (none) * DateFormat.createDateInstance(kDefault, getLocale(), status) * @@ -418,7 +420,7 @@ class U_I18N_API MessageFormat : public Format { * result and should delete it when done. * @stable ICU 2.0 */ - virtual Format* clone(void) const; + virtual MessageFormat* clone() const; /** * Returns true if the given Format objects are semantically equal. @@ -1087,7 +1089,7 @@ class U_I18N_API MessageFormat : public Format { class U_I18N_API DummyFormat : public Format { public: virtual UBool operator==(const Format&) const; - virtual Format* clone() const; + virtual DummyFormat* clone() const; virtual UnicodeString& format(const Formattable& obj, UnicodeString& appendTo, UErrorCode& status) const; @@ -1111,5 +1113,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _MSGFMT //eof diff --git a/deps/icu-small/source/i18n/unicode/nounit.h b/deps/icu-small/source/i18n/unicode/nounit.h index 879849b16bd8e0..61b5c16ee3955b 100644 --- a/deps/icu-small/source/i18n/unicode/nounit.h +++ b/deps/icu-small/source/i18n/unicode/nounit.h @@ -12,11 +12,14 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING -#ifndef U_HIDE_DRAFT_API #include "unicode/measunit.h" +#ifndef U_HIDE_DRAFT_API + /** * \file * \brief C++ API: units for percent and permille @@ -72,7 +75,7 @@ class U_I18N_API NoUnit: public MeasureUnit { * have the same class as returned by getDynamicClassID(). * @draft ICU 60 */ - virtual UObject* clone() const; + virtual NoUnit* clone() const; /** * Returns a unique class ID for this object POLYMORPHICALLY. @@ -106,6 +109,8 @@ U_NAMESPACE_END #endif /* U_HIDE_DRAFT_API */ #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __NOUNIT_H__ //eof // diff --git a/deps/icu-small/source/i18n/unicode/numberformatter.h b/deps/icu-small/source/i18n/unicode/numberformatter.h index e9fe39a9316665..6d48f18ab55a4d 100644 --- a/deps/icu-small/source/i18n/unicode/numberformatter.h +++ b/deps/icu-small/source/i18n/unicode/numberformatter.h @@ -1,15 +1,19 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html +#ifndef __NUMBERFORMATTER_H__ +#define __NUMBERFORMATTER_H__ + #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING -#ifndef __NUMBERFORMATTER_H__ -#define __NUMBERFORMATTER_H__ #include "unicode/appendable.h" -#include "unicode/dcfmtsym.h" +#include "unicode/bytestream.h" #include "unicode/currunit.h" +#include "unicode/dcfmtsym.h" #include "unicode/fieldpos.h" #include "unicode/formattedvalue.h" #include "unicode/fpositer.h" @@ -22,8 +26,6 @@ #include "unicode/unumberformatter.h" #include "unicode/uobject.h" -#ifndef U_HIDE_DRAFT_API - /** * \file * \brief C++ API: Library for localized number formatting introduced in ICU 60. @@ -85,6 +87,7 @@ U_NAMESPACE_BEGIN // Forward declarations: class IFixedDecimal; class FieldPositionIteratorHandler; +class FormattedStringBuilder; namespace numparse { namespace impl { @@ -142,7 +145,6 @@ class MultiplierProducer; class RoundingImpl; class ScientificHandler; class Modifier; -class NumberStringBuilder; class AffixPatternProvider; class NumberPropertyMapper; struct DecimalFormatProperties; @@ -167,21 +169,21 @@ void touchRangeLocales(impl::RangeMacroProps& macros); /** * Extra name reserved in case it is needed in the future. * - * @draft ICU 63 + * @stable ICU 63 */ typedef Notation CompactNotation; /** * Extra name reserved in case it is needed in the future. * - * @draft ICU 63 + * @stable ICU 63 */ typedef Notation SimpleNotation; /** * A class that defines the notation style to be used when formatting numbers in NumberFormatter. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API Notation : public UMemory { public: @@ -207,7 +209,7 @@ class U_I18N_API Notation : public UMemory { * * * @return A ScientificNotation for chaining or passing to the NumberFormatter notation() setter. - * @draft ICU 60 + * @stable ICU 60 */ static ScientificNotation scientific(); @@ -231,7 +233,7 @@ class U_I18N_API Notation : public UMemory { * * * @return A ScientificNotation for chaining or passing to the NumberFormatter notation() setter. - * @draft ICU 60 + * @stable ICU 60 */ static ScientificNotation engineering(); @@ -274,7 +276,7 @@ class U_I18N_API Notation : public UMemory { * * * @return A CompactNotation for passing to the NumberFormatter notation() setter. - * @draft ICU 60 + * @stable ICU 60 */ static CompactNotation compactShort(); @@ -298,7 +300,7 @@ class U_I18N_API Notation : public UMemory { * * * @return A CompactNotation for passing to the NumberFormatter notation() setter. - * @draft ICU 60 + * @stable ICU 60 */ static CompactNotation compactLong(); @@ -324,7 +326,7 @@ class U_I18N_API Notation : public UMemory { * * * @return A SimpleNotation for passing to the NumberFormatter notation() setter. - * @draft ICU 60 + * @stable ICU 60 */ static SimpleNotation simple(); @@ -391,7 +393,7 @@ class U_I18N_API Notation : public UMemory { *

* To create a ScientificNotation, use one of the factory methods in {@link Notation}. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API ScientificNotation : public Notation { public: @@ -406,7 +408,7 @@ class U_I18N_API ScientificNotation : public Notation { * @param minExponentDigits * The minimum number of digits to show in the exponent. * @return A ScientificNotation, for chaining. - * @draft ICU 60 + * @stable ICU 60 */ ScientificNotation withMinExponentDigits(int32_t minExponentDigits) const; @@ -421,7 +423,7 @@ class U_I18N_API ScientificNotation : public Notation { * @param exponentSignDisplay * The strategy for displaying the sign in the exponent. * @return A ScientificNotation, for chaining. - * @draft ICU 60 + * @stable ICU 60 */ ScientificNotation withExponentSignDisplay(UNumberSignDisplay exponentSignDisplay) const; @@ -442,7 +444,7 @@ class U_I18N_API ScientificNotation : public Notation { /** * Extra name reserved in case it is needed in the future. * - * @draft ICU 63 + * @stable ICU 63 */ typedef Precision SignificantDigitsPrecision; @@ -452,7 +454,7 @@ typedef Precision SignificantDigitsPrecision; *

* To create a Precision, use one of the factory methods. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API Precision : public UMemory { @@ -472,7 +474,7 @@ class U_I18N_API Precision : public UMemory { * http://www.serpentine.com/blog/2011/06/29/here-be-dragons-advances-in-problems-you-didnt-even-know-you-had/ * * @return A Precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static Precision unlimited(); @@ -480,7 +482,7 @@ class U_I18N_API Precision : public UMemory { * Show numbers rounded if necessary to the nearest integer. * * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static FractionPrecision integer(); @@ -509,7 +511,7 @@ class U_I18N_API Precision : public UMemory { * The minimum and maximum number of numerals to display after the decimal separator (rounding if too * long or padding with zeros if too short). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static FractionPrecision fixedFraction(int32_t minMaxFractionPlaces); @@ -524,7 +526,7 @@ class U_I18N_API Precision : public UMemory { * The minimum number of numerals to display after the decimal separator (padding with zeros if * necessary). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static FractionPrecision minFraction(int32_t minFractionPlaces); @@ -536,7 +538,7 @@ class U_I18N_API Precision : public UMemory { * @param maxFractionPlaces * The maximum number of numerals to display after the decimal mark (rounding if necessary). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static FractionPrecision maxFraction(int32_t maxFractionPlaces); @@ -551,7 +553,7 @@ class U_I18N_API Precision : public UMemory { * @param maxFractionPlaces * The maximum number of numerals to display after the decimal separator (rounding if necessary). * @return A FractionPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static FractionPrecision minMaxFraction(int32_t minFractionPlaces, int32_t maxFractionPlaces); @@ -566,7 +568,7 @@ class U_I18N_API Precision : public UMemory { * The minimum and maximum number of significant digits to display (rounding if too long or padding with * zeros if too short). * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 + * @stable ICU 62 */ static SignificantDigitsPrecision fixedSignificantDigits(int32_t minMaxSignificantDigits); @@ -580,7 +582,7 @@ class U_I18N_API Precision : public UMemory { * @param minSignificantDigits * The minimum number of significant digits to display (padding with zeros if too short). * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 + * @stable ICU 62 */ static SignificantDigitsPrecision minSignificantDigits(int32_t minSignificantDigits); @@ -590,7 +592,7 @@ class U_I18N_API Precision : public UMemory { * @param maxSignificantDigits * The maximum number of significant digits to display (rounding if too long). * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 + * @stable ICU 62 */ static SignificantDigitsPrecision maxSignificantDigits(int32_t maxSignificantDigits); @@ -603,7 +605,7 @@ class U_I18N_API Precision : public UMemory { * @param maxSignificantDigits * The maximum number of significant digits to display (rounding if necessary). * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 62 + * @stable ICU 62 */ static SignificantDigitsPrecision minMaxSignificantDigits(int32_t minSignificantDigits, int32_t maxSignificantDigits); @@ -625,7 +627,7 @@ class U_I18N_API Precision : public UMemory { * @param roundingIncrement * The increment to which to round numbers. * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static IncrementPrecision increment(double roundingIncrement); @@ -644,7 +646,7 @@ class U_I18N_API Precision : public UMemory { * Either STANDARD (for digital transactions) or CASH (for transactions where the rounding increment may * be limited by the available denominations of cash or coins). * @return A CurrencyPrecision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ static CurrencyPrecision currency(UCurrencyUsage currencyUsage); @@ -771,7 +773,7 @@ class U_I18N_API Precision : public UMemory { *

* To create a FractionPrecision, use one of the factory methods on Precision. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API FractionPrecision : public Precision { public: @@ -789,7 +791,7 @@ class U_I18N_API FractionPrecision : public Precision { * @param minSignificantDigits * The number of significant figures to guarantee. * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ Precision withMinDigits(int32_t minSignificantDigits) const; @@ -808,7 +810,7 @@ class U_I18N_API FractionPrecision : public Precision { * @param maxSignificantDigits * Round the number to no more than this number of significant figures. * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ Precision withMaxDigits(int32_t maxSignificantDigits) const; @@ -827,7 +829,7 @@ class U_I18N_API FractionPrecision : public Precision { *

* To create a CurrencyPrecision, use one of the factory methods on Precision. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API CurrencyPrecision : public Precision { public: @@ -846,7 +848,7 @@ class U_I18N_API CurrencyPrecision : public Precision { * @param currency * The currency to associate with this rounding precision. * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ Precision withCurrency(const CurrencyUnit ¤cy) const; @@ -865,7 +867,7 @@ class U_I18N_API CurrencyPrecision : public Precision { *

* To create an IncrementPrecision, use one of the factory methods on Precision. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API IncrementPrecision : public Precision { public: @@ -882,7 +884,7 @@ class U_I18N_API IncrementPrecision : public Precision { * * @param minFrac The minimum number of digits after the decimal separator. * @return A precision for chaining or passing to the NumberFormatter precision() setter. - * @draft ICU 60 + * @stable ICU 60 */ Precision withMinFraction(int32_t minFrac) const; @@ -900,7 +902,7 @@ class U_I18N_API IncrementPrecision : public Precision { *

* To create an IntegerWidth, use one of the factory methods. * - * @draft ICU 60 + * @stable ICU 60 * @see NumberFormatter */ class U_I18N_API IntegerWidth : public UMemory { @@ -914,7 +916,7 @@ class U_I18N_API IntegerWidth : public UMemory { * @param minInt * The minimum number of places before the decimal separator. * @return An IntegerWidth for chaining or passing to the NumberFormatter integerWidth() setter. - * @draft ICU 60 + * @stable ICU 60 */ static IntegerWidth zeroFillTo(int32_t minInt); @@ -927,7 +929,7 @@ class U_I18N_API IntegerWidth : public UMemory { * The maximum number of places before the decimal separator. maxInt == -1 means no * truncation. * @return An IntegerWidth for passing to the NumberFormatter integerWidth() setter. - * @draft ICU 60 + * @stable ICU 60 */ IntegerWidth truncateAt(int32_t maxInt); @@ -994,7 +996,7 @@ class U_I18N_API IntegerWidth : public UMemory { *

* To create a Scale, use one of the factory methods. * - * @draft ICU 62 + * @stable ICU 62 */ class U_I18N_API Scale : public UMemory { public: @@ -1002,7 +1004,7 @@ class U_I18N_API Scale : public UMemory { * Do not change the value of numbers when formatting or parsing. * * @return A Scale to prevent any multiplication. - * @draft ICU 62 + * @stable ICU 62 */ static Scale none(); @@ -1014,7 +1016,7 @@ class U_I18N_API Scale : public UMemory { * * * @return A Scale for passing to the setter in NumberFormatter. - * @draft ICU 62 + * @stable ICU 62 */ static Scale powerOfTen(int32_t power); @@ -1028,7 +1030,7 @@ class U_I18N_API Scale : public UMemory { * Also see the version of this method that takes a double. * * @return A Scale for passing to the setter in NumberFormatter. - * @draft ICU 62 + * @stable ICU 62 */ static Scale byDecimal(StringPiece multiplicand); @@ -1038,7 +1040,7 @@ class U_I18N_API Scale : public UMemory { * This method takes a double; also see the version of this method that takes an exact decimal. * * @return A Scale for passing to the setter in NumberFormatter. - * @draft ICU 62 + * @stable ICU 62 */ static Scale byDouble(double multiplicand); @@ -1046,26 +1048,26 @@ class U_I18N_API Scale : public UMemory { * Multiply a number by both a power of ten and by an arbitrary double value. * * @return A Scale for passing to the setter in NumberFormatter. - * @draft ICU 62 + * @stable ICU 62 */ static Scale byDoubleAndPowerOfTen(double multiplicand, int32_t power); // We need a custom destructor for the DecNum, which means we need to declare // the copy/move constructor/assignment quartet. - /** @draft ICU 62 */ + /** @stable ICU 62 */ Scale(const Scale& other); - /** @draft ICU 62 */ + /** @stable ICU 62 */ Scale& operator=(const Scale& other); - /** @draft ICU 62 */ + /** @stable ICU 62 */ Scale(Scale&& src) U_NOEXCEPT; - /** @draft ICU 62 */ + /** @stable ICU 62 */ Scale& operator=(Scale&& src) U_NOEXCEPT; - /** @draft ICU 62 */ + /** @stable ICU 62 */ ~Scale(); #ifndef U_HIDE_INTERNAL_API @@ -1343,7 +1345,7 @@ class U_I18N_API Padder : public UMemory { } int32_t padAndApply(const impl::Modifier &mod1, const impl::Modifier &mod2, - impl::NumberStringBuilder &string, int32_t leftIndex, int32_t rightIndex, + FormattedStringBuilder &string, int32_t leftIndex, int32_t rightIndex, UErrorCode &status) const; // To allow MacroProps/MicroProps to initialize empty instances: @@ -1465,7 +1467,7 @@ class U_I18N_API NumberFormatterSettings { * The notation strategy to use. * @return The fluent chain. * @see Notation - * @draft ICU 60 + * @stable ICU 60 */ Derived notation(const Notation ¬ation) const &; @@ -1476,7 +1478,7 @@ class U_I18N_API NumberFormatterSettings { * The notation strategy to use. * @return The fluent chain. * @see #notation - * @draft ICU 62 + * @stable ICU 62 */ Derived notation(const Notation ¬ation) &&; @@ -1521,7 +1523,7 @@ class U_I18N_API NumberFormatterSettings { * @see Currency * @see NoUnit * @see #perUnit - * @draft ICU 60 + * @stable ICU 60 */ Derived unit(const icu::MeasureUnit &unit) const &; @@ -1532,7 +1534,7 @@ class U_I18N_API NumberFormatterSettings { * The unit to render. * @return The fluent chain. * @see #unit - * @draft ICU 62 + * @stable ICU 62 */ Derived unit(const icu::MeasureUnit &unit) &&; @@ -1547,7 +1549,7 @@ class U_I18N_API NumberFormatterSettings { * @return The fluent chain. * @see #unit * @see MeasureUnit - * @draft ICU 60 + * @stable ICU 60 */ Derived adoptUnit(icu::MeasureUnit *unit) const &; @@ -1558,7 +1560,7 @@ class U_I18N_API NumberFormatterSettings { * The unit to render. * @return The fluent chain. * @see #adoptUnit - * @draft ICU 62 + * @stable ICU 62 */ Derived adoptUnit(icu::MeasureUnit *unit) &&; @@ -1582,7 +1584,7 @@ class U_I18N_API NumberFormatterSettings { * The unit to render in the denominator. * @return The fluent chain * @see #unit - * @draft ICU 61 + * @stable ICU 61 */ Derived perUnit(const icu::MeasureUnit &perUnit) const &; @@ -1593,7 +1595,7 @@ class U_I18N_API NumberFormatterSettings { * The unit to render in the denominator. * @return The fluent chain. * @see #perUnit - * @draft ICU 62 + * @stable ICU 62 */ Derived perUnit(const icu::MeasureUnit &perUnit) &&; @@ -1608,7 +1610,7 @@ class U_I18N_API NumberFormatterSettings { * @return The fluent chain. * @see #perUnit * @see MeasureUnit - * @draft ICU 61 + * @stable ICU 61 */ Derived adoptPerUnit(icu::MeasureUnit *perUnit) const &; @@ -1619,7 +1621,7 @@ class U_I18N_API NumberFormatterSettings { * The unit to render in the denominator. * @return The fluent chain. * @see #adoptPerUnit - * @draft ICU 62 + * @stable ICU 62 */ Derived adoptPerUnit(icu::MeasureUnit *perUnit) &&; @@ -1651,7 +1653,7 @@ class U_I18N_API NumberFormatterSettings { * The rounding precision to use. * @return The fluent chain. * @see Precision - * @draft ICU 62 + * @stable ICU 62 */ Derived precision(const Precision& precision) const &; @@ -1662,7 +1664,7 @@ class U_I18N_API NumberFormatterSettings { * The rounding precision to use. * @return The fluent chain. * @see #precision - * @draft ICU 62 + * @stable ICU 62 */ Derived precision(const Precision& precision) &&; @@ -1682,7 +1684,7 @@ class U_I18N_API NumberFormatterSettings { * * @param roundingMode The rounding mode to use. * @return The fluent chain. - * @draft ICU 62 + * @stable ICU 62 */ Derived roundingMode(UNumberFormatRoundingMode roundingMode) const &; @@ -1692,7 +1694,7 @@ class U_I18N_API NumberFormatterSettings { * @param roundingMode The rounding mode to use. * @return The fluent chain. * @see #roundingMode - * @draft ICU 62 + * @stable ICU 62 */ Derived roundingMode(UNumberFormatRoundingMode roundingMode) &&; @@ -1721,7 +1723,7 @@ class U_I18N_API NumberFormatterSettings { * @param strategy * The grouping strategy to use. * @return The fluent chain. - * @draft ICU 61 + * @stable ICU 61 */ Derived grouping(UNumberGroupingStrategy strategy) const &; @@ -1732,7 +1734,7 @@ class U_I18N_API NumberFormatterSettings { * The grouping strategy to use. * @return The fluent chain. * @see #grouping - * @draft ICU 62 + * @stable ICU 62 */ Derived grouping(UNumberGroupingStrategy strategy) &&; @@ -1758,7 +1760,7 @@ class U_I18N_API NumberFormatterSettings { * The integer width to use. * @return The fluent chain. * @see IntegerWidth - * @draft ICU 60 + * @stable ICU 60 */ Derived integerWidth(const IntegerWidth &style) const &; @@ -1769,7 +1771,7 @@ class U_I18N_API NumberFormatterSettings { * The integer width to use. * @return The fluent chain. * @see #integerWidth - * @draft ICU 62 + * @stable ICU 62 */ Derived integerWidth(const IntegerWidth &style) &&; @@ -1811,7 +1813,7 @@ class U_I18N_API NumberFormatterSettings { * The DecimalFormatSymbols to use. * @return The fluent chain. * @see DecimalFormatSymbols - * @draft ICU 60 + * @stable ICU 60 */ Derived symbols(const DecimalFormatSymbols &symbols) const &; @@ -1822,7 +1824,7 @@ class U_I18N_API NumberFormatterSettings { * The DecimalFormatSymbols to use. * @return The fluent chain. * @see #symbols - * @draft ICU 62 + * @stable ICU 62 */ Derived symbols(const DecimalFormatSymbols &symbols) &&; @@ -1857,7 +1859,7 @@ class U_I18N_API NumberFormatterSettings { * The NumberingSystem to use. * @return The fluent chain. * @see NumberingSystem - * @draft ICU 60 + * @stable ICU 60 */ Derived adoptSymbols(NumberingSystem *symbols) const &; @@ -1868,7 +1870,7 @@ class U_I18N_API NumberFormatterSettings { * The NumberingSystem to use. * @return The fluent chain. * @see #adoptSymbols - * @draft ICU 62 + * @stable ICU 62 */ Derived adoptSymbols(NumberingSystem *symbols) &&; @@ -1895,7 +1897,7 @@ class U_I18N_API NumberFormatterSettings { * The width to use when rendering numbers. * @return The fluent chain * @see UNumberUnitWidth - * @draft ICU 60 + * @stable ICU 60 */ Derived unitWidth(UNumberUnitWidth width) const &; @@ -1906,7 +1908,7 @@ class U_I18N_API NumberFormatterSettings { * The width to use when rendering numbers. * @return The fluent chain. * @see #unitWidth - * @draft ICU 62 + * @stable ICU 62 */ Derived unitWidth(UNumberUnitWidth width) &&; @@ -1933,7 +1935,7 @@ class U_I18N_API NumberFormatterSettings { * The sign display strategy to use when rendering numbers. * @return The fluent chain * @see UNumberSignDisplay - * @draft ICU 60 + * @stable ICU 60 */ Derived sign(UNumberSignDisplay style) const &; @@ -1944,7 +1946,7 @@ class U_I18N_API NumberFormatterSettings { * The sign display strategy to use when rendering numbers. * @return The fluent chain. * @see #sign - * @draft ICU 62 + * @stable ICU 62 */ Derived sign(UNumberSignDisplay style) &&; @@ -1971,7 +1973,7 @@ class U_I18N_API NumberFormatterSettings { * The decimal separator display strategy to use when rendering numbers. * @return The fluent chain * @see UNumberDecimalSeparatorDisplay - * @draft ICU 60 + * @stable ICU 60 */ Derived decimal(UNumberDecimalSeparatorDisplay style) const &; @@ -1982,7 +1984,7 @@ class U_I18N_API NumberFormatterSettings { * The decimal separator display strategy to use when rendering numbers. * @return The fluent chain. * @see #decimal - * @draft ICU 62 + * @stable ICU 62 */ Derived decimal(UNumberDecimalSeparatorDisplay style) &&; @@ -2008,7 +2010,7 @@ class U_I18N_API NumberFormatterSettings { * @param scale * The scale to apply when rendering numbers. * @return The fluent chain - * @draft ICU 62 + * @stable ICU 62 */ Derived scale(const Scale &scale) const &; @@ -2019,7 +2021,7 @@ class U_I18N_API NumberFormatterSettings { * The scale to apply when rendering numbers. * @return The fluent chain. * @see #scale - * @draft ICU 62 + * @stable ICU 62 */ Derived scale(const Scale &scale) &&; @@ -2076,10 +2078,11 @@ class U_I18N_API NumberFormatterSettings { * behavior should produce the same skeleton. * * @return A number skeleton string with behavior corresponding to this number formatter. - * @draft ICU 62 + * @stable ICU 62 */ UnicodeString toSkeleton(UErrorCode& status) const; +#ifndef U_HIDE_DRAFT_API /** * Returns the current (Un)LocalizedNumberFormatter as a LocalPointer * wrapping a heap-allocated copy of the current object. @@ -2101,12 +2104,13 @@ class U_I18N_API NumberFormatterSettings { * @draft ICU 64 */ LocalPointer clone() &&; +#endif /* U_HIDE_DRAFT_API */ /** * Sets the UErrorCode if an error occurred in the fluent chain. * Preserves older error codes in the outErrorCode. * @return TRUE if U_FAILURE(outErrorCode) - * @draft ICU 60 + * @stable ICU 60 */ UBool copyErrorTo(UErrorCode &outErrorCode) const { if (U_FAILURE(outErrorCode)) { @@ -2139,7 +2143,7 @@ class U_I18N_API NumberFormatterSettings { * Instances of this class are immutable and thread-safe. * * @see NumberFormatter - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API UnlocalizedNumberFormatter : public NumberFormatterSettings, public UMemory { @@ -2152,7 +2156,7 @@ class U_I18N_API UnlocalizedNumberFormatter * @param locale * The locale to use when loading data for number formatting. * @return The fluent chain. - * @draft ICU 60 + * @stable ICU 60 */ LocalizedNumberFormatter locale(const icu::Locale &locale) const &; @@ -2163,40 +2167,40 @@ class U_I18N_API UnlocalizedNumberFormatter * The locale to use when loading data for number formatting. * @return The fluent chain. * @see #locale - * @draft ICU 62 + * @stable ICU 62 */ LocalizedNumberFormatter locale(const icu::Locale &locale) &&; /** * Default constructor: puts the formatter into a valid but undefined state. * - * @draft ICU 62 + * @stable ICU 62 */ UnlocalizedNumberFormatter() = default; /** * Returns a copy of this UnlocalizedNumberFormatter. - * @draft ICU 60 + * @stable ICU 60 */ UnlocalizedNumberFormatter(const UnlocalizedNumberFormatter &other); /** * Move constructor: * The source UnlocalizedNumberFormatter will be left in a valid but undefined state. - * @draft ICU 62 + * @stable ICU 62 */ UnlocalizedNumberFormatter(UnlocalizedNumberFormatter&& src) U_NOEXCEPT; /** * Copy assignment operator. - * @draft ICU 62 + * @stable ICU 62 */ UnlocalizedNumberFormatter& operator=(const UnlocalizedNumberFormatter& other); /** * Move assignment operator: * The source UnlocalizedNumberFormatter will be left in a valid but undefined state. - * @draft ICU 62 + * @stable ICU 62 */ UnlocalizedNumberFormatter& operator=(UnlocalizedNumberFormatter&& src) U_NOEXCEPT; @@ -2219,7 +2223,7 @@ class U_I18N_API UnlocalizedNumberFormatter * Instances of this class are immutable and thread-safe. * * @see NumberFormatter - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API LocalizedNumberFormatter : public NumberFormatterSettings, public UMemory { @@ -2233,7 +2237,7 @@ class U_I18N_API LocalizedNumberFormatter * @param status * Set to an ErrorCode if one occurred in the setter chain or during formatting. * @return A FormattedNumber object; call .toString() to get the string. - * @draft ICU 60 + * @stable ICU 60 */ FormattedNumber formatInt(int64_t value, UErrorCode &status) const; @@ -2246,7 +2250,7 @@ class U_I18N_API LocalizedNumberFormatter * @param status * Set to an ErrorCode if one occurred in the setter chain or during formatting. * @return A FormattedNumber object; call .toString() to get the string. - * @draft ICU 60 + * @stable ICU 60 */ FormattedNumber formatDouble(double value, UErrorCode &status) const; @@ -2262,7 +2266,7 @@ class U_I18N_API LocalizedNumberFormatter * @param status * Set to an ErrorCode if one occurred in the setter chain or during formatting. * @return A FormattedNumber object; call .toString() to get the string. - * @draft ICU 60 + * @stable ICU 60 */ FormattedNumber formatDecimal(StringPiece value, UErrorCode& status) const; @@ -2303,40 +2307,40 @@ class U_I18N_API LocalizedNumberFormatter * The caller owns the returned object and must delete it when finished. * * @return A Format wrapping this LocalizedNumberFormatter. - * @draft ICU 62 + * @stable ICU 62 */ Format* toFormat(UErrorCode& status) const; /** * Default constructor: puts the formatter into a valid but undefined state. * - * @draft ICU 62 + * @stable ICU 62 */ LocalizedNumberFormatter() = default; /** * Returns a copy of this LocalizedNumberFormatter. - * @draft ICU 60 + * @stable ICU 60 */ LocalizedNumberFormatter(const LocalizedNumberFormatter &other); /** * Move constructor: * The source LocalizedNumberFormatter will be left in a valid but undefined state. - * @draft ICU 62 + * @stable ICU 62 */ LocalizedNumberFormatter(LocalizedNumberFormatter&& src) U_NOEXCEPT; /** * Copy assignment operator. - * @draft ICU 62 + * @stable ICU 62 */ LocalizedNumberFormatter& operator=(const LocalizedNumberFormatter& other); /** * Move assignment operator: * The source LocalizedNumberFormatter will be left in a valid but undefined state. - * @draft ICU 62 + * @stable ICU 62 */ LocalizedNumberFormatter& operator=(LocalizedNumberFormatter&& src) U_NOEXCEPT; @@ -2360,7 +2364,7 @@ class U_I18N_API LocalizedNumberFormatter /** * Destruct this LocalizedNumberFormatter, cleaning up any memory it might own. - * @draft ICU 60 + * @stable ICU 60 */ ~LocalizedNumberFormatter(); @@ -2401,27 +2405,30 @@ class U_I18N_API LocalizedNumberFormatter * * Instances of this class are immutable and thread-safe. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { public: + // Default constructor cannot have #ifndef U_HIDE_DRAFT_API +#ifndef U_FORCE_HIDE_DRAFT_API /** * Default constructor; makes an empty FormattedNumber. * @draft ICU 64 */ FormattedNumber() : fData(nullptr), fErrorCode(U_INVALID_STATE_ERROR) {} +#endif // U_FORCE_HIDE_DRAFT_API /** * Move constructor: Leaves the source FormattedNumber in an undefined state. - * @draft ICU 62 + * @stable ICU 62 */ FormattedNumber(FormattedNumber&& src) U_NOEXCEPT; /** * Destruct an instance of FormattedNumber. - * @draft ICU 60 + * @stable ICU 60 */ virtual ~FormattedNumber() U_OVERRIDE; @@ -2433,7 +2440,7 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { /** * Move assignment: Leaves the source FormattedNumber in an undefined state. - * @draft ICU 62 + * @stable ICU 62 */ FormattedNumber& operator=(FormattedNumber&& src) U_NOEXCEPT; @@ -2443,7 +2450,7 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { * * For more information, see FormattedValue::toString() * - * @draft ICU 62 + * @stable ICU 62 */ UnicodeString toString(UErrorCode& status) const U_OVERRIDE; @@ -2457,7 +2464,7 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { * * For more information, see FormattedValue::appendTo() * - * @draft ICU 62 + * @stable ICU 62 */ Appendable &appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE; @@ -2465,6 +2472,7 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { /** @copydoc FormattedValue::nextPosition() */ UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; +#ifndef U_HIDE_DRAFT_API /** * Determines the start (inclusive) and end (exclusive) indices of the next occurrence of the given * field in the output string. This allows you to determine the locations of, for example, @@ -2516,6 +2524,30 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { * @see UNumberFormatFields */ void getAllFieldPositions(FieldPositionIterator &iterator, UErrorCode &status) const; +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Export the formatted number as a "numeric string" conforming to the + * syntax defined in the Decimal Arithmetic Specification, available at + * http://speleotrove.com/decimal + * + * This endpoint is useful for obtaining the exact number being printed + * after scaling and rounding have been applied by the number formatter. + * + * Example call site: + * + * auto decimalNumber = fn.toDecimalNumber(status); + * + * @tparam StringClass A string class compatible with StringByteSink; + * for example, std::string. + * @param status Set if an error occurs. + * @return A StringClass containing the numeric string. + * @draft ICU 65 + */ + template + inline StringClass toDecimalNumber(UErrorCode& status) const; +#endif // U_HIDE_DRAFT_API #ifndef U_HIDE_INTERNAL_API @@ -2550,6 +2582,9 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { explicit FormattedNumber(UErrorCode errorCode) : fData(nullptr), fErrorCode(errorCode) {} + // TODO(ICU-20775): Propose this as API. + void toDecimalNumber(ByteSink& sink, UErrorCode& status) const; + // To give LocalizedNumberFormatter format methods access to this class's constructor: friend class LocalizedNumberFormatter; @@ -2557,10 +2592,21 @@ class U_I18N_API FormattedNumber : public UMemory, public FormattedValue { friend struct impl::UFormattedNumberImpl; }; +#ifndef U_HIDE_DRAFT_API +// Note: This is draft ICU 65 +template +StringClass FormattedNumber::toDecimalNumber(UErrorCode& status) const { + StringClass result; + StringByteSink sink(&result); + toDecimalNumber(sink, status); + return result; +}; +#endif // U_HIDE_DRAFT_API + /** * See the main description in numberformatter.h for documentation and examples. * - * @draft ICU 60 + * @stable ICU 60 */ class U_I18N_API NumberFormatter final { public: @@ -2569,7 +2615,7 @@ class U_I18N_API NumberFormatter final { * the call site. * * @return An {@link UnlocalizedNumberFormatter}, to be used for chaining. - * @draft ICU 60 + * @stable ICU 60 */ static UnlocalizedNumberFormatter with(); @@ -2580,7 +2626,7 @@ class U_I18N_API NumberFormatter final { * @param locale * The locale from which to load formats and symbols for number formatting. * @return A {@link LocalizedNumberFormatter}, to be used for chaining. - * @draft ICU 60 + * @stable ICU 60 */ static LocalizedNumberFormatter withLocale(const Locale &locale); @@ -2596,10 +2642,11 @@ class U_I18N_API NumberFormatter final { * @param status * Set to U_NUMBER_SKELETON_SYNTAX_ERROR if the skeleton was invalid. * @return An UnlocalizedNumberFormatter, to be used for chaining. - * @draft ICU 62 + * @stable ICU 62 */ static UnlocalizedNumberFormatter forSkeleton(const UnicodeString& skeleton, UErrorCode& status); +#ifndef U_HIDE_DRAFT_API /** * Call this method at the beginning of a NumberFormatter fluent chain to create an instance based * on a given number skeleton string. @@ -2619,6 +2666,7 @@ class U_I18N_API NumberFormatter final { */ static UnlocalizedNumberFormatter forSkeleton(const UnicodeString& skeleton, UParseError& perror, UErrorCode& status); +#endif /** * Use factory methods instead of the constructor to create a NumberFormatter. @@ -2629,8 +2677,9 @@ class U_I18N_API NumberFormatter final { } // namespace number U_NAMESPACE_END -#endif // U_HIDE_DRAFT_API +#endif /* #if !UCONFIG_NO_FORMATTING */ + +#endif /* U_SHOW_CPLUSPLUS_API */ #endif // __NUMBERFORMATTER_H__ -#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/unicode/numberrangeformatter.h b/deps/icu-small/source/i18n/unicode/numberrangeformatter.h index 47c4bfe3f5ef76..e3a72aa8b21257 100644 --- a/deps/icu-small/source/i18n/unicode/numberrangeformatter.h +++ b/deps/icu-small/source/i18n/unicode/numberrangeformatter.h @@ -1,10 +1,15 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#if !UCONFIG_NO_FORMATTING #ifndef __NUMBERRANGEFORMATTER_H__ #define __NUMBERRANGEFORMATTER_H__ +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + +#if !UCONFIG_NO_FORMATTING + #include #include "unicode/appendable.h" #include "unicode/fieldpos.h" @@ -12,8 +17,6 @@ #include "unicode/fpositer.h" #include "unicode/numberformatter.h" -#ifndef U_HIDE_DRAFT_API - /** * \file * \brief C++ API: Library for localized formatting of number, currency, and unit ranges. @@ -44,7 +47,7 @@ /** * Defines how to merge fields that are identical across the range sign. * - * @draft ICU 63 + * @stable ICU 63 */ typedef enum UNumberRangeCollapse { /** @@ -53,14 +56,14 @@ typedef enum UNumberRangeCollapse { * * The heuristics used for this option are subject to change over time. * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_RANGE_COLLAPSE_AUTO, /** * Do not collapse any part of the number. Example: "3.2 thousand kilograms – 5.3 thousand kilograms" * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_RANGE_COLLAPSE_NONE, @@ -68,7 +71,7 @@ typedef enum UNumberRangeCollapse { * Collapse the unit part of the number, but not the notation, if present. Example: "3.2 thousand – 5.3 thousand * kilograms" * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_RANGE_COLLAPSE_UNIT, @@ -76,7 +79,7 @@ typedef enum UNumberRangeCollapse { * Collapse any field that is equal across the range sign. May introduce ambiguity on the magnitude of the * number. Example: "3.2 – 5.3 thousand kilograms" * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_RANGE_COLLAPSE_ALL } UNumberRangeCollapse; @@ -85,14 +88,14 @@ typedef enum UNumberRangeCollapse { * Defines the behavior when the two numbers in the range are identical after rounding. To programmatically detect * when the identity fallback is used, compare the lower and upper BigDecimals via FormattedNumber. * - * @draft ICU 63 + * @stable ICU 63 * @see NumberRangeFormatter */ typedef enum UNumberRangeIdentityFallback { /** * Show the number as a single value rather than a range. Example: "$5" * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_IDENTITY_FALLBACK_SINGLE_VALUE, @@ -100,7 +103,7 @@ typedef enum UNumberRangeIdentityFallback { * Show the number using a locale-sensitive approximation pattern. If the numbers were the same before rounding, * show the single value. Example: "~$5" or "$5" * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE, @@ -108,7 +111,7 @@ typedef enum UNumberRangeIdentityFallback { * Show the number using a locale-sensitive approximation pattern. Use the range pattern always, even if the * inputs are the same. Example: "~$5" * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_IDENTITY_FALLBACK_APPROXIMATELY, @@ -116,7 +119,7 @@ typedef enum UNumberRangeIdentityFallback { * Show the number as the range of two equal values. Use the range pattern always, even if the inputs are the * same. Example (with RangeCollapse.NONE): "$5 – $5" * - * @draft ICU 63 + * @stable ICU 63 */ UNUM_IDENTITY_FALLBACK_RANGE } UNumberRangeIdentityFallback; @@ -125,14 +128,14 @@ typedef enum UNumberRangeIdentityFallback { * Used in the result class FormattedNumberRange to indicate to the user whether the numbers formatted in the range * were equal or not, and whether or not the identity fallback was applied. * - * @draft ICU 63 + * @stable ICU 63 * @see NumberRangeFormatter */ typedef enum UNumberRangeIdentityResult { /** * Used to indicate that the two numbers in the range were equal, even before any rounding rules were applied. * - * @draft ICU 63 + * @stable ICU 63 * @see NumberRangeFormatter */ UNUM_IDENTITY_RESULT_EQUAL_BEFORE_ROUNDING, @@ -140,7 +143,7 @@ typedef enum UNumberRangeIdentityResult { /** * Used to indicate that the two numbers in the range were equal, but only after rounding rules were applied. * - * @draft ICU 63 + * @stable ICU 63 * @see NumberRangeFormatter */ UNUM_IDENTITY_RESULT_EQUAL_AFTER_ROUNDING, @@ -148,7 +151,7 @@ typedef enum UNumberRangeIdentityResult { /** * Used to indicate that the two numbers in the range were not equal, even after rounding rules were applied. * - * @draft ICU 63 + * @stable ICU 63 * @see NumberRangeFormatter */ UNUM_IDENTITY_RESULT_NOT_EQUAL, @@ -254,7 +257,7 @@ class U_I18N_API NumberRangeFormatterSettings { * @param formatter * The formatter to use for both numbers in the range. * @return The fluent chain. - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterBoth(const UnlocalizedNumberFormatter &formatter) const &; @@ -265,7 +268,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for both numbers in the range. * @return The fluent chain. * @see #numberFormatterBoth - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterBoth(const UnlocalizedNumberFormatter &formatter) &&; @@ -276,7 +279,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for both numbers in the range. * @return The fluent chain. * @see #numberFormatterBoth - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterBoth(UnlocalizedNumberFormatter &&formatter) const &; @@ -287,7 +290,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for both numbers in the range. * @return The fluent chain. * @see #numberFormatterBoth - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterBoth(UnlocalizedNumberFormatter &&formatter) &&; @@ -300,7 +303,7 @@ class U_I18N_API NumberRangeFormatterSettings { * @param formatterFirst * The formatter to use for the first number in the range. * @return The fluent chain. - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterFirst(const UnlocalizedNumberFormatter &formatterFirst) const &; @@ -311,7 +314,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for the first number in the range. * @return The fluent chain. * @see #numberFormatterFirst - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterFirst(const UnlocalizedNumberFormatter &formatterFirst) &&; @@ -322,7 +325,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for the first number in the range. * @return The fluent chain. * @see #numberFormatterFirst - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterFirst(UnlocalizedNumberFormatter &&formatterFirst) const &; @@ -333,7 +336,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for the first number in the range. * @return The fluent chain. * @see #numberFormatterFirst - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterFirst(UnlocalizedNumberFormatter &&formatterFirst) &&; @@ -346,7 +349,7 @@ class U_I18N_API NumberRangeFormatterSettings { * @param formatterSecond * The formatter to use for the second number in the range. * @return The fluent chain. - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterSecond(const UnlocalizedNumberFormatter &formatterSecond) const &; @@ -357,7 +360,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for the second number in the range. * @return The fluent chain. * @see #numberFormatterSecond - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterSecond(const UnlocalizedNumberFormatter &formatterSecond) &&; @@ -368,7 +371,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for the second number in the range. * @return The fluent chain. * @see #numberFormatterSecond - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterSecond(UnlocalizedNumberFormatter &&formatterSecond) const &; @@ -379,7 +382,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The formatter to use for the second number in the range. * @return The fluent chain. * @see #numberFormatterSecond - * @draft ICU 63 + * @stable ICU 63 */ Derived numberFormatterSecond(UnlocalizedNumberFormatter &&formatterSecond) &&; @@ -398,7 +401,7 @@ class U_I18N_API NumberRangeFormatterSettings { * @param collapse * The collapsing strategy to use for this range. * @return The fluent chain. - * @draft ICU 63 + * @stable ICU 63 */ Derived collapse(UNumberRangeCollapse collapse) const &; @@ -409,7 +412,7 @@ class U_I18N_API NumberRangeFormatterSettings { * The collapsing strategy to use for this range. * @return The fluent chain. * @see #collapse - * @draft ICU 63 + * @stable ICU 63 */ Derived collapse(UNumberRangeCollapse collapse) &&; @@ -431,7 +434,7 @@ class U_I18N_API NumberRangeFormatterSettings { * @param identityFallback * The strategy to use when formatting two numbers that end up being the same. * @return The fluent chain. - * @draft ICU 63 + * @stable ICU 63 */ Derived identityFallback(UNumberRangeIdentityFallback identityFallback) const &; @@ -442,10 +445,11 @@ class U_I18N_API NumberRangeFormatterSettings { * The strategy to use when formatting two numbers that end up being the same. * @return The fluent chain. * @see #identityFallback - * @draft ICU 63 + * @stable ICU 63 */ Derived identityFallback(UNumberRangeIdentityFallback identityFallback) &&; +#ifndef U_HIDE_DRAFT_API /** * Returns the current (Un)LocalizedNumberRangeFormatter as a LocalPointer * wrapping a heap-allocated copy of the current object. @@ -467,12 +471,13 @@ class U_I18N_API NumberRangeFormatterSettings { * @draft ICU 64 */ LocalPointer clone() &&; +#endif /* U_HIDE_DRAFT_API */ /** * Sets the UErrorCode if an error occurred in the fluent chain. * Preserves older error codes in the outErrorCode. * @return TRUE if U_FAILURE(outErrorCode) - * @draft ICU 63 + * @stable ICU 63 */ UBool copyErrorTo(UErrorCode &outErrorCode) const { if (U_FAILURE(outErrorCode)) { @@ -501,7 +506,7 @@ class U_I18N_API NumberRangeFormatterSettings { * Instances of this class are immutable and thread-safe. * * @see NumberRangeFormatter - * @draft ICU 63 + * @stable ICU 63 */ class U_I18N_API UnlocalizedNumberRangeFormatter : public NumberRangeFormatterSettings, public UMemory { @@ -514,7 +519,7 @@ class U_I18N_API UnlocalizedNumberRangeFormatter * @param locale * The locale to use when loading data for number formatting. * @return The fluent chain. - * @draft ICU 63 + * @stable ICU 63 */ LocalizedNumberRangeFormatter locale(const icu::Locale &locale) const &; @@ -525,40 +530,40 @@ class U_I18N_API UnlocalizedNumberRangeFormatter * The locale to use when loading data for number formatting. * @return The fluent chain. * @see #locale - * @draft ICU 63 + * @stable ICU 63 */ LocalizedNumberRangeFormatter locale(const icu::Locale &locale) &&; /** * Default constructor: puts the formatter into a valid but undefined state. * - * @draft ICU 63 + * @stable ICU 63 */ UnlocalizedNumberRangeFormatter() = default; /** * Returns a copy of this UnlocalizedNumberRangeFormatter. - * @draft ICU 63 + * @stable ICU 63 */ UnlocalizedNumberRangeFormatter(const UnlocalizedNumberRangeFormatter &other); /** * Move constructor: * The source UnlocalizedNumberRangeFormatter will be left in a valid but undefined state. - * @draft ICU 63 + * @stable ICU 63 */ UnlocalizedNumberRangeFormatter(UnlocalizedNumberRangeFormatter&& src) U_NOEXCEPT; /** * Copy assignment operator. - * @draft ICU 63 + * @stable ICU 63 */ UnlocalizedNumberRangeFormatter& operator=(const UnlocalizedNumberRangeFormatter& other); /** * Move assignment operator: * The source UnlocalizedNumberRangeFormatter will be left in a valid but undefined state. - * @draft ICU 63 + * @stable ICU 63 */ UnlocalizedNumberRangeFormatter& operator=(UnlocalizedNumberRangeFormatter&& src) U_NOEXCEPT; @@ -582,7 +587,7 @@ class U_I18N_API UnlocalizedNumberRangeFormatter * Instances of this class are immutable and thread-safe. * * @see NumberFormatter - * @draft ICU 63 + * @stable ICU 63 */ class U_I18N_API LocalizedNumberRangeFormatter : public NumberRangeFormatterSettings, public UMemory { @@ -598,7 +603,7 @@ class U_I18N_API LocalizedNumberRangeFormatter * @param status * Set if an error occurs while formatting. * @return A FormattedNumberRange object; call .toString() to get the string. - * @draft ICU 63 + * @stable ICU 63 */ FormattedNumberRange formatFormattableRange( const Formattable& first, const Formattable& second, UErrorCode& status) const; @@ -606,33 +611,33 @@ class U_I18N_API LocalizedNumberRangeFormatter /** * Default constructor: puts the formatter into a valid but undefined state. * - * @draft ICU 63 + * @stable ICU 63 */ LocalizedNumberRangeFormatter() = default; /** * Returns a copy of this LocalizedNumberRangeFormatter. - * @draft ICU 63 + * @stable ICU 63 */ LocalizedNumberRangeFormatter(const LocalizedNumberRangeFormatter &other); /** * Move constructor: * The source LocalizedNumberRangeFormatter will be left in a valid but undefined state. - * @draft ICU 63 + * @stable ICU 63 */ LocalizedNumberRangeFormatter(LocalizedNumberRangeFormatter&& src) U_NOEXCEPT; /** * Copy assignment operator. - * @draft ICU 63 + * @stable ICU 63 */ LocalizedNumberRangeFormatter& operator=(const LocalizedNumberRangeFormatter& other); /** * Move assignment operator: * The source LocalizedNumberRangeFormatter will be left in a valid but undefined state. - * @draft ICU 63 + * @stable ICU 63 */ LocalizedNumberRangeFormatter& operator=(LocalizedNumberRangeFormatter&& src) U_NOEXCEPT; @@ -651,11 +656,11 @@ class U_I18N_API LocalizedNumberRangeFormatter void formatImpl(impl::UFormattedNumberRangeData& results, bool equalBeforeRounding, UErrorCode& status) const; -#endif +#endif /* U_HIDE_INTERNAL_API */ /** * Destruct this LocalizedNumberRangeFormatter, cleaning up any memory it might own. - * @draft ICU 63 + * @stable ICU 63 */ ~LocalizedNumberRangeFormatter(); @@ -690,7 +695,7 @@ class U_I18N_API LocalizedNumberRangeFormatter * * Instances of this class are immutable and thread-safe. * - * @draft ICU 63 + * @stable ICU 63 */ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { public: @@ -700,7 +705,7 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { * * For more information, see FormattedValue::toString() * - * @draft ICU 63 + * @stable ICU 63 */ UnicodeString toString(UErrorCode& status) const U_OVERRIDE; @@ -714,7 +719,7 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { * * For more information, see FormattedValue::appendTo() * - * @draft ICU 63 + * @stable ICU 63 */ Appendable &appendTo(Appendable &appendable, UErrorCode& status) const U_OVERRIDE; @@ -722,6 +727,7 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { /** @copydoc FormattedValue::nextPosition() */ UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE; +#ifndef U_HIDE_DRAFT_API /** * Determines the start (inclusive) and end (exclusive) indices of the next occurrence of the given * field in the output string. This allows you to determine the locations of, for example, @@ -799,6 +805,7 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { * @see #getFirstDecimal */ UnicodeString getSecondDecimal(UErrorCode& status) const; +#endif // U_HIDE_DRAFT_API /** * Returns whether the pair of numbers was successfully formatted as a range or whether an identity fallback was @@ -806,7 +813,7 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { * identity fallback was used. * * @return An indication the resulting identity situation in the formatted number range. - * @draft ICU 63 + * @stable ICU 63 * @see UNumberRangeIdentityFallback */ UNumberRangeIdentityResult getIdentityResult(UErrorCode& status) const; @@ -824,20 +831,20 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { /** * Move constructor: * Leaves the source FormattedNumberRange in an undefined state. - * @draft ICU 63 + * @stable ICU 63 */ FormattedNumberRange(FormattedNumberRange&& src) U_NOEXCEPT; /** * Move assignment: * Leaves the source FormattedNumberRange in an undefined state. - * @draft ICU 63 + * @stable ICU 63 */ FormattedNumberRange& operator=(FormattedNumberRange&& src) U_NOEXCEPT; /** * Destruct an instance of FormattedNumberRange, cleaning up any memory it might own. - * @draft ICU 63 + * @stable ICU 63 */ ~FormattedNumberRange(); @@ -850,7 +857,6 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { /** * Internal constructor from data type. Adopts the data pointer. - * @internal */ explicit FormattedNumberRange(impl::UFormattedNumberRangeData *results) : fData(results), fErrorCode(U_ZERO_ERROR) {} @@ -867,7 +873,7 @@ class U_I18N_API FormattedNumberRange : public UMemory, public FormattedValue { /** * See the main description in numberrangeformatter.h for documentation and examples. * - * @draft ICU 63 + * @stable ICU 63 */ class U_I18N_API NumberRangeFormatter final { public: @@ -876,7 +882,7 @@ class U_I18N_API NumberRangeFormatter final { * known at the call site. * * @return An {@link UnlocalizedNumberRangeFormatter}, to be used for chaining. - * @draft ICU 63 + * @stable ICU 63 */ static UnlocalizedNumberRangeFormatter with(); @@ -887,7 +893,7 @@ class U_I18N_API NumberRangeFormatter final { * @param locale * The locale from which to load formats and symbols for number range formatting. * @return A {@link LocalizedNumberRangeFormatter}, to be used for chaining. - * @draft ICU 63 + * @stable ICU 63 */ static LocalizedNumberRangeFormatter withLocale(const Locale &locale); @@ -900,8 +906,9 @@ class U_I18N_API NumberRangeFormatter final { } // namespace number U_NAMESPACE_END -#endif // U_HIDE_DRAFT_API +#endif /* #if !UCONFIG_NO_FORMATTING */ + +#endif /* U_SHOW_CPLUSPLUS_API */ #endif // __NUMBERRANGEFORMATTER_H__ -#endif /* #if !UCONFIG_NO_FORMATTING */ diff --git a/deps/icu-small/source/i18n/unicode/numfmt.h b/deps/icu-small/source/i18n/unicode/numfmt.h index d8704754dc79c2..fbd4fb4e5655b3 100644 --- a/deps/icu-small/source/i18n/unicode/numfmt.h +++ b/deps/icu-small/source/i18n/unicode/numfmt.h @@ -26,6 +26,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Compatibility APIs for number formatting. @@ -260,6 +262,14 @@ class U_I18N_API NumberFormat : public Format { */ virtual ~NumberFormat(); + /** + * Clones this object polymorphically. + * The caller owns the result and should delete it when done. + * @return clone, or nullptr if an error occurred + * @stable ICU 2.0 + */ + virtual NumberFormat* clone() const = 0; + /** * Return true if the given Format objects are semantically equal. * Objects of different subclasses are considered unequal. @@ -639,7 +649,9 @@ class U_I18N_API NumberFormat : public Format { * @param result Formattable to be set to the parse result. * If parse fails, return contents are undefined. * @param status Output parameter set to a failure error code - * when a failure occurs. + * when a failure occurs. The error code when the + * string fails to parse is U_INVALID_FORMAT_ERROR, + * unless overridden by a subclass. * @see NumberFormat::isParseIntegerOnly * @stable ICU 2.0 */ @@ -1255,5 +1267,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _NUMFMT //eof diff --git a/deps/icu-small/source/i18n/unicode/numsys.h b/deps/icu-small/source/i18n/unicode/numsys.h index 9e32478cf8de73..4fb7f044eddb76 100644 --- a/deps/icu-small/source/i18n/unicode/numsys.h +++ b/deps/icu-small/source/i18n/unicode/numsys.h @@ -20,6 +20,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: NumberingSystem object @@ -210,5 +212,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _NUMSYS //eof diff --git a/deps/icu-small/source/i18n/unicode/plurfmt.h b/deps/icu-small/source/i18n/unicode/plurfmt.h index 6b757c88419316..7373476dca8fc2 100644 --- a/deps/icu-small/source/i18n/unicode/plurfmt.h +++ b/deps/icu-small/source/i18n/unicode/plurfmt.h @@ -16,6 +16,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: PluralFormat object @@ -448,7 +450,7 @@ class U_I18N_API PluralFormat : public Format { * result and should delete it when done. * @stable ICU 4.0 */ - virtual Format* clone(void) const; + virtual PluralFormat* clone() const; /** * Formats a plural message for a number taken from a Formattable object. @@ -522,7 +524,7 @@ class U_I18N_API PluralFormat : public Format { private: /** - * @internal + * @internal (private) */ class U_I18N_API PluralSelector : public UMemory { public: @@ -534,14 +536,11 @@ class U_I18N_API PluralFormat : public Format { * @param number The number to be plural-formatted. * @param ec Error code. * @return The selected PluralFormat keyword. - * @internal + * @internal (private) */ virtual UnicodeString select(void *context, double number, UErrorCode& ec) const = 0; }; - /** - * @internal - */ class U_I18N_API PluralSelectorAdapter : public PluralSelector { public: PluralSelectorAdapter() : pluralRules(NULL) { @@ -549,7 +548,7 @@ class U_I18N_API PluralFormat : public Format { virtual ~PluralSelectorAdapter(); - virtual UnicodeString select(void *context, double number, UErrorCode& /*ec*/) const; /**< @internal */ + virtual UnicodeString select(void *context, double number, UErrorCode& /*ec*/) const; void reset(); @@ -573,7 +572,7 @@ class U_I18N_API PluralFormat : public Format { UnicodeString& format(const Formattable& numberObject, double number, UnicodeString& appendTo, FieldPosition& pos, - UErrorCode& status) const; /**< @internal */ + UErrorCode& status) const; /** * Finds the PluralFormat sub-message for the given number, or the "other" sub-message. @@ -601,5 +600,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _PLURFMT //eof diff --git a/deps/icu-small/source/i18n/unicode/plurrule.h b/deps/icu-small/source/i18n/unicode/plurrule.h index 04bf3970ba0825..a1553567caf8f5 100644 --- a/deps/icu-small/source/i18n/unicode/plurrule.h +++ b/deps/icu-small/source/i18n/unicode/plurrule.h @@ -20,6 +20,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: PluralRules object @@ -533,5 +535,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _PLURRULE //eof diff --git a/deps/icu-small/source/i18n/unicode/rbnf.h b/deps/icu-small/source/i18n/unicode/rbnf.h index f7cd85a322d1f5..1144bd2fb8b1ba 100644 --- a/deps/icu-small/source/i18n/unicode/rbnf.h +++ b/deps/icu-small/source/i18n/unicode/rbnf.h @@ -12,6 +12,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Rule Based Number Format @@ -696,7 +698,7 @@ class U_I18N_API RuleBasedNumberFormat : public NumberFormat { * @return A copy of the object. * @stable ICU 2.6 */ - virtual Format* clone(void) const; + virtual RuleBasedNumberFormat* clone() const; /** * Return true if the given Format objects are semantically equal. @@ -866,28 +868,6 @@ class U_I18N_API RuleBasedNumberFormat : public NumberFormat { UErrorCode& status) const; protected: - /** - * Format a decimal number. - * The number is a DigitList wrapper onto a floating point decimal number. - * The default implementation in NumberFormat converts the decimal number - * to a double and formats that. Subclasses of NumberFormat that want - * to specifically handle big decimal numbers must override this method. - * class DecimalFormat does so. - * - * @param number The number, a DigitList format Decimal Floating Point. - * @param appendTo Output parameter to receive result. - * Result is appended to existing contents. - * @param posIter On return, can be used to iterate over positions - * of fields generated by this format call. - * @param status Output param filled with success/failure status. - * @return Reference to 'appendTo' parameter. - * @internal - */ - virtual UnicodeString& format(const number::impl::DecimalQuantity &number, - UnicodeString& appendTo, - FieldPositionIterator* posIter, - UErrorCode& status) const; - /** * Format a decimal number. * The number is a DigitList wrapper onto a floating point decimal number. @@ -1135,5 +1115,7 @@ U_NAMESPACE_END /* U_HAVE_RBNF */ #endif +#endif /* U_SHOW_CPLUSPLUS_API */ + /* RBNF_H */ #endif diff --git a/deps/icu-small/source/i18n/unicode/rbtz.h b/deps/icu-small/source/i18n/unicode/rbtz.h index 542a7c140cda2b..95fd7ab85dd13a 100644 --- a/deps/icu-small/source/i18n/unicode/rbtz.h +++ b/deps/icu-small/source/i18n/unicode/rbtz.h @@ -11,6 +11,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Rule based customizable time zone @@ -121,7 +123,7 @@ class U_I18N_API RuleBasedTimeZone : public BasicTimeZone { * @return A new copy of this TimeZone object. * @stable ICU 3.8 */ - virtual TimeZone* clone(void) const; + virtual RuleBasedTimeZone* clone() const; /** * Returns the TimeZone's adjusted GMT offset (i.e., the number of milliseconds to add @@ -224,6 +226,7 @@ class U_I18N_API RuleBasedTimeZone : public BasicTimeZone { */ virtual UBool useDaylightTime(void) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Queries if the given date is in daylight savings time in * this time zone. @@ -238,6 +241,7 @@ class U_I18N_API RuleBasedTimeZone : public BasicTimeZone { * @deprecated ICU 2.4. Use Calendar::inDaylightTime() instead. */ virtual UBool inDaylightTime(UDate date, UErrorCode& status) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Returns true if this zone has the same rule and offset as another zone. @@ -359,6 +363,8 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // RBTZ_H //eof diff --git a/deps/icu-small/source/i18n/unicode/regex.h b/deps/icu-small/source/i18n/unicode/regex.h index a0f9839fe75311..75048af06c9aaa 100644 --- a/deps/icu-small/source/i18n/unicode/regex.h +++ b/deps/icu-small/source/i18n/unicode/regex.h @@ -44,6 +44,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_REGULAR_EXPRESSIONS #include "unicode/uobject.h" @@ -1876,4 +1878,7 @@ class U_I18N_API RegexMatcher U_FINAL : public UObject { U_NAMESPACE_END #endif // UCONFIG_NO_REGULAR_EXPRESSIONS + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/region.h b/deps/icu-small/source/i18n/unicode/region.h index ccd63901a5d1b1..66f5f920757348 100644 --- a/deps/icu-small/source/i18n/unicode/region.h +++ b/deps/icu-small/source/i18n/unicode/region.h @@ -16,10 +16,12 @@ */ #include "unicode/utypes.h" -#include "unicode/uregion.h" + +#if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING +#include "unicode/uregion.h" #include "unicode/uobject.h" #include "unicode/uniset.h" #include "unicode/unistr.h" @@ -219,6 +221,9 @@ class U_I18N_API Region : public UObject { U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // REGION_H //eof diff --git a/deps/icu-small/source/i18n/unicode/reldatefmt.h b/deps/icu-small/source/i18n/unicode/reldatefmt.h index cfcba0902675cc..fb691a545105b6 100644 --- a/deps/icu-small/source/i18n/unicode/reldatefmt.h +++ b/deps/icu-small/source/i18n/unicode/reldatefmt.h @@ -15,6 +15,9 @@ #define __RELDATEFMT_H #include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/uobject.h" #include "unicode/udisplaycontext.h" #include "unicode/ureldatefmt.h" @@ -166,12 +169,24 @@ typedef enum UDateAbsoluteUnit { */ UDAT_ABSOLUTE_NOW, -#ifndef U_HIDE_DRAFT_API /** * Quarter - * @draft ICU 63 + * @stable ICU 63 */ UDAT_ABSOLUTE_QUARTER, + +#ifndef U_HIDE_DRAFT_API + /** + * Hour + * @draft ICU 65 + */ + UDAT_ABSOLUTE_HOUR, + + /** + * Minute + * @draft ICU 65 + */ + UDAT_ABSOLUTE_MINUTE, #endif // U_HIDE_DRAFT_API #ifndef U_HIDE_DEPRECATED_API @@ -179,7 +194,7 @@ typedef enum UDateAbsoluteUnit { * One more than the highest normal UDateAbsoluteUnit value. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ - UDAT_ABSOLUTE_UNIT_COUNT = UDAT_ABSOLUTE_NOW + 2 + UDAT_ABSOLUTE_UNIT_COUNT = UDAT_ABSOLUTE_NOW + 4 #endif // U_HIDE_DEPRECATED_API } UDateAbsoluteUnit; @@ -246,6 +261,7 @@ class SharedPluralRules; class SharedBreakIterator; class NumberFormat; class UnicodeString; +class FormattedRelativeDateTime; class FormattedRelativeDateTimeData; #ifndef U_HIDE_DRAFT_API @@ -743,4 +759,7 @@ U_NAMESPACE_END #endif /* !UCONFIG_NO_BREAK_ITERATION */ #endif /* !UCONFIG_NO_FORMATTING */ + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif /* __RELDATEFMT_H */ diff --git a/deps/icu-small/source/i18n/unicode/scientificnumberformatter.h b/deps/icu-small/source/i18n/unicode/scientificnumberformatter.h index 6c99a246625e2e..a56b8ca2685cf2 100644 --- a/deps/icu-small/source/i18n/unicode/scientificnumberformatter.h +++ b/deps/icu-small/source/i18n/unicode/scientificnumberformatter.h @@ -11,6 +11,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING @@ -157,7 +159,7 @@ class U_I18N_API ScientificNumberFormatter : public UObject { class U_I18N_API SuperscriptStyle : public Style { public: - virtual Style *clone() const; + virtual SuperscriptStyle *clone() const; protected: virtual UnicodeString &format( const UnicodeString &original, @@ -175,7 +177,7 @@ class U_I18N_API ScientificNumberFormatter : public UObject { : Style(), fBeginMarkup(beginMarkup), fEndMarkup(endMarkup) { } - virtual Style *clone() const; + virtual MarkupStyle *clone() const; protected: virtual UnicodeString &format( const UnicodeString &original, @@ -214,4 +216,7 @@ U_NAMESPACE_END #endif /* !UCONFIG_NO_FORMATTING */ + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/search.h b/deps/icu-small/source/i18n/unicode/search.h index 12dd5c77278f67..986205c62f1ec5 100644 --- a/deps/icu-small/source/i18n/unicode/search.h +++ b/deps/icu-small/source/i18n/unicode/search.h @@ -14,6 +14,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: SearchIterator object. @@ -70,8 +72,7 @@ U_NAMESPACE_BEGIN * UErrorCode error = U_ZERO_ERROR; * for (int pos = iter->first(error); pos != USEARCH_DONE; * pos = iter->next(error)) { - * printf("Found match at %d pos, length is %d\n", pos, - * iter.getMatchLength()); + * printf("Found match at %d pos, length is %d\n", pos, iter.getMatchedLength()); * } * * @@ -573,4 +574,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_COLLATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/selfmt.h b/deps/icu-small/source/i18n/unicode/selfmt.h index 08e9d444ee9715..9b98f6db7adb76 100755 --- a/deps/icu-small/source/i18n/unicode/selfmt.h +++ b/deps/icu-small/source/i18n/unicode/selfmt.h @@ -18,9 +18,12 @@ #ifndef SELFMT #define SELFMT +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API + #include "unicode/messagepattern.h" #include "unicode/numfmt.h" -#include "unicode/utypes.h" /** * \file @@ -272,7 +275,7 @@ class U_I18N_API SelectFormat : public Format { * result and should delete it when done. * @stable ICU 4.4 */ - virtual Format* clone(void) const; + virtual SelectFormat* clone() const; /** * Format an object to produce a string. @@ -365,5 +368,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _SELFMT //eof diff --git a/deps/icu-small/source/i18n/unicode/simpletz.h b/deps/icu-small/source/i18n/unicode/simpletz.h index 7f5f1664cca503..d7d4123187e071 100644 --- a/deps/icu-small/source/i18n/unicode/simpletz.h +++ b/deps/icu-small/source/i18n/unicode/simpletz.h @@ -28,6 +28,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: SimpleTimeZone is a concrete subclass of TimeZone. @@ -672,6 +674,7 @@ class U_I18N_API SimpleTimeZone: public BasicTimeZone { */ virtual UBool useDaylightTime(void) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Returns true if the given date is within the period when daylight savings time * is in effect; false otherwise. If the TimeZone doesn't observe daylight savings @@ -687,6 +690,7 @@ class U_I18N_API SimpleTimeZone: public BasicTimeZone { * @deprecated ICU 2.4. Use Calendar::inDaylightTime() instead. */ virtual UBool inDaylightTime(UDate date, UErrorCode& status) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Return true if this zone has the same rules and offset as another zone. @@ -703,7 +707,7 @@ class U_I18N_API SimpleTimeZone: public BasicTimeZone { * @return A new copy of this TimeZone object. * @stable ICU 2.0 */ - virtual TimeZone* clone(void) const; + virtual SimpleTimeZone* clone() const; /** * Gets the first time zone transition after the base time. @@ -929,4 +933,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _SIMPLETZ diff --git a/deps/icu-small/source/i18n/unicode/smpdtfmt.h b/deps/icu-small/source/i18n/unicode/smpdtfmt.h index a015c5be5c877a..79fa817d5afb89 100644 --- a/deps/icu-small/source/i18n/unicode/smpdtfmt.h +++ b/deps/icu-small/source/i18n/unicode/smpdtfmt.h @@ -28,6 +28,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Format and parse dates in a language-independent manner. @@ -865,7 +867,7 @@ class U_I18N_API SimpleDateFormat: public DateFormat { * @return A copy of the object. * @stable ICU 2.0 */ - virtual Format* clone(void) const; + virtual SimpleDateFormat* clone() const; /** * Return true if the given Format objects are semantically equal. Objects @@ -1643,7 +1645,7 @@ class U_I18N_API SimpleDateFormat: public DateFormat { UBool fHaveDefaultCentury; - BreakIterator* fCapitalizationBrkIter; + const BreakIterator* fCapitalizationBrkIter; }; inline UDate @@ -1656,5 +1658,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // _SMPDTFMT //eof diff --git a/deps/icu-small/source/i18n/unicode/sortkey.h b/deps/icu-small/source/i18n/unicode/sortkey.h index 6895be7a2b0ee4..d2d3ca9fd57dd8 100644 --- a/deps/icu-small/source/i18n/unicode/sortkey.h +++ b/deps/icu-small/source/i18n/unicode/sortkey.h @@ -25,6 +25,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Keys for comparing strings multiple times. @@ -337,4 +339,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_COLLATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/stsearch.h b/deps/icu-small/source/i18n/unicode/stsearch.h index 46bc51b30e2346..f3963711432986 100644 --- a/deps/icu-small/source/i18n/unicode/stsearch.h +++ b/deps/icu-small/source/i18n/unicode/stsearch.h @@ -14,6 +14,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Service for searching text based on RuleBasedCollator. @@ -119,8 +121,7 @@ U_NAMESPACE_BEGIN * pos != USEARCH_DONE; * pos = iter.next(error)) * { - * printf("Found match at %d pos, length is %d\n", pos, - * iter.getMatchLength()); + * printf("Found match at %d pos, length is %d\n", pos, iter.getMatchedLength()); * } * *

@@ -412,7 +413,7 @@ class U_I18N_API StringSearch U_FINAL : public SearchIterator * @return cloned object * @stable ICU 2.0 */ - virtual SearchIterator * safeClone(void) const; + virtual StringSearch * safeClone() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. @@ -502,4 +503,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_COLLATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/tblcoll.h b/deps/icu-small/source/i18n/unicode/tblcoll.h index 24ba213b41eacc..f5dc135bc49fc1 100644 --- a/deps/icu-small/source/i18n/unicode/tblcoll.h +++ b/deps/icu-small/source/i18n/unicode/tblcoll.h @@ -64,6 +64,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_COLLATION #include "unicode/coll.h" @@ -228,7 +230,7 @@ class U_I18N_API RuleBasedCollator : public Collator { * @return a copy of this object, owned by the caller * @stable ICU 2.0 */ - virtual Collator* clone(void) const; + virtual RuleBasedCollator* clone() const; /** * Creates a collation element iterator for the source string. The caller of @@ -389,6 +391,7 @@ class U_I18N_API RuleBasedCollator : public Collator { */ virtual int32_t hashCode() const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Gets the locale of the Collator * @param type can be either requested, valid or actual locale. For more @@ -400,6 +403,7 @@ class U_I18N_API RuleBasedCollator : public Collator { * @deprecated ICU 2.8 likely to change in ICU 3.0, based on feedback */ virtual Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Gets the tailoring rules for this collator. @@ -545,6 +549,7 @@ class U_I18N_API RuleBasedCollator : public Collator { */ virtual UColReorderCode getMaxVariable() const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Sets the variable top to the primary weight of the specified string. * @@ -592,6 +597,7 @@ class U_I18N_API RuleBasedCollator : public Collator { * @deprecated ICU 53 Call setMaxVariable() instead. */ virtual void setVariableTop(uint32_t varTop, UErrorCode &status); +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Gets the variable top value of a Collator. @@ -874,4 +880,7 @@ class U_I18N_API RuleBasedCollator : public Collator { U_NAMESPACE_END #endif // !UCONFIG_NO_COLLATION + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // TBLCOLL_H diff --git a/deps/icu-small/source/i18n/unicode/timezone.h b/deps/icu-small/source/i18n/unicode/timezone.h index 237ed911d09211..4d321186be495d 100644 --- a/deps/icu-small/source/i18n/unicode/timezone.h +++ b/deps/icu-small/source/i18n/unicode/timezone.h @@ -31,6 +31,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: TimeZone object @@ -321,10 +323,6 @@ class U_I18N_API TimeZone : public UObject { * zone is set to the default host time zone. This call adopts the TimeZone object * passed in; the client is no longer responsible for deleting it. * - *

This function is not thread safe. It is an error for multiple threads - * to concurrently attempt to set the default time zone, or for any thread - * to attempt to reference the default zone while another thread is setting it. - * * @param zone A pointer to the new TimeZone object to use as the default. * @stable ICU 2.0 */ @@ -335,8 +333,6 @@ class U_I18N_API TimeZone : public UObject { * Same as adoptDefault(), except that the TimeZone object passed in is NOT adopted; * the caller remains responsible for deleting it. * - *

See the thread safety note under adoptDefault(). - * * @param zone The given timezone. * @system * @stable ICU 2.0 @@ -726,6 +722,7 @@ class U_I18N_API TimeZone : public UObject { */ virtual UBool useDaylightTime(void) const = 0; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Queries if the given date is in daylight savings time in * this time zone. @@ -740,6 +737,7 @@ class U_I18N_API TimeZone : public UObject { * @deprecated ICU 2.4. Use Calendar::inDaylightTime() instead. */ virtual UBool inDaylightTime(UDate date, UErrorCode& status) const = 0; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Returns true if this zone has the same rule and offset as another zone. @@ -758,7 +756,7 @@ class U_I18N_API TimeZone : public UObject { * @return A new copy of this TimeZone object. * @stable ICU 2.0 */ - virtual TimeZone* clone(void) const = 0; + virtual TimeZone* clone() const = 0; /** * Return the class ID for this class. This is useful only for @@ -972,5 +970,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif //_TIMEZONE //eof diff --git a/deps/icu-small/source/i18n/unicode/tmunit.h b/deps/icu-small/source/i18n/unicode/tmunit.h index fa59f104734baa..2e949ddfbd560d 100644 --- a/deps/icu-small/source/i18n/unicode/tmunit.h +++ b/deps/icu-small/source/i18n/unicode/tmunit.h @@ -16,6 +16,9 @@ * \brief C++ API: time unit object */ +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API #include "unicode/measunit.h" @@ -70,7 +73,7 @@ class U_I18N_API TimeUnit: public MeasureUnit { * Override clone. * @stable ICU 4.2 */ - virtual UObject* clone() const; + virtual TimeUnit* clone() const; /** * Copy operator. @@ -132,6 +135,8 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __TMUNIT_H__ //eof // diff --git a/deps/icu-small/source/i18n/unicode/tmutamt.h b/deps/icu-small/source/i18n/unicode/tmutamt.h index 1717b7605fb3c5..5ce5922cea8346 100644 --- a/deps/icu-small/source/i18n/unicode/tmutamt.h +++ b/deps/icu-small/source/i18n/unicode/tmutamt.h @@ -16,11 +16,15 @@ * \brief C++ API: time unit amount object. */ -#include "unicode/measure.h" -#include "unicode/tmunit.h" +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING +#include "unicode/measure.h" +#include "unicode/tmunit.h" + U_NAMESPACE_BEGIN @@ -83,7 +87,7 @@ class U_I18N_API TimeUnitAmount: public Measure { * @return a polymorphic clone of this object. The result will have the same class as returned by getDynamicClassID(). * @stable ICU 4.2 */ - virtual UObject* clone() const; + virtual TimeUnitAmount* clone() const; /** @@ -165,6 +169,8 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __TMUTAMT_H__ //eof // diff --git a/deps/icu-small/source/i18n/unicode/tmutfmt.h b/deps/icu-small/source/i18n/unicode/tmutfmt.h index 8f245859a622ba..ad871f7c09fd4f 100644 --- a/deps/icu-small/source/i18n/unicode/tmutfmt.h +++ b/deps/icu-small/source/i18n/unicode/tmutfmt.h @@ -18,8 +18,9 @@ */ +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING -#ifndef U_HIDE_DEPRECATED_API #include "unicode/unistr.h" #include "unicode/tmunit.h" @@ -28,6 +29,7 @@ #include "unicode/numfmt.h" #include "unicode/plurrule.h" +#ifndef U_HIDE_DEPRECATED_API /** * Constants for various styles. @@ -124,7 +126,7 @@ class U_I18N_API TimeUnitFormat: public MeasureFormat { * @return A copy of the object. * @deprecated ICU 53 */ - virtual Format* clone(void) const; + virtual TimeUnitFormat* clone() const; /** * Assignment operator @@ -244,5 +246,7 @@ U_NAMESPACE_END #endif /* U_HIDE_DEPRECATED_API */ #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // __TMUTFMT_H__ //eof diff --git a/deps/icu-small/source/i18n/unicode/translit.h b/deps/icu-small/source/i18n/unicode/translit.h index 6b4888145f1be5..fe2568d50aa020 100644 --- a/deps/icu-small/source/i18n/unicode/translit.h +++ b/deps/icu-small/source/i18n/unicode/translit.h @@ -14,6 +14,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: Tranforms text from one format to another. @@ -1588,4 +1590,6 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_TRANSLITERATION */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/tzfmt.h b/deps/icu-small/source/i18n/unicode/tzfmt.h index d2aa768b8c8b34..6d3863b1e5add8 100644 --- a/deps/icu-small/source/i18n/unicode/tzfmt.h +++ b/deps/icu-small/source/i18n/unicode/tzfmt.h @@ -16,6 +16,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/format.h" @@ -305,7 +307,7 @@ class U_I18N_API TimeZoneFormat : public Format { * @return A copy of the object * @stable ICU 50 */ - virtual Format* clone() const; + virtual TimeZoneFormat* clone() const; /** * Creates an instance of TimeZoneFormat for the given locale. @@ -1094,4 +1096,7 @@ class U_I18N_API TimeZoneFormat : public Format { U_NAMESPACE_END #endif /* !UCONFIG_NO_FORMATTING */ + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/tznames.h b/deps/icu-small/source/i18n/unicode/tznames.h index 399265d85ae66c..860494221df4f8 100644 --- a/deps/icu-small/source/i18n/unicode/tznames.h +++ b/deps/icu-small/source/i18n/unicode/tznames.h @@ -15,6 +15,8 @@ */ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/uloc.h" @@ -411,4 +413,7 @@ class U_I18N_API TimeZoneNames : public UObject { U_NAMESPACE_END #endif + +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/tzrule.h b/deps/icu-small/source/i18n/unicode/tzrule.h index 171486f1c79d2a..c6d6b9631fcd69 100644 --- a/deps/icu-small/source/i18n/unicode/tzrule.h +++ b/deps/icu-small/source/i18n/unicode/tzrule.h @@ -16,6 +16,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/uobject.h" @@ -45,7 +47,7 @@ class U_I18N_API TimeZoneRule : public UObject { * @return A copy of the object. * @stable ICU 3.8 */ - virtual TimeZoneRule* clone(void) const = 0; + virtual TimeZoneRule* clone() const = 0; /** * Return true if the given TimeZoneRule objects are semantically equal. Objects @@ -229,7 +231,7 @@ class U_I18N_API InitialTimeZoneRule : public TimeZoneRule { * @return A copy of the object. * @stable ICU 3.8 */ - virtual InitialTimeZoneRule* clone(void) const; + virtual InitialTimeZoneRule* clone() const; /** * Assignment operator. @@ -440,7 +442,7 @@ class U_I18N_API AnnualTimeZoneRule : public TimeZoneRule { * @return A copy of the object. * @stable ICU 3.8 */ - virtual AnnualTimeZoneRule* clone(void) const; + virtual AnnualTimeZoneRule* clone() const; /** * Assignment operator. @@ -656,7 +658,7 @@ class U_I18N_API TimeArrayTimeZoneRule : public TimeZoneRule { * @return A copy of the object. * @stable ICU 3.8 */ - virtual TimeArrayTimeZoneRule* clone(void) const; + virtual TimeArrayTimeZoneRule* clone() const; /** * Assignment operator. @@ -825,6 +827,8 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // TZRULE_H //eof diff --git a/deps/icu-small/source/i18n/unicode/tztrans.h b/deps/icu-small/source/i18n/unicode/tztrans.h index 1276d67c312b9a..e87fea7c3cee7f 100644 --- a/deps/icu-small/source/i18n/unicode/tztrans.h +++ b/deps/icu-small/source/i18n/unicode/tztrans.h @@ -16,6 +16,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + #if !UCONFIG_NO_FORMATTING #include "unicode/uobject.h" @@ -68,7 +70,7 @@ class U_I18N_API TimeZoneTransition : public UObject { * @return A copy of the object. * @stable ICU 3.8 */ - TimeZoneTransition* clone(void) const; + TimeZoneTransition* clone() const; /** * Assignment operator. @@ -192,6 +194,8 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // TZTRANS_H //eof diff --git a/deps/icu-small/source/i18n/unicode/ucal.h b/deps/icu-small/source/i18n/unicode/ucal.h index 71120b7aed6d0f..eee2ae9e226474 100644 --- a/deps/icu-small/source/i18n/unicode/ucal.h +++ b/deps/icu-small/source/i18n/unicode/ucal.h @@ -441,11 +441,13 @@ enum UCalendarDateFields { /* Do not conditionalize the following with #ifndef U_HIDE_DEPRECATED_API, * it is needed for layout of Calendar, DateFormat, and other objects */ +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * One more than the highest normal UCalendarDateFields value. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ - UCAL_FIELD_COUNT, + UCAL_FIELD_COUNT, +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Field number indicating the @@ -657,6 +659,42 @@ ucal_getDefaultTimeZone(UChar* result, int32_t resultCapacity, UErrorCode* ec); U_STABLE void U_EXPORT2 ucal_setDefaultTimeZone(const UChar* zoneID, UErrorCode* ec); +#ifndef U_HIDE_DRAFT_API + +/** + * Return the current host time zone. The host time zone is detected from + * the current host system configuration by querying the host operating + * system. If the host system detection routines fail, or if they specify + * a TimeZone or TimeZone offset which is not recognized, then the special + * TimeZone "Etc/Unknown" is returned. + * + * Note that host time zone and the ICU default time zone can be different. + * + * The ICU default time zone does not change once initialized unless modified + * by calling `ucal_setDefaultTimeZone()` or with the C++ TimeZone API, + * `TimeZone::adoptDefault(TimeZone*)`. + * + * If the host operating system configuration has changed since ICU has + * initialized then the returned value can be different than the ICU default + * time zone, even if the default has not changed. + * + *

This function is not thread safe.

+ * + * @param result A buffer to receive the result, or NULL + * @param resultCapacity The capacity of the result buffer + * @param ec input/output error code + * @return The result string length, not including the terminating + * null + * + * @see #UCAL_UNKNOWN_ZONE_ID + * + * @draft ICU 65 + */ +U_DRAFT int32_t U_EXPORT2 +ucal_getHostTimeZone(UChar *result, int32_t resultCapacity, UErrorCode *ec); + +#endif // U_HIDE_DRAFT_API + /** * Return the amount of time in milliseconds that the clock is * advanced during daylight savings time for the given time zone, or diff --git a/deps/icu-small/source/i18n/unicode/ucol.h b/deps/icu-small/source/i18n/unicode/ucol.h index f084ac61e614f3..34b5d2476aaaa5 100644 --- a/deps/icu-small/source/i18n/unicode/ucol.h +++ b/deps/icu-small/source/i18n/unicode/ucol.h @@ -344,11 +344,13 @@ typedef enum { /* Do not conditionalize the following with #ifndef U_HIDE_DEPRECATED_API, * it is needed for layout of RuleBasedCollator object. */ +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * One more than the highest normal UColAttribute value. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ UCOL_ATTRIBUTE_COUNT +#endif // U_FORCE_HIDE_DEPRECATED_API } UColAttribute; /** Options for retrieving the rule string diff --git a/deps/icu-small/source/i18n/unicode/udat.h b/deps/icu-small/source/i18n/unicode/udat.h index c67a6d6d4b3a79..bdbd080c005821 100644 --- a/deps/icu-small/source/i18n/unicode/udat.h +++ b/deps/icu-small/source/i18n/unicode/udat.h @@ -923,11 +923,13 @@ typedef enum UDateFormatBooleanAttribute { /* Do not conditionalize the following with #ifndef U_HIDE_DEPRECATED_API, * it is needed for layout of DateFormat object. */ +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * One more than the highest normal UDateFormatBooleanAttribute value. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ UDAT_BOOLEAN_ATTRIBUTE_COUNT = 4 +#endif // U_FORCE_HIDE_DEPRECATED_API } UDateFormatBooleanAttribute; /** diff --git a/deps/icu-small/source/i18n/unicode/udatpg.h b/deps/icu-small/source/i18n/unicode/udatpg.h index 238a27b4f44a35..81956d12705d7d 100644 --- a/deps/icu-small/source/i18n/unicode/udatpg.h +++ b/deps/icu-small/source/i18n/unicode/udatpg.h @@ -88,11 +88,13 @@ typedef enum UDateTimePatternField { /* Do not conditionalize the following with #ifndef U_HIDE_DEPRECATED_API, * it is needed for layout of DateTimePatternGenerator object. */ +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * One more than the highest normal UDateTimePatternField value. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ UDATPG_FIELD_COUNT +#endif // U_FORCE_HIDE_DEPRECATED_API } UDateTimePatternField; /** diff --git a/deps/icu-small/source/i18n/unicode/uformattedvalue.h b/deps/icu-small/source/i18n/unicode/uformattedvalue.h index d1c2ad1e49f94d..172558f7fb716a 100644 --- a/deps/icu-small/source/i18n/unicode/uformattedvalue.h +++ b/deps/icu-small/source/i18n/unicode/uformattedvalue.h @@ -7,10 +7,11 @@ #include "unicode/utypes.h" #if !UCONFIG_NO_FORMATTING -#ifndef U_HIDE_DRAFT_API #include "unicode/ufieldpositer.h" +#ifndef U_HIDE_DRAFT_API + /** * \file * \brief C API: Abstract operations for localized strings. diff --git a/deps/icu-small/source/i18n/unicode/ulistformatter.h b/deps/icu-small/source/i18n/unicode/ulistformatter.h index 4327fd5ec1bece..0fbf72c9ff6abb 100644 --- a/deps/icu-small/source/i18n/unicode/ulistformatter.h +++ b/deps/icu-small/source/i18n/unicode/ulistformatter.h @@ -41,7 +41,7 @@ struct UFormattedList; * @draft ICU 64 */ typedef struct UFormattedList UFormattedList; -#endif /* U_HIDE_DRAFT_API */ +#endif /* U_HIDE_DRAFT_API */ #ifndef U_HIDE_DRAFT_API /** @@ -61,7 +61,7 @@ typedef enum UListFormatterField { */ ULISTFMT_ELEMENT_FIELD } UListFormatterField; -#endif // U_HIDE_DRAFT_API +#endif /* U_HIDE_DRAFT_API */ /** * Open a new UListFormatter object using the rules for a given locale. diff --git a/deps/icu-small/source/i18n/unicode/unirepl.h b/deps/icu-small/source/i18n/unicode/unirepl.h index 8fb25d46890d9e..61ee37f07054fb 100644 --- a/deps/icu-small/source/i18n/unicode/unirepl.h +++ b/deps/icu-small/source/i18n/unicode/unirepl.h @@ -14,6 +14,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: UnicodeReplacer @@ -96,4 +98,6 @@ class U_I18N_API UnicodeReplacer /* not : public UObject because this is an inte U_NAMESPACE_END +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif diff --git a/deps/icu-small/source/i18n/unicode/unum.h b/deps/icu-small/source/i18n/unicode/unum.h index c03131f372b8ca..77cde03533f4d1 100644 --- a/deps/icu-small/source/i18n/unicode/unum.h +++ b/deps/icu-small/source/i18n/unicode/unum.h @@ -338,11 +338,13 @@ enum UCurrencySpacing { /* Do not conditionalize the following with #ifndef U_HIDE_DEPRECATED_API, * it is needed for layout of DecimalFormatSymbols object. */ +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * One more than the highest normal UCurrencySpacing value. * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420. */ UNUM_CURRENCY_SPACING_COUNT +#endif // U_FORCE_HIDE_DEPRECATED_API }; typedef enum UCurrencySpacing UCurrencySpacing; /**< @stable ICU 4.8 */ @@ -409,7 +411,7 @@ typedef enum UNumberFormatFields { * respectively. * *

NOTE:: New users with are strongly encouraged to - * use unumf_openWithSkeletonAndLocale instead of unum_open. + * use unumf_openForSkeletonAndLocale instead of unum_open. * * @param pattern A pattern specifying the format to use. * This parameter is ignored unless the style is diff --git a/deps/icu-small/source/i18n/unicode/unumberformatter.h b/deps/icu-small/source/i18n/unicode/unumberformatter.h index e4c21a4e4ab1d1..b27507f7a8f561 100644 --- a/deps/icu-small/source/i18n/unicode/unumberformatter.h +++ b/deps/icu-small/source/i18n/unicode/unumberformatter.h @@ -77,8 +77,6 @@ * */ - -#ifndef U_HIDE_DRAFT_API /** * An enum declaring how to render units, including currencies. Example outputs when formatting 123 USD and 123 * meters in en-CA: @@ -95,7 +93,7 @@ *

* This enum is similar to {@link UMeasureFormatWidth}. * - * @draft ICU 60 + * @stable ICU 60 */ typedef enum UNumberUnitWidth { /** @@ -107,7 +105,7 @@ typedef enum UNumberUnitWidth { * In CLDR, this option corresponds to the "Narrow" format for measure units and the "¤¤¤¤¤" placeholder for * currencies. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_UNIT_WIDTH_NARROW, @@ -123,7 +121,7 @@ typedef enum UNumberUnitWidth { * In CLDR, this option corresponds to the "Short" format for measure units and the "¤" placeholder for * currencies. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_UNIT_WIDTH_SHORT, @@ -134,7 +132,7 @@ typedef enum UNumberUnitWidth { * In CLDR, this option corresponds to the default format for measure units and the "¤¤¤" placeholder for * currencies. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_UNIT_WIDTH_FULL_NAME, @@ -145,7 +143,7 @@ typedef enum UNumberUnitWidth { *

* In CLDR, this option corresponds to the "¤¤" placeholder for currencies. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_UNIT_WIDTH_ISO_CODE, @@ -154,7 +152,7 @@ typedef enum UNumberUnitWidth { * monetary symbols and formats as with SHORT, but omit the currency symbol. For measure units, the behavior is * equivalent to not specifying the unit at all. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_UNIT_WIDTH_HIDDEN, @@ -165,9 +163,7 @@ typedef enum UNumberUnitWidth { */ UNUM_UNIT_WIDTH_COUNT } UNumberUnitWidth; -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * An enum declaring the strategy for when and how to display grouping separators (i.e., the * separator, often a comma or period, after every 2-3 powers of ten). The choices are several @@ -192,13 +188,13 @@ typedef enum UNumberUnitWidth { * Note: This enum specifies the strategy for grouping sizes. To set which character to use as the * grouping separator, use the "symbols" setter. * - * @draft ICU 63 + * @stable ICU 63 */ typedef enum UNumberGroupingStrategy { /** * Do not display grouping separators in any locale. * - * @draft ICU 61 + * @stable ICU 61 */ UNUM_GROUPING_OFF, @@ -214,7 +210,7 @@ typedef enum UNumberGroupingStrategy { * Locale data is used to determine whether to separate larger numbers into groups of 2 * (customary in South Asia) or groups of 3 (customary in Europe and the Americas). * - * @draft ICU 61 + * @stable ICU 61 */ UNUM_GROUPING_MIN2, @@ -229,7 +225,7 @@ typedef enum UNumberGroupingStrategy { * Locale data is used to determine whether to separate larger numbers into groups of 2 * (customary in South Asia) or groups of 3 (customary in Europe and the Americas). * - * @draft ICU 61 + * @stable ICU 61 */ UNUM_GROUPING_AUTO, @@ -245,7 +241,7 @@ typedef enum UNumberGroupingStrategy { * Locale data is used to determine whether to separate larger numbers into groups of 2 * (customary in South Asia) or groups of 3 (customary in Europe and the Americas). * - * @draft ICU 61 + * @stable ICU 61 */ UNUM_GROUPING_ON_ALIGNED, @@ -253,7 +249,7 @@ typedef enum UNumberGroupingStrategy { * Use the Western defaults: groups of 3 and enabled for all numbers 1000 or greater. Do not use * locale data for determining the grouping strategy. * - * @draft ICU 61 + * @stable ICU 61 */ UNUM_GROUPING_THOUSANDS @@ -269,10 +265,6 @@ typedef enum UNumberGroupingStrategy { } UNumberGroupingStrategy; - -#endif /* U_HIDE_DRAFT_API */ - -#ifndef U_HIDE_DRAFT_API /** * An enum declaring how to denote positive and negative numbers. Example outputs when formatting * 123, 0, and -123 in en-US: @@ -290,14 +282,14 @@ typedef enum UNumberGroupingStrategy { *

* The exact format, including the position and the code point of the sign, differ by locale. * - * @draft ICU 60 + * @stable ICU 60 */ typedef enum UNumberSignDisplay { /** * Show the minus sign on negative numbers, and do not show the sign on positive numbers. This is the default * behavior. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_SIGN_AUTO, @@ -305,14 +297,14 @@ typedef enum UNumberSignDisplay { * Show the minus sign on negative numbers and the plus sign on positive numbers, including zero. * To hide the sign on zero, see {@link UNUM_SIGN_EXCEPT_ZERO}. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_SIGN_ALWAYS, /** * Do not show the sign on positive or negative numbers. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_SIGN_NEVER, @@ -328,7 +320,7 @@ typedef enum UNumberSignDisplay { * AUTO sign display strategy when formatting without a currency unit. This limitation may be lifted in the * future. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_SIGN_ACCOUNTING, @@ -338,24 +330,25 @@ typedef enum UNumberSignDisplay { * ACCOUNTING sign display strategy. To hide the sign on zero, see * {@link UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO}. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_SIGN_ACCOUNTING_ALWAYS, /** * Show the minus sign on negative numbers and the plus sign on positive numbers. Do not show a - * sign on zero. + * sign on zero or NaN, unless the sign bit is set (-0.0 gets a sign). * - * @draft ICU 61 + * @stable ICU 61 */ UNUM_SIGN_EXCEPT_ZERO, /** * Use the locale-dependent accounting format on negative numbers, and show the plus sign on - * positive numbers. Do not show a sign on zero. For more information on the accounting format, - * see the ACCOUNTING sign display strategy. + * positive numbers. Do not show a sign on zero or NaN, unless the sign bit is set (-0.0 gets a + * sign). For more information on the accounting format, see the ACCOUNTING sign display + * strategy. * - * @draft ICU 61 + * @stable ICU 61 */ UNUM_SIGN_ACCOUNTING_EXCEPT_ZERO, @@ -366,9 +359,7 @@ typedef enum UNumberSignDisplay { */ UNUM_SIGN_COUNT } UNumberSignDisplay; -#endif /* U_HIDE_DRAFT_API */ -#ifndef U_HIDE_DRAFT_API /** * An enum declaring how to render the decimal separator. * @@ -378,21 +369,21 @@ typedef enum UNumberSignDisplay { *

  • UNUM_DECIMAL_SEPARATOR_ALWAYS: "1.", "1.1" * * - * @draft ICU 60 + * @stable ICU 60 */ typedef enum UNumberDecimalSeparatorDisplay { /** * Show the decimal separator when there are one or more digits to display after the separator, and do not show * it otherwise. This is the default behavior. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_DECIMAL_SEPARATOR_AUTO, /** * Always show the decimal separator, even if there are no digits to display after the separator. * - * @draft ICU 60 + * @stable ICU 60 */ UNUM_DECIMAL_SEPARATOR_ALWAYS, @@ -403,7 +394,6 @@ typedef enum UNumberDecimalSeparatorDisplay { */ UNUM_DECIMAL_SEPARATOR_COUNT } UNumberDecimalSeparatorDisplay; -#endif /* U_HIDE_DRAFT_API */ struct UNumberFormatter; /** @@ -649,6 +639,13 @@ unumf_resultGetAllFieldPositions(const UFormattedNumber* uresult, UFieldPosition UErrorCode* ec); +// TODO(ICU-20775): Propose this as API. +// NOTE: This is not currently implemented. +// U_DRAFT int32_t U_EXPORT2 +// unumf_resultToDecimalNumber(const UFormattedNumber* uresult, char* buffer, int32_t bufferCapacity, +// UErrorCode* ec); + + /** * Releases the UNumberFormatter created by unumf_openForSkeletonAndLocale(). * diff --git a/deps/icu-small/source/i18n/unicode/usearch.h b/deps/icu-small/source/i18n/unicode/usearch.h index 6b495ef00140f1..d9d84b4f6a9715 100644 --- a/deps/icu-small/source/i18n/unicode/usearch.h +++ b/deps/icu-small/source/i18n/unicode/usearch.h @@ -24,7 +24,7 @@ * \file * \brief C API: StringSearch * - * C Apis for an engine that provides language-sensitive text searching based + * C APIs for an engine that provides language-sensitive text searching based * on the comparison rules defined in a UCollator data struct, * see ucol.h. This ensures that language eccentricity can be * handled, e.g. for the German collator, characters ß and SS will be matched @@ -55,7 +55,7 @@ *

    * This search has APIs similar to that of other text iteration mechanisms * such as the break iterators in ubrk.h. Using these - * APIs, it is easy to scan through text looking for all occurances of + * APIs, it is easy to scan through text looking for all occurrences of * a given pattern. This search iterator allows changing of direction by * calling a reset followed by a next or previous. * Though a direction change can occur without calling reset first, @@ -130,7 +130,7 @@ * pos = usearch_next(search, &status)) * { * printf("Found match at %d pos, length is %d\n", pos, - * usearch_getMatchLength(search)); + * usearch_getMatchedLength(search)); * } * } * @@ -479,7 +479,7 @@ U_STABLE int32_t U_EXPORT2 usearch_getMatchedLength( * possible. If the buffer fits the matched text exactly, a null-termination * is not possible, then a U_STRING_NOT_TERMINATED_ERROR set in status. * Pre-flighting can be either done with length = 0 or the API -* usearch_getMatchLength. +* usearch_getMatchedLength. * @param strsrch search iterator data struct * @param result UChar buffer to store the matched string * @param resultCapacity length of the result buffer @@ -766,7 +766,7 @@ U_STABLE void U_EXPORT2 usearch_reset(UStringSearch *strsrch); #ifndef U_HIDE_INTERNAL_API /** * Simple forward search for the pattern, starting at a specified index, - * and using using a default set search options. + * and using a default set search options. * * This is an experimental function, and is not an official part of the * ICU API. @@ -783,7 +783,7 @@ U_STABLE void U_EXPORT2 usearch_reset(UStringSearch *strsrch); * are part of a combining sequence, as described below. * * A match will not include a partial combining sequence. Combining - * character sequences are considered to be inseperable units, + * character sequences are considered to be inseparable units, * and either match the pattern completely, or are considered to not match * at all. Thus, for example, an A followed a combining accent mark will * not be found when searching for a plain (unaccented) A. (unless @@ -792,7 +792,7 @@ U_STABLE void U_EXPORT2 usearch_reset(UStringSearch *strsrch); * When beginning a search, the initial starting position, startIdx, * is assumed to be an acceptable match boundary with respect to * combining characters. A combining sequence that spans across the - * starting point will not supress a match beginning at startIdx. + * starting point will not suppress a match beginning at startIdx. * * Characters that expand to multiple collation elements * (German sharp-S becoming 'ss', or the composed forms of accented @@ -843,7 +843,7 @@ U_INTERNAL UBool U_EXPORT2 usearch_search(UStringSearch *strsrch, * are part of a combining sequence, as described below. * * A match will not include a partial combining sequence. Combining - * character sequences are considered to be inseperable units, + * character sequences are considered to be inseparable units, * and either match the pattern completely, or are considered to not match * at all. Thus, for example, an A followed a combining accent mark will * not be found when searching for a plain (unaccented) A. (unless @@ -852,7 +852,7 @@ U_INTERNAL UBool U_EXPORT2 usearch_search(UStringSearch *strsrch, * When beginning a search, the initial starting position, startIdx, * is assumed to be an acceptable match boundary with respect to * combining characters. A combining sequence that spans across the - * starting point will not supress a match beginning at startIdx. + * starting point will not suppress a match beginning at startIdx. * * Characters that expand to multiple collation elements * (German sharp-S becoming 'ss', or the composed forms of accented diff --git a/deps/icu-small/source/i18n/unicode/uspoof.h b/deps/icu-small/source/i18n/unicode/uspoof.h index d15ba4b24235dc..63a13387b063be 100644 --- a/deps/icu-small/source/i18n/unicode/uspoof.h +++ b/deps/icu-small/source/i18n/unicode/uspoof.h @@ -353,6 +353,8 @@ * @stable ICU 4.6 */ +U_CDECL_BEGIN + struct USpoofChecker; /** * @stable ICU 4.2 @@ -471,7 +473,6 @@ typedef enum USpoofChecks { */ USPOOF_MIXED_NUMBERS = 128, -#ifndef U_HIDE_DRAFT_API /** * Check that an identifier does not have a combining character following a character in which that * combining character would be hidden; for example 'i' followed by a U+0307 combining dot. @@ -489,10 +490,9 @@ typedef enum USpoofChecks { * * This list and the number of combing characters considered by this check may grow over time. * - * @draft ICU 62 + * @stable ICU 62 */ USPOOF_HIDDEN_OVERLAY = 256, -#endif /* U_HIDE_DRAFT_API */ /** * Enable all spoof checks. @@ -674,25 +674,6 @@ uspoof_openFromSource(const char *confusables, int32_t confusablesLen, U_STABLE void U_EXPORT2 uspoof_close(USpoofChecker *sc); -#if U_SHOW_CPLUSPLUS_API - -U_NAMESPACE_BEGIN - -/** - * \class LocalUSpoofCheckerPointer - * "Smart pointer" class, closes a USpoofChecker via uspoof_close(). - * For most methods see the LocalPointerBase base class. - * - * @see LocalPointerBase - * @see LocalPointer - * @stable ICU 4.4 - */ -U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close); - -U_NAMESPACE_END - -#endif - /** * Clone a Spoof Checker. The clone will be set to perform the same checks * as the original source. @@ -901,54 +882,6 @@ U_STABLE const USet * U_EXPORT2 uspoof_getAllowedChars(const USpoofChecker *sc, UErrorCode *status); -#if U_SHOW_CPLUSPLUS_API -/** - * Limit the acceptable characters to those specified by a Unicode Set. - * Any previously specified character limit is - * is replaced by the new settings. This includes limits on - * characters that were set with the uspoof_setAllowedLocales() function. - * - * The USPOOF_CHAR_LIMIT test is automatically enabled for this - * USoofChecker by this function. - * - * @param sc The USpoofChecker - * @param chars A Unicode Set containing the list of - * characters that are permitted. Ownership of the set - * remains with the caller. The incoming set is cloned by - * this function, so there are no restrictions on modifying - * or deleting the UnicodeSet after calling this function. - * @param status The error code, set if this function encounters a problem. - * @stable ICU 4.2 - */ -U_STABLE void U_EXPORT2 -uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status); - - -/** - * Get a UnicodeSet for the characters permitted in an identifier. - * This corresponds to the limits imposed by the Set Allowed Characters / - * UnicodeSet functions. Limitations imposed by other checks will not be - * reflected in the set returned by this function. - * - * The returned set will be frozen, meaning that it cannot be modified - * by the caller. - * - * Ownership of the returned set remains with the Spoof Detector. The - * returned set will become invalid if the spoof detector is closed, - * or if a new set of allowed characters is specified. - * - * - * @param sc The USpoofChecker - * @param status The error code, set if this function encounters a problem. - * @return A UnicodeSet containing the characters that are permitted by - * the USPOOF_CHAR_LIMIT test. - * @stable ICU 4.2 - */ -U_STABLE const icu::UnicodeSet * U_EXPORT2 -uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status); -#endif - - /** * Check the specified string for possible security issues. * The text to be checked will typically be an identifier of some sort. @@ -1027,43 +960,6 @@ uspoof_checkUTF8(const USpoofChecker *sc, UErrorCode *status); -#if U_SHOW_CPLUSPLUS_API -/** - * Check the specified string for possible security issues. - * The text to be checked will typically be an identifier of some sort. - * The set of checks to be performed is specified with uspoof_setChecks(). - * - * \note - * Consider using the newer API, {@link uspoof_check2UnicodeString}, instead. - * The newer API exposes additional information from the check procedure - * and is otherwise identical to this method. - * - * @param sc The USpoofChecker - * @param id A identifier to be checked for possible security issues. - * @param position Deprecated in ICU 51. Always returns zero. - * Originally, an out parameter for the index of the first - * string position that failed a check. - * This parameter may be NULL. - * @param status The error code, set if an error occurred while attempting to - * perform the check. - * Spoofing or security issues detected with the input string are - * not reported here, but through the function's return value. - * @return An integer value with bits set for any potential security - * or spoofing issues detected. The bits are defined by - * enum USpoofChecks. (returned_value & USPOOF_ALL_CHECKS) - * will be zero if the input string passes all of the - * enabled checks. - * @see uspoof_check2UnicodeString - * @stable ICU 4.2 - */ -U_STABLE int32_t U_EXPORT2 -uspoof_checkUnicodeString(const USpoofChecker *sc, - const icu::UnicodeString &id, - int32_t *position, - UErrorCode *status); -#endif - - /** * Check the specified string for possible security issues. * The text to be checked will typically be an identifier of some sort. @@ -1135,39 +1031,6 @@ uspoof_check2UTF8(const USpoofChecker *sc, USpoofCheckResult* checkResult, UErrorCode *status); -#if U_SHOW_CPLUSPLUS_API -/** - * Check the specified string for possible security issues. - * The text to be checked will typically be an identifier of some sort. - * The set of checks to be performed is specified with uspoof_setChecks(). - * - * @param sc The USpoofChecker - * @param id A identifier to be checked for possible security issues. - * @param checkResult An instance of USpoofCheckResult to be filled with - * details about the identifier. Can be NULL. - * @param status The error code, set if an error occurred while attempting to - * perform the check. - * Spoofing or security issues detected with the input string are - * not reported here, but through the function's return value. - * @return An integer value with bits set for any potential security - * or spoofing issues detected. The bits are defined by - * enum USpoofChecks. (returned_value & USPOOF_ALL_CHECKS) - * will be zero if the input string passes all of the - * enabled checks. Any information in this bitmask will be - * consistent with the information saved in the optional - * checkResult parameter. - * @see uspoof_openCheckResult - * @see uspoof_check2 - * @see uspoof_check2UTF8 - * @stable ICU 58 - */ -U_STABLE int32_t U_EXPORT2 -uspoof_check2UnicodeString(const USpoofChecker *sc, - const icu::UnicodeString &id, - USpoofCheckResult* checkResult, - UErrorCode *status); -#endif - /** * Create a USpoofCheckResult, used by the {@link uspoof_check2} class of functions to return * information about the identifier. Information includes: @@ -1199,32 +1062,6 @@ uspoof_openCheckResult(UErrorCode *status); U_STABLE void U_EXPORT2 uspoof_closeCheckResult(USpoofCheckResult *checkResult); -#if U_SHOW_CPLUSPLUS_API - -U_NAMESPACE_BEGIN - -/** - * \class LocalUSpoofCheckResultPointer - * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`. - * For most methods see the LocalPointerBase base class. - * - * @see LocalPointerBase - * @see LocalPointer - * @stable ICU 58 - */ - -/** - * \cond - * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER. - * For now, suppress with a Doxygen cond - */ -U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult); -/** \endcond */ - -U_NAMESPACE_END - -#endif - /** * Indicates which of the spoof check(s) have failed. The value is a bitwise OR of the constants for the tests * in question: USPOOF_RESTRICTION_LEVEL, USPOOF_CHAR_LIMIT, and so on. @@ -1355,36 +1192,6 @@ uspoof_areConfusableUTF8(const USpoofChecker *sc, -#if U_SHOW_CPLUSPLUS_API -/** - * A version of {@link uspoof_areConfusable} accepting UnicodeStrings. - * - * @param sc The USpoofChecker - * @param s1 The first of the two identifiers to be compared for - * confusability. The strings are in UTF-8 format. - * @param s2 The second of the two identifiers to be compared for - * confusability. The strings are in UTF-8 format. - * @param status The error code, set if an error occurred while attempting to - * perform the check. - * Confusability of the identifiers is not reported here, - * but through this function's return value. - * @return An integer value with bit(s) set corresponding to - * the type of confusability found, as defined by - * enum USpoofChecks. Zero is returned if the identifiers - * are not confusable. - * - * @stable ICU 4.2 - * - * @see uspoof_areConfusable - */ -U_STABLE int32_t U_EXPORT2 -uspoof_areConfusableUnicodeString(const USpoofChecker *sc, - const icu::UnicodeString &s1, - const icu::UnicodeString &s2, - UErrorCode *status); -#endif - - /** * Get the "skeleton" for an identifier. * Skeletons are a transformation of the input identifier; @@ -1463,38 +1270,6 @@ uspoof_getSkeletonUTF8(const USpoofChecker *sc, char *dest, int32_t destCapacity, UErrorCode *status); -#if U_SHOW_CPLUSPLUS_API -/** - * Get the "skeleton" for an identifier. - * Skeletons are a transformation of the input identifier; - * Two identifiers are confusable if their skeletons are identical. - * See Unicode UAX #39 for additional information. - * - * Using skeletons directly makes it possible to quickly check - * whether an identifier is confusable with any of some large - * set of existing identifiers, by creating an efficiently - * searchable collection of the skeletons. - * - * @param sc The USpoofChecker. - * @param type Deprecated in ICU 58. You may pass any number. - * Originally, controlled which of the Unicode confusable data - * tables to use. - * @param id The input identifier whose skeleton will be computed. - * @param dest The output identifier, to receive the skeleton string. - * @param status The error code, set if an error occurred while attempting to - * perform the check. - * @return A reference to the destination (skeleton) string. - * - * @stable ICU 4.2 - */ -U_I18N_API icu::UnicodeString & U_EXPORT2 -uspoof_getSkeletonUnicodeString(const USpoofChecker *sc, - uint32_t type, - const icu::UnicodeString &id, - icu::UnicodeString &dest, - UErrorCode *status); -#endif /* U_SHOW_CPLUSPLUS_API */ - /** * Get the set of Candidate Characters for Inclusion in Identifiers, as defined * in http://unicode.org/Public/security/latest/xidmodifications.txt @@ -1525,8 +1300,243 @@ uspoof_getInclusionSet(UErrorCode *status); U_STABLE const USet * U_EXPORT2 uspoof_getRecommendedSet(UErrorCode *status); +/** + * Serialize the data for a spoof detector into a chunk of memory. + * The flattened spoof detection tables can later be used to efficiently + * instantiate a new Spoof Detector. + * + * The serialized spoof checker includes only the data compiled from the + * Unicode data tables by uspoof_openFromSource(); it does not include + * include any other state or configuration that may have been set. + * + * @param sc the Spoof Detector whose data is to be serialized. + * @param data a pointer to 32-bit-aligned memory to be filled with the data, + * can be NULL if capacity==0 + * @param capacity the number of bytes available at data, + * or 0 for preflighting + * @param status an in/out ICU UErrorCode; possible errors include: + * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization + * - U_ILLEGAL_ARGUMENT_ERROR the data or capacity parameters are bad + * @return the number of bytes written or needed for the spoof data + * + * @see utrie2_openFromSerialized() + * @stable ICU 4.2 + */ +U_STABLE int32_t U_EXPORT2 +uspoof_serialize(USpoofChecker *sc, + void *data, int32_t capacity, + UErrorCode *status); + +U_CDECL_END + #if U_SHOW_CPLUSPLUS_API +U_NAMESPACE_BEGIN + +/** + * \class LocalUSpoofCheckerPointer + * "Smart pointer" class, closes a USpoofChecker via uspoof_close(). + * For most methods see the LocalPointerBase base class. + * + * @see LocalPointerBase + * @see LocalPointer + * @stable ICU 4.4 + */ +/** + * \cond + * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER. + * For now, suppress with a Doxygen cond + */ +U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close); +/** \endcond */ + +/** + * \class LocalUSpoofCheckResultPointer + * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`. + * For most methods see the LocalPointerBase base class. + * + * @see LocalPointerBase + * @see LocalPointer + * @stable ICU 58 + */ + +/** + * \cond + * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER. + * For now, suppress with a Doxygen cond + */ +U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult); +/** \endcond */ + +U_NAMESPACE_END + +/** + * Limit the acceptable characters to those specified by a Unicode Set. + * Any previously specified character limit is + * is replaced by the new settings. This includes limits on + * characters that were set with the uspoof_setAllowedLocales() function. + * + * The USPOOF_CHAR_LIMIT test is automatically enabled for this + * USoofChecker by this function. + * + * @param sc The USpoofChecker + * @param chars A Unicode Set containing the list of + * characters that are permitted. Ownership of the set + * remains with the caller. The incoming set is cloned by + * this function, so there are no restrictions on modifying + * or deleting the UnicodeSet after calling this function. + * @param status The error code, set if this function encounters a problem. + * @stable ICU 4.2 + */ +U_STABLE void U_EXPORT2 +uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status); + + +/** + * Get a UnicodeSet for the characters permitted in an identifier. + * This corresponds to the limits imposed by the Set Allowed Characters / + * UnicodeSet functions. Limitations imposed by other checks will not be + * reflected in the set returned by this function. + * + * The returned set will be frozen, meaning that it cannot be modified + * by the caller. + * + * Ownership of the returned set remains with the Spoof Detector. The + * returned set will become invalid if the spoof detector is closed, + * or if a new set of allowed characters is specified. + * + * + * @param sc The USpoofChecker + * @param status The error code, set if this function encounters a problem. + * @return A UnicodeSet containing the characters that are permitted by + * the USPOOF_CHAR_LIMIT test. + * @stable ICU 4.2 + */ +U_STABLE const icu::UnicodeSet * U_EXPORT2 +uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status); + +/** + * Check the specified string for possible security issues. + * The text to be checked will typically be an identifier of some sort. + * The set of checks to be performed is specified with uspoof_setChecks(). + * + * \note + * Consider using the newer API, {@link uspoof_check2UnicodeString}, instead. + * The newer API exposes additional information from the check procedure + * and is otherwise identical to this method. + * + * @param sc The USpoofChecker + * @param id A identifier to be checked for possible security issues. + * @param position Deprecated in ICU 51. Always returns zero. + * Originally, an out parameter for the index of the first + * string position that failed a check. + * This parameter may be NULL. + * @param status The error code, set if an error occurred while attempting to + * perform the check. + * Spoofing or security issues detected with the input string are + * not reported here, but through the function's return value. + * @return An integer value with bits set for any potential security + * or spoofing issues detected. The bits are defined by + * enum USpoofChecks. (returned_value & USPOOF_ALL_CHECKS) + * will be zero if the input string passes all of the + * enabled checks. + * @see uspoof_check2UnicodeString + * @stable ICU 4.2 + */ +U_STABLE int32_t U_EXPORT2 +uspoof_checkUnicodeString(const USpoofChecker *sc, + const icu::UnicodeString &id, + int32_t *position, + UErrorCode *status); + +/** + * Check the specified string for possible security issues. + * The text to be checked will typically be an identifier of some sort. + * The set of checks to be performed is specified with uspoof_setChecks(). + * + * @param sc The USpoofChecker + * @param id A identifier to be checked for possible security issues. + * @param checkResult An instance of USpoofCheckResult to be filled with + * details about the identifier. Can be NULL. + * @param status The error code, set if an error occurred while attempting to + * perform the check. + * Spoofing or security issues detected with the input string are + * not reported here, but through the function's return value. + * @return An integer value with bits set for any potential security + * or spoofing issues detected. The bits are defined by + * enum USpoofChecks. (returned_value & USPOOF_ALL_CHECKS) + * will be zero if the input string passes all of the + * enabled checks. Any information in this bitmask will be + * consistent with the information saved in the optional + * checkResult parameter. + * @see uspoof_openCheckResult + * @see uspoof_check2 + * @see uspoof_check2UTF8 + * @stable ICU 58 + */ +U_STABLE int32_t U_EXPORT2 +uspoof_check2UnicodeString(const USpoofChecker *sc, + const icu::UnicodeString &id, + USpoofCheckResult* checkResult, + UErrorCode *status); + +/** + * A version of {@link uspoof_areConfusable} accepting UnicodeStrings. + * + * @param sc The USpoofChecker + * @param s1 The first of the two identifiers to be compared for + * confusability. The strings are in UTF-8 format. + * @param s2 The second of the two identifiers to be compared for + * confusability. The strings are in UTF-8 format. + * @param status The error code, set if an error occurred while attempting to + * perform the check. + * Confusability of the identifiers is not reported here, + * but through this function's return value. + * @return An integer value with bit(s) set corresponding to + * the type of confusability found, as defined by + * enum USpoofChecks. Zero is returned if the identifiers + * are not confusable. + * + * @stable ICU 4.2 + * + * @see uspoof_areConfusable + */ +U_STABLE int32_t U_EXPORT2 +uspoof_areConfusableUnicodeString(const USpoofChecker *sc, + const icu::UnicodeString &s1, + const icu::UnicodeString &s2, + UErrorCode *status); + +/** + * Get the "skeleton" for an identifier. + * Skeletons are a transformation of the input identifier; + * Two identifiers are confusable if their skeletons are identical. + * See Unicode UAX #39 for additional information. + * + * Using skeletons directly makes it possible to quickly check + * whether an identifier is confusable with any of some large + * set of existing identifiers, by creating an efficiently + * searchable collection of the skeletons. + * + * @param sc The USpoofChecker. + * @param type Deprecated in ICU 58. You may pass any number. + * Originally, controlled which of the Unicode confusable data + * tables to use. + * @param id The input identifier whose skeleton will be computed. + * @param dest The output identifier, to receive the skeleton string. + * @param status The error code, set if an error occurred while attempting to + * perform the check. + * @return A reference to the destination (skeleton) string. + * + * @stable ICU 4.2 + */ +U_I18N_API icu::UnicodeString & U_EXPORT2 +uspoof_getSkeletonUnicodeString(const USpoofChecker *sc, + uint32_t type, + const icu::UnicodeString &id, + icu::UnicodeString &dest, + UErrorCode *status); + /** * Get the set of Candidate Characters for Inclusion in Identifiers, as defined * in http://unicode.org/Public/security/latest/xidmodifications.txt @@ -1559,34 +1569,6 @@ uspoof_getRecommendedUnicodeSet(UErrorCode *status); #endif /* U_SHOW_CPLUSPLUS_API */ -/** - * Serialize the data for a spoof detector into a chunk of memory. - * The flattened spoof detection tables can later be used to efficiently - * instantiate a new Spoof Detector. - * - * The serialized spoof checker includes only the data compiled from the - * Unicode data tables by uspoof_openFromSource(); it does not include - * include any other state or configuration that may have been set. - * - * @param sc the Spoof Detector whose data is to be serialized. - * @param data a pointer to 32-bit-aligned memory to be filled with the data, - * can be NULL if capacity==0 - * @param capacity the number of bytes available at data, - * or 0 for preflighting - * @param status an in/out ICU UErrorCode; possible errors include: - * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization - * - U_ILLEGAL_ARGUMENT_ERROR the data or capacity parameters are bad - * @return the number of bytes written or needed for the spoof data - * - * @see utrie2_openFromSerialized() - * @stable ICU 4.2 - */ -U_STABLE int32_t U_EXPORT2 -uspoof_serialize(USpoofChecker *sc, - void *data, int32_t capacity, - UErrorCode *status); - - -#endif +#endif /* UCONFIG_NO_NORMALIZATION */ #endif /* USPOOF_H */ diff --git a/deps/icu-small/source/i18n/unicode/utrans.h b/deps/icu-small/source/i18n/unicode/utrans.h index 7672b4428fba3c..56640eda967cbe 100644 --- a/deps/icu-small/source/i18n/unicode/utrans.h +++ b/deps/icu-small/source/i18n/unicode/utrans.h @@ -142,7 +142,7 @@ typedef struct UTransPosition { int32_t contextLimit; /** - * Beginning index, inclusive, of the text to be transliteratd. + * Beginning index, inclusive, of the text to be transliterated. * INPUT/OUTPUT parameter: This parameter is advanced past * characters that have already been transliterated by a * transliteration operation. @@ -151,7 +151,7 @@ typedef struct UTransPosition { int32_t start; /** - * Ending index, exclusive, of the text to be transliteratd. + * Ending index, exclusive, of the text to be transliterated. * INPUT/OUTPUT parameter: This parameter is updated to reflect * changes in the length of the text, but points to the same * logical position in the text. @@ -389,7 +389,7 @@ utrans_trans(const UTransliterator* trans, /** * Transliterate the portion of the UReplaceable text buffer that can - * be transliterated unambiguosly. This method is typically called + * be transliterated unambiguously. This method is typically called * after new text has been inserted, e.g. as a result of a keyboard * event. The transliterator will try to transliterate characters of * rep between index.cursor and @@ -454,8 +454,7 @@ utrans_transIncremental(const UTransliterator* trans, * zero-terminated. Upon return, the new length is stored in * *textLength. If textLength is NULL then the string is assumed to * be zero-terminated. - * @param textCapacity a pointer to the length of the text buffer. - * Upon return, + * @param textCapacity the length of the text buffer * @param start the beginning index, inclusive; 0 <= start <= * limit. * @param limit pointer to the ending index, exclusive; start <= @@ -479,7 +478,7 @@ utrans_transUChars(const UTransliterator* trans, /** * Transliterate the portion of the UChar* text buffer that can be - * transliterated unambiguosly. See utrans_transIncremental(). The + * transliterated unambiguously. See utrans_transIncremental(). The * string is passed in in a UChar* buffer. The string is modified in * place. If the result is longer than textCapacity, it is truncated. * The actual length of the result is returned in *textLength, if diff --git a/deps/icu-small/source/i18n/unicode/vtzone.h b/deps/icu-small/source/i18n/unicode/vtzone.h index 5d161778682313..43a5652d6a20f0 100644 --- a/deps/icu-small/source/i18n/unicode/vtzone.h +++ b/deps/icu-small/source/i18n/unicode/vtzone.h @@ -11,6 +11,8 @@ #include "unicode/utypes.h" +#if U_SHOW_CPLUSPLUS_API + /** * \file * \brief C++ API: RFC2445 VTIMEZONE support @@ -185,7 +187,7 @@ class U_I18N_API VTimeZone : public BasicTimeZone { * @return A new copy of this TimeZone object. * @stable ICU 3.8 */ - virtual TimeZone* clone(void) const; + virtual VTimeZone* clone() const; /** * Returns the TimeZone's adjusted GMT offset (i.e., the number of milliseconds to add @@ -288,6 +290,7 @@ class U_I18N_API VTimeZone : public BasicTimeZone { */ virtual UBool useDaylightTime(void) const; +#ifndef U_FORCE_HIDE_DEPRECATED_API /** * Queries if the given date is in daylight savings time in * this time zone. @@ -302,6 +305,7 @@ class U_I18N_API VTimeZone : public BasicTimeZone { * @deprecated ICU 2.4. Use Calendar::inDaylightTime() instead. */ virtual UBool inDaylightTime(UDate date, UErrorCode& status) const; +#endif // U_FORCE_HIDE_DEPRECATED_API /** * Returns true if this zone has the same rule and offset as another zone. @@ -453,5 +457,7 @@ U_NAMESPACE_END #endif /* #if !UCONFIG_NO_FORMATTING */ +#endif /* U_SHOW_CPLUSPLUS_API */ + #endif // VTZONE_H //eof diff --git a/deps/icu-small/source/i18n/unum.cpp b/deps/icu-small/source/i18n/unum.cpp index 907a1cd95e138f..ba3d519162ce54 100644 --- a/deps/icu-small/source/i18n/unum.cpp +++ b/deps/icu-small/source/i18n/unum.cpp @@ -135,6 +135,11 @@ unum_open( UNumberFormatStyle style, *status = U_MEMORY_ALLOCATION_ERROR; } + if (U_FAILURE(*status) && retVal != NULL) { + delete retVal; + retVal = NULL; + } + return reinterpret_cast(retVal); } diff --git a/deps/icu-small/source/i18n/usearch.cpp b/deps/icu-small/source/i18n/usearch.cpp index 0e9b876d2babb7..1b22e201e53294 100644 --- a/deps/icu-small/source/i18n/usearch.cpp +++ b/deps/icu-small/source/i18n/usearch.cpp @@ -317,7 +317,7 @@ inline uint16_t initializePatternCETable(UStringSearch *strsrch, uprv_free(pattern->ces); } - uint16_t offset = 0; + uint32_t offset = 0; uint16_t result = 0; int32_t ce; @@ -388,7 +388,7 @@ inline uint16_t initializePatternPCETable(UStringSearch *strsrch, uprv_free(pattern->pces); } - uint16_t offset = 0; + uint32_t offset = 0; uint16_t result = 0; int64_t pce; @@ -1351,7 +1351,7 @@ inline int getUnblockedAccentIndex(UChar *accents, int32_t *accentsindex) * @param destinationlength target array size, returning the appended length * @param source1 null-terminated first array * @param source2 second array -* @param source2length length of seond array +* @param source2length length of second array * @param source3 null-terminated third array * @param status error status if any * @return new destination array, destination if there was no new allocation @@ -1560,7 +1560,7 @@ inline void cleanUpSafeText(const UStringSearch *strsrch, UChar *safetext, /** * Take the rearranged end accents and tries matching. If match failed at -* a seperate preceding set of accents (seperated from the rearranged on by +* a separate preceding set of accents (separated from the rearranged on by * at least a base character) then we rearrange the preceding accents and * tries matching again. * We allow skipping of the ends of the accent set if the ces do not match. @@ -2220,7 +2220,7 @@ int32_t doPreviousCanonicalSuffixMatch(UStringSearch *strsrch, /** * Take the rearranged start accents and tries matching. If match failed at -* a seperate following set of accents (seperated from the rearranged on by +* a separate following set of accents (separated from the rearranged on by * at least a base character) then we rearrange the preceding accents and * tries matching again. * We allow skipping of the ends of the accent set if the ces do not match. @@ -3544,7 +3544,12 @@ const CEI *CEIBuffer::get(int32_t index) { // Verify that it is the next one in sequence, which is all // that is allowed. if (index != limitIx) { - UPRV_UNREACHABLE; + U_ASSERT(FALSE); + // TODO: In ICU 64 the above assert was changed to use UPRV_UNREACHABLE instead + // which unconditionally calls abort(). However, there were cases where this was + // being hit. This change is reverted for now, restoring the existing behavior. + // ICU-20792 tracks the follow-up work/further investigation on this. + return NULL; } // Manage the circular CE buffer indexing @@ -3581,7 +3586,12 @@ const CEI *CEIBuffer::getPrevious(int32_t index) { // Verify that it is the next one in sequence, which is all // that is allowed. if (index != limitIx) { - UPRV_UNREACHABLE; + U_ASSERT(FALSE); + // TODO: In ICU 64 the above assert was changed to use UPRV_UNREACHABLE instead + // which unconditionally calls abort(). However, there were cases where this was + // being hit. This change is reverted for now, restoring the existing behavior. + // ICU-20792 tracks the follow-up work/further investigation on this. + return NULL; } // Manage the circular CE buffer indexing @@ -3852,7 +3862,7 @@ U_CAPI UBool U_EXPORT2 usearch_search(UStringSearch *strsrch, #endif // Input parameter sanity check. - // TODO: should input indicies clip to the text length + // TODO: should input indices clip to the text length // in the same way that UText does. if(strsrch->pattern.cesLength == 0 || startIdx < 0 || @@ -4014,7 +4024,7 @@ U_CAPI UBool U_EXPORT2 usearch_search(UStringSearch *strsrch, // Check for the start of the match being within an Collation Element Expansion, // meaning that the first char of the match is only partially matched. - // With exapnsions, the first CE will report the index of the source + // With expansions, the first CE will report the index of the source // character, and all subsequent (expansions) CEs will report the source index of the // _following_ character. int32_t secondIx = firstCEI->highIndex; diff --git a/deps/icu-small/source/i18n/uspoof.cpp b/deps/icu-small/source/i18n/uspoof.cpp index c8fbec27bb9b6f..c44c60028badcc 100644 --- a/deps/icu-small/source/i18n/uspoof.cpp +++ b/deps/icu-small/source/i18n/uspoof.cpp @@ -349,7 +349,7 @@ uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const UnicodeSet *chars, UErrorCo *status = U_ILLEGAL_ARGUMENT_ERROR; return; } - UnicodeSet *clonedSet = static_cast(chars->clone()); + UnicodeSet *clonedSet = chars->clone(); if (clonedSet == NULL || clonedSet->isBogus()) { *status = U_MEMORY_ALLOCATION_ERROR; return; diff --git a/deps/icu-small/source/i18n/uspoof_impl.cpp b/deps/icu-small/source/i18n/uspoof_impl.cpp index 85a028bdfa02f2..3c1f84a19ba929 100644 --- a/deps/icu-small/source/i18n/uspoof_impl.cpp +++ b/deps/icu-small/source/i18n/uspoof_impl.cpp @@ -82,7 +82,7 @@ SpoofImpl::SpoofImpl(const SpoofImpl &src, UErrorCode &status) : if (src.fSpoofData != NULL) { fSpoofData = src.fSpoofData->addReference(); } - fAllowedCharsSet = static_cast(src.fAllowedCharsSet->clone()); + fAllowedCharsSet = src.fAllowedCharsSet->clone(); fAllowedLocales = uprv_strdup(src.fAllowedLocales); if (fAllowedCharsSet == NULL || fAllowedLocales == NULL) { status = U_MEMORY_ALLOCATION_ERROR; @@ -193,7 +193,7 @@ void SpoofImpl::setAllowedLocales(const char *localesList, UErrorCode &status) { } // Store the updated spoof checker state. - tmpSet = static_cast(allowedChars.clone()); + tmpSet = allowedChars.clone(); const char *tmpLocalesList = uprv_strdup(localesList); if (tmpSet == NULL || tmpLocalesList == NULL) { status = U_MEMORY_ALLOCATION_ERROR; diff --git a/deps/icu-small/source/i18n/vtzone.cpp b/deps/icu-small/source/i18n/vtzone.cpp index e39eada51b7f61..bda3d1115e3d13 100644 --- a/deps/icu-small/source/i18n/vtzone.cpp +++ b/deps/icu-small/source/i18n/vtzone.cpp @@ -965,7 +965,7 @@ VTimeZone::VTimeZone(const VTimeZone& source) tzurl(source.tzurl), lastmod(source.lastmod), olsonzid(source.olsonzid), icutzver(source.icutzver) { if (source.tz != NULL) { - tz = (BasicTimeZone*)source.tz->clone(); + tz = source.tz->clone(); } if (source.vtzlines != NULL) { UErrorCode status = U_ZERO_ERROR; @@ -1007,7 +1007,7 @@ VTimeZone::operator=(const VTimeZone& right) { tz = NULL; } if (right.tz != NULL) { - tz = (BasicTimeZone*)right.tz->clone(); + tz = right.tz->clone(); } if (vtzlines != NULL) { delete vtzlines; @@ -1092,7 +1092,7 @@ VTimeZone::createVTimeZoneFromBasicTimeZone(const BasicTimeZone& basic_time_zone status = U_MEMORY_ALLOCATION_ERROR; return NULL; } - vtz->tz = (BasicTimeZone *)basic_time_zone.clone(); + vtz->tz = basic_time_zone.clone(); if (vtz->tz == NULL) { status = U_MEMORY_ALLOCATION_ERROR; delete vtz; @@ -1177,8 +1177,8 @@ VTimeZone::writeSimple(UDate time, UnicodeString& result, UErrorCode& status) co writeSimple(time, writer, status); } -TimeZone* -VTimeZone::clone(void) const { +VTimeZone* +VTimeZone::clone() const { return new VTimeZone(*this); } @@ -1957,7 +1957,7 @@ VTimeZone::writeZone(VTZWriter& w, BasicTimeZone& basictz, && (atzrule = dynamic_cast(tzt.getTo())) != NULL && atzrule->getEndYear() == AnnualTimeZoneRule::MAX_YEAR ) { - finalDstRule = (AnnualTimeZoneRule*)tzt.getTo()->clone(); + finalDstRule = atzrule->clone(); } if (dstCount > 0) { if (year == dstStartYear + dstCount @@ -2008,7 +2008,7 @@ VTimeZone::writeZone(VTZWriter& w, BasicTimeZone& basictz, && (atzrule = dynamic_cast(tzt.getTo())) != NULL && atzrule->getEndYear() == AnnualTimeZoneRule::MAX_YEAR ) { - finalStdRule = (AnnualTimeZoneRule*)tzt.getTo()->clone(); + finalStdRule = atzrule->clone(); } if (stdCount > 0) { if (year == stdStartYear + stdCount diff --git a/deps/icu-small/source/i18n/windtfmt.cpp b/deps/icu-small/source/i18n/windtfmt.cpp index 983fd46c122e6f..c35adc09875724 100644 --- a/deps/icu-small/source/i18n/windtfmt.cpp +++ b/deps/icu-small/source/i18n/windtfmt.cpp @@ -213,7 +213,7 @@ Win32DateFormat &Win32DateFormat::operator=(const Win32DateFormat &other) return *this; } -Format *Win32DateFormat::clone(void) const +Win32DateFormat *Win32DateFormat::clone() const { return new Win32DateFormat(*this); } diff --git a/deps/icu-small/source/i18n/windtfmt.h b/deps/icu-small/source/i18n/windtfmt.h index 43b6fe6dba269e..f13a1ae687c342 100644 --- a/deps/icu-small/source/i18n/windtfmt.h +++ b/deps/icu-small/source/i18n/windtfmt.h @@ -48,7 +48,7 @@ class Win32DateFormat : public DateFormat virtual ~Win32DateFormat(); - virtual Format *clone(void) const; + virtual Win32DateFormat *clone() const; Win32DateFormat &operator=(const Win32DateFormat &other); diff --git a/deps/icu-small/source/i18n/winnmfmt.cpp b/deps/icu-small/source/i18n/winnmfmt.cpp index b1724b62c27279..1ae2310123a252 100644 --- a/deps/icu-small/source/i18n/winnmfmt.cpp +++ b/deps/icu-small/source/i18n/winnmfmt.cpp @@ -294,7 +294,7 @@ Win32NumberFormat &Win32NumberFormat::operator=(const Win32NumberFormat &other) return *this; } -Format *Win32NumberFormat::clone(void) const +Win32NumberFormat *Win32NumberFormat::clone() const { return new Win32NumberFormat(*this); } diff --git a/deps/icu-small/source/i18n/winnmfmt.h b/deps/icu-small/source/i18n/winnmfmt.h index 7ea5da91705476..8cf59ccf48d740 100644 --- a/deps/icu-small/source/i18n/winnmfmt.h +++ b/deps/icu-small/source/i18n/winnmfmt.h @@ -44,7 +44,7 @@ class Win32NumberFormat : public NumberFormat virtual ~Win32NumberFormat(); - virtual Format *clone(void) const; + virtual Win32NumberFormat *clone() const; Win32NumberFormat &operator=(const Win32NumberFormat &other); diff --git a/deps/icu-small/source/i18n/zonemeta.cpp b/deps/icu-small/source/i18n/zonemeta.cpp index 0e3ee893161122..72c590f424723f 100644 --- a/deps/icu-small/source/i18n/zonemeta.cpp +++ b/deps/icu-small/source/i18n/zonemeta.cpp @@ -30,10 +30,7 @@ #include "olsontz.h" #include "uinvchar.h" -static icu::UMutex *gZoneMetaLock() { - static icu::UMutex m = U_MUTEX_INITIALIZER; - return &m; -} +static icu::UMutex gZoneMetaLock; // CLDR Canonical ID mapping table static UHashtable *gCanonicalIDCache = NULL; @@ -266,11 +263,11 @@ ZoneMeta::getCanonicalCLDRID(const UnicodeString &tzid, UErrorCode& status) { } // Check if it was already cached - umtx_lock(gZoneMetaLock()); + umtx_lock(&gZoneMetaLock); { canonicalID = (const UChar *)uhash_get(gCanonicalIDCache, utzid); } - umtx_unlock(gZoneMetaLock()); + umtx_unlock(&gZoneMetaLock); if (canonicalID != NULL) { return canonicalID; @@ -351,7 +348,7 @@ ZoneMeta::getCanonicalCLDRID(const UnicodeString &tzid, UErrorCode& status) { U_ASSERT(canonicalID != NULL); // canocanilD must be non-NULL here // Put the resolved canonical ID to the cache - umtx_lock(gZoneMetaLock()); + umtx_lock(&gZoneMetaLock); { const UChar* idInCache = (const UChar *)uhash_get(gCanonicalIDCache, utzid); if (idInCache == NULL) { @@ -371,7 +368,7 @@ ZoneMeta::getCanonicalCLDRID(const UnicodeString &tzid, UErrorCode& status) { } } } - umtx_unlock(gZoneMetaLock()); + umtx_unlock(&gZoneMetaLock); } return canonicalID; @@ -449,14 +446,14 @@ ZoneMeta::getCanonicalCountry(const UnicodeString &tzid, UnicodeString &country, // Check if it was already cached UBool cached = FALSE; UBool singleZone = FALSE; - umtx_lock(gZoneMetaLock()); + umtx_lock(&gZoneMetaLock); { singleZone = cached = gSingleZoneCountries->contains((void*)region); if (!cached) { cached = gMultiZonesCountries->contains((void*)region); } } - umtx_unlock(gZoneMetaLock()); + umtx_unlock(&gZoneMetaLock); if (!cached) { // We need to go through all zones associated with the region. @@ -475,7 +472,7 @@ ZoneMeta::getCanonicalCountry(const UnicodeString &tzid, UnicodeString &country, delete ids; // Cache the result - umtx_lock(gZoneMetaLock()); + umtx_lock(&gZoneMetaLock); { UErrorCode ec = U_ZERO_ERROR; if (singleZone) { @@ -488,7 +485,7 @@ ZoneMeta::getCanonicalCountry(const UnicodeString &tzid, UnicodeString &country, } } } - umtx_unlock(gZoneMetaLock()); + umtx_unlock(&gZoneMetaLock); } if (singleZone) { @@ -575,11 +572,11 @@ ZoneMeta::getMetazoneMappings(const UnicodeString &tzid) { // get the mapping from cache const UVector *result = NULL; - umtx_lock(gZoneMetaLock()); + umtx_lock(&gZoneMetaLock); { result = (UVector*) uhash_get(gOlsonToMeta, tzidUChars); } - umtx_unlock(gZoneMetaLock()); + umtx_unlock(&gZoneMetaLock); if (result != NULL) { return result; @@ -593,7 +590,7 @@ ZoneMeta::getMetazoneMappings(const UnicodeString &tzid) { } // put the new one into the cache - umtx_lock(gZoneMetaLock()); + umtx_lock(&gZoneMetaLock); { // make sure it's already created result = (UVector*) uhash_get(gOlsonToMeta, tzidUChars); @@ -621,7 +618,7 @@ ZoneMeta::getMetazoneMappings(const UnicodeString &tzid) { delete tmpResult; } } - umtx_unlock(gZoneMetaLock()); + umtx_unlock(&gZoneMetaLock); return result; } diff --git a/deps/icu-small/source/python/icutools/databuilder/filtration_schema.json b/deps/icu-small/source/python/icutools/databuilder/filtration_schema.json new file mode 100644 index 00000000000000..2b7ff9989992a1 --- /dev/null +++ b/deps/icu-small/source/python/icutools/databuilder/filtration_schema.json @@ -0,0 +1,169 @@ +// Copyright (C) 2018 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +{ + "$id": "http://unicode.org/icu-filter-schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "JSON Schema for an ICU data filter file", + "type": "object", + "properties": { + "strategy": { + "type": "string", + "enum": ["additive", "subtractive"] + }, + "localeFilter": { "$ref": "#/definitions/filter" }, + "featureFilters": { + "type": "object", + "additionalProperties": { + "oneOf": [ + { "$ref": "#/definitions/filter" }, + { + "type": "string", + "enum": ["include", "exclude"] + } + ] + } + }, + "resourceFilters": { + "type": "array", + "items": { + "type": "object", + "properties": { + "categories": { + "type": "array", + "items": { "type": "string" } + }, + "files": { "$ref": "#/definitions/filter" }, + "rules": { + "type": "array", + "items": { + "type": "string", + "pattern": "^[+-]/[\\S]*$" + } + } + }, + "required": ["categories", "rules"], + "additionalProperties": false + } + }, + "fileReplacements": { + "type": "object", + "properties": { + "directory": { + "type": "string", + "pattern": "^(\\$SRC|\\$FILTERS|\\$CWD|/$|/[^/]+)(/[^/]+)*$" + }, + "replacements": { + "type": "array", + "items": { + "oneOf": [ + { "type": "string" }, + { + "type": "object", + "properties": { + "src": { "type": "string" }, + "dest": { "type": "string" } + }, + "additionalProperties": false, + "required": ["src", "dest"] + } + ] + } + } + }, + "additionalProperties": false, + "required": ["directory", "replacements"] + }, + "collationUCAData": { + "type": "string", + "enum": ["unihan", "implicithan"] + }, + "usePoolBundle": { + "type": "boolean" + } + }, + "additionalProperties": false, + "definitions": { + "filter": { + "type": "object", + "oneOf": [ + { + "properties": { + "filterType": { + "$ref": "#/definitions/blacklistWhitelistFilterTypes" + }, + "whitelist": { "$ref": "#/definitions/stringList" } + }, + "required": ["whitelist"], + "additionalProperties": false + }, + { + "properties": { + "filterType": { + "$ref": "#/definitions/blacklistWhitelistFilterTypes" + }, + "blacklist": { "$ref": "#/definitions/stringList" } + }, + "required": ["blacklist"], + "additionalProperties": false + }, + { + "properties": { + "filterType": { + "type": "string", + "enum": ["exclude"] + } + }, + "required": ["filterType"], + "additionalProperties": false + }, + { + "properties": { + "filterType": { + "type": "string", + "enum": ["locale"] + }, + "includeChildren": { + "type": "boolean" + }, + "includeScripts": { + "type": "boolean" + }, + "whitelist": { "$ref": "#/definitions/stringList" } + }, + "required": ["filterType", "whitelist"], + "additionalProperties": false + }, + { + "properties": { + "filterType": { + "type": "string", + "enum": ["union"] + }, + "unionOf": { + "type": "array", + "items": { "$ref": "#/definitions/filter" } + } + }, + "required": ["filterType", "unionOf"], + "additionalProperties": false + } + ] + }, + "blacklistWhitelistFilterTypes": { + "type": "string", + "enum": [ + "language", + "regex" + ] + }, + "stringList": { + "type": "array", + "items": { + "type": "string" + }, + "minItems": 1, + "uniqueItems": true + } + } +} diff --git a/deps/icu-small/source/tools/genccode/genccode.c b/deps/icu-small/source/tools/genccode/genccode.c index d35b5890105d9c..91e94d7f5181c4 100644 --- a/deps/icu-small/source/tools/genccode/genccode.c +++ b/deps/icu-small/source/tools/genccode/genccode.c @@ -63,6 +63,7 @@ enum { kOptHelpH = 0, kOptHelpQuestionMark, kOptDestDir, + kOptQuiet, kOptName, kOptEntryPoint, #ifdef CAN_GENERATE_OBJECTS @@ -77,6 +78,7 @@ static UOption options[]={ /*0*/UOPTION_HELP_H, UOPTION_HELP_QUESTION_MARK, UOPTION_DESTDIR, + UOPTION_QUIET, UOPTION_DEF("name", 'n', UOPT_REQUIRES_ARG), UOPTION_DEF("entrypoint", 'e', UOPT_REQUIRES_ARG), #ifdef CAN_GENERATE_OBJECTS @@ -116,6 +118,7 @@ main(int argc, char* argv[]) { "options:\n" "\t-h or -? or --help this usage text\n" "\t-d or --destdir destination directory, followed by the path\n" + "\t-q or --quiet do not display warnings and progress\n" "\t-n or --name symbol prefix, followed by the prefix\n" "\t-e or --entrypoint entry point name, followed by the name (_dat will be appended)\n" "\t-r or --revision Specify a version\n" @@ -159,6 +162,9 @@ main(int argc, char* argv[]) { writeCode = CALL_WRITECCODE; /* TODO: remove writeCode=&writeCCode; */ } + if (options[kOptQuiet].doesOccur) { + verbose = FALSE; + } while(--argc) { filename=getLongPathname(argv[argc]); if (verbose) { @@ -170,13 +176,15 @@ main(int argc, char* argv[]) { writeCCode(filename, options[kOptDestDir].value, options[kOptName].doesOccur ? options[kOptName].value : NULL, options[kOptFilename].doesOccur ? options[kOptFilename].value : NULL, - NULL); + NULL, + 0); break; case CALL_WRITEASSEMBLY: writeAssemblyCode(filename, options[kOptDestDir].value, options[kOptEntryPoint].doesOccur ? options[kOptEntryPoint].value : NULL, options[kOptFilename].doesOccur ? options[kOptFilename].value : NULL, - NULL); + NULL, + 0); break; #ifdef CAN_GENERATE_OBJECTS case CALL_WRITEOBJECT: @@ -184,7 +192,8 @@ main(int argc, char* argv[]) { options[kOptEntryPoint].doesOccur ? options[kOptEntryPoint].value : NULL, options[kOptMatchArch].doesOccur ? options[kOptMatchArch].value : NULL, options[kOptFilename].doesOccur ? options[kOptFilename].value : NULL, - NULL); + NULL, + 0); break; #endif default: diff --git a/deps/icu-small/source/tools/genrb/derb.cpp b/deps/icu-small/source/tools/genrb/derb.cpp index ac26d95be4ca01..997b400129532c 100644 --- a/deps/icu-small/source/tools/genrb/derb.cpp +++ b/deps/icu-small/source/tools/genrb/derb.cpp @@ -631,7 +631,7 @@ static const char *getEncodingName(const char *encoding) { if (!(enc = ucnv_getStandardName(encoding, "MIME", &err))) { err = U_ZERO_ERROR; if (!(enc = ucnv_getStandardName(encoding, "IANA", &err))) { - ; + // do nothing } } diff --git a/deps/icu-small/source/tools/genrb/filterrb.cpp b/deps/icu-small/source/tools/genrb/filterrb.cpp index d62d185d773224..dcc02fc6210903 100644 --- a/deps/icu-small/source/tools/genrb/filterrb.cpp +++ b/deps/icu-small/source/tools/genrb/filterrb.cpp @@ -23,6 +23,9 @@ ResKeyPath::ResKeyPath(const std::string& path, UErrorCode& status) { status = U_PARSE_ERROR; return; } + if (path.length() == 1) { + return; + } size_t i; size_t j = 0; while (true) { diff --git a/deps/icu-small/source/tools/genrb/genrb.cpp b/deps/icu-small/source/tools/genrb/genrb.cpp index 885f3039bf6d7b..6f3a13a0a6107c 100644 --- a/deps/icu-small/source/tools/genrb/genrb.cpp +++ b/deps/icu-small/source/tools/genrb/genrb.cpp @@ -205,10 +205,10 @@ main(int argc, "\t-c or --copyright include copyright notice\n"); fprintf(stderr, "\t-e or --encoding encoding of source files\n" - "\t-d of --destdir destination directory, followed by the path, defaults to %s\n" - "\t-s or --sourcedir source directory for files followed by path, defaults to %s\n" + "\t-d or --destdir destination directory, followed by the path, defaults to '%s'\n" + "\t-s or --sourcedir source directory for files followed by path, defaults to '%s'\n" "\t-i or --icudatadir directory for locating any needed intermediate data files,\n" - "\t followed by path, defaults to %s\n", + "\t followed by path, defaults to '%s'\n", u_getDataDirectory(), u_getDataDirectory(), u_getDataDirectory()); fprintf(stderr, "\t-j or --write-java write a Java ListResourceBundle for ICU4J, followed by optional encoding\n" @@ -240,7 +240,7 @@ main(int argc, "\t (--writePoolBundle and --usePoolBundle cannot be combined)\n"); fprintf(stderr, "\t --filterDir Input directory where filter files are available.\n" - "\t For more on filter files, see Python buildtool.\n"); + "\t For more on filter files, see ICU Data Build Tool.\n"); return illegalArg ? U_ILLEGAL_ARGUMENT_ERROR : U_ZERO_ERROR; } diff --git a/deps/icu-small/source/tools/genrb/parse.cpp b/deps/icu-small/source/tools/genrb/parse.cpp index 884d5d5666081a..18a8c76dbc5df1 100644 --- a/deps/icu-small/source/tools/genrb/parse.cpp +++ b/deps/icu-small/source/tools/genrb/parse.cpp @@ -274,11 +274,11 @@ expect(ParseState* state, enum ETokenType expectedToken, struct UString **tokenV } } -static char *getInvariantString(ParseState* state, uint32_t *line, struct UString *comment, UErrorCode *status) +static char *getInvariantString(ParseState* state, uint32_t *line, struct UString *comment, + int32_t &stringLength, UErrorCode *status) { struct UString *tokenValue; char *result; - uint32_t count; expect(state, TOK_STRING, &tokenValue, comment, line, status); @@ -287,14 +287,13 @@ static char *getInvariantString(ParseState* state, uint32_t *line, struct UStrin return NULL; } - count = u_strlen(tokenValue->fChars); - if(!uprv_isInvariantUString(tokenValue->fChars, count)) { + if(!uprv_isInvariantUString(tokenValue->fChars, tokenValue->fLength)) { *status = U_INVALID_FORMAT_ERROR; error(*line, "invariant characters required for table keys, binary data, etc."); return NULL; } - result = static_cast(uprv_malloc(count+1)); + result = static_cast(uprv_malloc(tokenValue->fLength+1)); if (result == NULL) { @@ -302,7 +301,8 @@ static char *getInvariantString(ParseState* state, uint32_t *line, struct UStrin return NULL; } - u_UCharsToChars(tokenValue->fChars, result, count+1); + u_UCharsToChars(tokenValue->fChars, result, tokenValue->fLength+1); + stringLength = tokenValue->fLength; return result; } @@ -1371,7 +1371,6 @@ parseIntVector(ParseState* state, char *tag, uint32_t startline, const struct US int32_t value; UBool readToken = FALSE; char *stopstring; - uint32_t len; struct UString memberComments; IntVectorResource *result = intvector_open(state->bundle, tag, comment, status); @@ -1404,7 +1403,8 @@ parseIntVector(ParseState* state, char *tag, uint32_t startline, const struct US return result; } - string = getInvariantString(state, NULL, NULL, status); + int32_t stringLength; + string = getInvariantString(state, NULL, NULL, stringLength, status); if (U_FAILURE(*status)) { @@ -1414,9 +1414,9 @@ parseIntVector(ParseState* state, char *tag, uint32_t startline, const struct US /* For handling illegal char in the Intvector */ value = uprv_strtoul(string, &stopstring, 0);/* make intvector support decimal,hexdigit,octal digit ranging from -2^31-2^32-1*/ - len=(uint32_t)(stopstring-string); + int32_t len = (int32_t)(stopstring-string); - if(len==uprv_strlen(string)) + if(len==stringLength) { result->add(value, *status); uprv_free(string); @@ -1454,7 +1454,8 @@ static struct SResource * parseBinary(ParseState* state, char *tag, uint32_t startline, const struct UString *comment, UErrorCode *status) { uint32_t line; - LocalMemory string(getInvariantString(state, &line, NULL, status)); + int32_t stringLength; + LocalMemory string(getInvariantString(state, &line, NULL, stringLength, status)); if (string.isNull() || U_FAILURE(*status)) { return NULL; @@ -1470,46 +1471,45 @@ parseBinary(ParseState* state, char *tag, uint32_t startline, const struct UStri printf(" binary %s at line %i \n", (tag == NULL) ? "(null)" : tag, (int)startline); } - uint32_t count = (uint32_t)uprv_strlen(string.getAlias()); - if (count > 0){ - if((count % 2)==0){ - LocalMemory value; - if (value.allocateInsteadAndCopy(count) == NULL) - { - *status = U_MEMORY_ALLOCATION_ERROR; - return NULL; - } - - char toConv[3] = {'\0', '\0', '\0'}; - for (uint32_t i = 0; i < count; i += 2) - { - toConv[0] = string[i]; - toConv[1] = string[i + 1]; + LocalMemory value; + int32_t count = 0; + if (stringLength > 0 && value.allocateInsteadAndCopy(stringLength) == NULL) + { + *status = U_MEMORY_ALLOCATION_ERROR; + return NULL; + } - char *stopstring; - value[i >> 1] = (uint8_t) uprv_strtoul(toConv, &stopstring, 16); - uint32_t len=(uint32_t)(stopstring-toConv); + char toConv[3] = {'\0', '\0', '\0'}; + for (int32_t i = 0; i < stringLength;) + { + // Skip spaces (which may have been line endings). + char c0 = string[i++]; + if (c0 == ' ') { continue; } + if (i == stringLength) { + *status=U_INVALID_CHAR_FOUND; + error(line, "Encountered invalid binary value (odd number of hex digits)"); + return NULL; + } + toConv[0] = c0; + toConv[1] = string[i++]; - if(len!=2) - { - *status=U_INVALID_CHAR_FOUND; - return NULL; - } - } + char *stopstring; + value[count++] = (uint8_t) uprv_strtoul(toConv, &stopstring, 16); + uint32_t len=(uint32_t)(stopstring-toConv); - return bin_open(state->bundle, tag, count >> 1, value.getAlias(), NULL, comment, status); - } - else + if(len!=2) { - *status = U_INVALID_CHAR_FOUND; - error(line, "Encountered invalid binary value (length is odd)"); + *status=U_INVALID_CHAR_FOUND; + error(line, "Encountered invalid binary value (not all pairs of hex digits)"); return NULL; } } - else - { + + if (count == 0) { warning(startline, "Encountered empty binary value"); return bin_open(state->bundle, tag, 0, NULL, "", comment, status); + } else { + return bin_open(state->bundle, tag, count, value.getAlias(), NULL, comment, status); } } @@ -1520,9 +1520,9 @@ parseInteger(ParseState* state, char *tag, uint32_t startline, const struct UStr int32_t value; char *string; char *stopstring; - uint32_t len; - string = getInvariantString(state, NULL, NULL, status); + int32_t stringLength; + string = getInvariantString(state, NULL, NULL, stringLength, status); if (string == NULL || U_FAILURE(*status)) { @@ -1541,7 +1541,7 @@ parseInteger(ParseState* state, char *tag, uint32_t startline, const struct UStr printf(" integer %s at line %i \n", (tag == NULL) ? "(null)" : tag, (int)startline); } - if (uprv_strlen(string) <= 0) + if (stringLength == 0) { warning(startline, "Encountered empty integer. Default value is 0."); } @@ -1549,8 +1549,8 @@ parseInteger(ParseState* state, char *tag, uint32_t startline, const struct UStr /* Allow integer support for hexdecimal, octal digit and decimal*/ /* and handle illegal char in the integer*/ value = uprv_strtoul(string, &stopstring, 0); - len=(uint32_t)(stopstring-string); - if(len==uprv_strlen(string)) + int32_t len = (int32_t)(stopstring-string); + if(len==stringLength) { result = int_open(state->bundle, tag, value, comment, status); } @@ -1567,7 +1567,8 @@ static struct SResource * parseImport(ParseState* state, char *tag, uint32_t startline, const struct UString* comment, UErrorCode *status) { uint32_t line; - LocalMemory filename(getInvariantString(state, &line, NULL, status)); + int32_t stringLength; + LocalMemory filename(getInvariantString(state, &line, NULL, stringLength, status)); if (U_FAILURE(*status)) { return NULL; @@ -1628,12 +1629,11 @@ parseInclude(ParseState* state, char *tag, uint32_t startline, const struct UStr UCHARBUF *ucbuf; char *fullname = NULL; - int32_t count = 0; const char* cp = NULL; const UChar* uBuffer = NULL; - filename = getInvariantString(state, &line, NULL, status); - count = (int32_t)uprv_strlen(filename); + int32_t stringLength; + filename = getInvariantString(state, &line, NULL, stringLength, status); if (U_FAILURE(*status)) { @@ -1652,7 +1652,7 @@ parseInclude(ParseState* state, char *tag, uint32_t startline, const struct UStr printf(" include %s at line %i \n", (tag == NULL) ? "(null)" : tag, (int)startline); } - fullname = (char *) uprv_malloc(state->inputdirLength + count + 2); + fullname = (char *) uprv_malloc(state->inputdirLength + stringLength + 2); /* test for NULL */ if(fullname == NULL) { diff --git a/deps/icu-small/source/tools/genrb/reslist.cpp b/deps/icu-small/source/tools/genrb/reslist.cpp index bf57516047e901..3186c781e934f3 100644 --- a/deps/icu-small/source/tools/genrb/reslist.cpp +++ b/deps/icu-small/source/tools/genrb/reslist.cpp @@ -1371,7 +1371,7 @@ SRBRoot::compactKeys(UErrorCode &errorCode) { } int32_t keysCount = fUsePoolBundle->fKeysCount + fKeysCount; - if (U_FAILURE(errorCode) || fKeysCount == 0 || fKeyMap != NULL) { + if (U_FAILURE(errorCode) || fKeyMap != NULL) { return; } map = (KeyMapEntry *)uprv_malloc(keysCount * sizeof(KeyMapEntry)); diff --git a/deps/icu-small/source/tools/genrb/rle.c b/deps/icu-small/source/tools/genrb/rle.c index 08495c2b4f4666..3d034f78ca3881 100644 --- a/deps/icu-small/source/tools/genrb/rle.c +++ b/deps/icu-small/source/tools/genrb/rle.c @@ -91,14 +91,14 @@ encodeRunByte(uint16_t* buffer,uint16_t* bufLimit, uint8_t value, int32_t length return buffer; } -#define APPEND( buffer, bufLimit, value, num, status){ \ +#define APPEND( buffer, bufLimit, value, num, status) UPRV_BLOCK_MACRO_BEGIN { \ if(buffer3) && checkAssemblyHeaderName(genccodeAssembly+3)) { - writeAssemblyCode(datFileNamePath, o->tmpDir, o->entryName, NULL, gencFilePath); + writeAssemblyCode( + datFileNamePath, + o->tmpDir, + o->entryName, + NULL, + gencFilePath, + sizeof(gencFilePath)); result = pkg_createWithAssemblyCode(targetDir, mode, gencFilePath); if (result != 0) { @@ -753,7 +766,14 @@ static int32_t pkg_executeOptions(UPKGOptions *o) { /* Try to detect the arch type, use NULL if unsuccessful */ char optMatchArch[10] = { 0 }; pkg_createOptMatchArch(optMatchArch); - writeObjectCode(datFileNamePath, o->tmpDir, o->entryName, (optMatchArch[0] == 0 ? NULL : optMatchArch), NULL, gencFilePath); + writeObjectCode( + datFileNamePath, + o->tmpDir, + o->entryName, + (optMatchArch[0] == 0 ? NULL : optMatchArch), + NULL, + gencFilePath, + sizeof(gencFilePath)); pkg_destroyOptMatchArch(optMatchArch); #if U_PLATFORM_IS_LINUX_BASED result = pkg_generateLibraryFile(targetDir, mode, gencFilePath); @@ -1685,7 +1705,13 @@ static int32_t pkg_createWithoutAssemblyCode(UPKGOptions *o, const char *targetD printf("# Generating %s \n", gencmnFile); } - writeCCode(file, o->tmpDir, dataName[0] != 0 ? dataName : o->shortName, newName[0] != 0 ? newName : NULL, gencmnFile); + writeCCode( + file, + o->tmpDir, + dataName[0] != 0 ? dataName : o->shortName, + newName[0] != 0 ? newName : NULL, + gencmnFile, + sizeof(gencmnFile)); #ifdef USE_SINGLE_CCODE_FILE sprintf(cmd, "#include \"%s\"\n", gencmnFile); @@ -1758,14 +1784,12 @@ static int32_t pkg_createWithoutAssemblyCode(UPKGOptions *o, const char *targetD #ifdef WINDOWS_WITH_MSVC #define LINK_CMD "link.exe /nologo /release /out:" -#define LINK_FLAGS "/DLL /NOENTRY /MANIFEST:NO /implib:" -#ifdef _WIN64 -#define LINK_EXTRA_UWP_FLAGS "/NXCOMPAT /DYNAMICBASE /APPCONTAINER " -#else -#define LINK_EXTRA_UWP_FLAGS "/NXCOMPAT /SAFESEH /DYNAMICBASE /APPCONTAINER /MACHINE:X86" -#endif -#define LINK_EXTRA_UWP_FLAGS_ARM "/NXCOMPAT /DYNAMICBASE /APPCONTAINER /MACHINE:ARM" -#define LINK_EXTRA_NO_UWP_FLAGS "/base:0x4ad00000 " +#define LINK_FLAGS "/NXCOMPAT /DYNAMICBASE /DLL /NOENTRY /MANIFEST:NO /implib:" + +#define LINK_EXTRA_UWP_FLAGS "/APPCONTAINER " +#define LINK_EXTRA_UWP_FLAGS_X86_ONLY "/SAFESEH " + +#define LINK_EXTRA_FLAGS_MACHINE "/MACHINE:" #define LIB_CMD "LIB.exe /nologo /out:" #define LIB_FILE "icudt.lib" #define LIB_EXT UDATA_LIB_SUFFIX @@ -1845,23 +1869,23 @@ static int32_t pkg_createWindowsDLL(const char mode, const char *gencFilePath, U return 0; } - char *extraFlags = ""; + char extraFlags[SMALL_BUFFER_MAX_SIZE] = ""; #ifdef WINDOWS_WITH_MSVC - if (options[UWP_BUILD].doesOccur) - { - if (options[UWP_ARM_BUILD].doesOccur) - { - extraFlags = LINK_EXTRA_UWP_FLAGS_ARM; - } - else - { - extraFlags = LINK_EXTRA_UWP_FLAGS; + if (options[WIN_UWP_BUILD].doesOccur) { + uprv_strcat(extraFlags, LINK_EXTRA_UWP_FLAGS); + + if (options[WIN_DLL_ARCH].doesOccur) { + if (uprv_strcmp(options[WIN_DLL_ARCH].value, "X86") == 0) { + uprv_strcat(extraFlags, LINK_EXTRA_UWP_FLAGS_X86_ONLY); + } } } - else - { - extraFlags = LINK_EXTRA_NO_UWP_FLAGS; + + if (options[WIN_DLL_ARCH].doesOccur) { + uprv_strcat(extraFlags, LINK_EXTRA_FLAGS_MACHINE); + uprv_strcat(extraFlags, options[WIN_DLL_ARCH].value); } + #endif sprintf(cmd, "%s\"%s\" %s %s\"%s\" \"%s\" %s", LINK_CMD, diff --git a/deps/icu-small/source/tools/toolutil/filetools.cpp b/deps/icu-small/source/tools/toolutil/filetools.cpp index 6e88c94b5200b5..0f0e9c59846774 100644 --- a/deps/icu-small/source/tools/toolutil/filetools.cpp +++ b/deps/icu-small/source/tools/toolutil/filetools.cpp @@ -65,7 +65,7 @@ isFileModTimeLater(const char *filePath, const char *checkAgainst, UBool isDir) if (U_FAILURE(status)) { fprintf(stderr, "%s:%d: %s\n", __FILE__, __LINE__, u_errorName(status)); return FALSE; - }; + } if ((subDirp = opendir(newpath.data())) != NULL) { /* If this new path is a directory, make a recursive call with the newpath. */ diff --git a/deps/icu-small/source/tools/toolutil/pkg_genc.cpp b/deps/icu-small/source/tools/toolutil/pkg_genc.cpp index 2a8425e334119e..1a63eb0fa10225 100644 --- a/deps/icu-small/source/tools/toolutil/pkg_genc.cpp +++ b/deps/icu-small/source/tools/toolutil/pkg_genc.cpp @@ -48,6 +48,8 @@ #include "uoptions.h" #include "pkg_genc.h" #include "filetools.h" +#include "charstr.h" +#include "unicode/errorcode.h" #define MAX_COLUMN ((uint32_t)(0xFFFFFFFFU)) @@ -56,7 +58,15 @@ /* prototypes --------------------------------------------------------------- */ static void -getOutFilename(const char *inFilename, const char *destdir, char *outFilename, char *entryName, const char *newSuffix, const char *optFilename); +getOutFilename( + const char *inFilename, + const char *destdir, + char *outFilename, + int32_t outFilenameCapacity, + char *entryName, + int32_t entryNameCapacity, + const char *newSuffix, + const char *optFilename); static uint32_t write8(FileStream *out, uint8_t byte, uint32_t column); @@ -259,13 +269,21 @@ printAssemblyHeadersToStdErr(void) { } U_CAPI void U_EXPORT2 -writeAssemblyCode(const char *filename, const char *destdir, const char *optEntryPoint, const char *optFilename, char *outFilePath) { +writeAssemblyCode( + const char *filename, + const char *destdir, + const char *optEntryPoint, + const char *optFilename, + char *outFilePath, + size_t outFilePathCapacity) { uint32_t column = MAX_COLUMN; - char entry[64]; - uint32_t buffer[1024]; - char *bufferStr = (char *)buffer; + char entry[96]; + union { + uint32_t uint32s[1024]; + char chars[4096]; + } buffer; FileStream *in, *out; - size_t i, length; + size_t i, length, count; in=T_FileStream_open(filename, "rb"); if(in==NULL) { @@ -273,15 +291,27 @@ writeAssemblyCode(const char *filename, const char *destdir, const char *optEntr exit(U_FILE_ACCESS_ERROR); } - getOutFilename(filename, destdir, bufferStr, entry, ".S", optFilename); - out=T_FileStream_open(bufferStr, "w"); + getOutFilename( + filename, + destdir, + buffer.chars, + sizeof(buffer.chars), + entry, + sizeof(entry), + ".S", + optFilename); + out=T_FileStream_open(buffer.chars, "w"); if(out==NULL) { - fprintf(stderr, "genccode: unable to open output file %s\n", bufferStr); + fprintf(stderr, "genccode: unable to open output file %s\n", buffer.chars); exit(U_FILE_ACCESS_ERROR); } if (outFilePath != NULL) { - uprv_strcpy(outFilePath, bufferStr); + if (uprv_strlen(buffer.chars) >= outFilePathCapacity) { + fprintf(stderr, "genccode: filename too long\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } + uprv_strcpy(outFilePath, buffer.chars); } #if defined (WINDOWS_WITH_GNUC) && U_PLATFORM != U_PF_CYGWIN @@ -302,29 +332,42 @@ writeAssemblyCode(const char *filename, const char *destdir, const char *optEntr } } - sprintf(bufferStr, assemblyHeader[assemblyHeaderIndex].header, + count = snprintf( + buffer.chars, sizeof(buffer.chars), + assemblyHeader[assemblyHeaderIndex].header, entry, entry, entry, entry, entry, entry, entry, entry); - T_FileStream_writeLine(out, bufferStr); + if (count >= sizeof(buffer.chars)) { + fprintf(stderr, "genccode: entry name too long (long filename?)\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } + T_FileStream_writeLine(out, buffer.chars); T_FileStream_writeLine(out, assemblyHeader[assemblyHeaderIndex].beginLine); for(;;) { - memset(buffer, 0, sizeof(buffer)); - length=T_FileStream_read(in, buffer, sizeof(buffer)); + memset(buffer.uint32s, 0, sizeof(buffer.uint32s)); + length=T_FileStream_read(in, buffer.uint32s, sizeof(buffer.uint32s)); if(length==0) { break; } - for(i=0; i<(length/sizeof(buffer[0])); i++) { - column = write32(out, buffer[i], column); + for(i=0; i<(length/sizeof(buffer.uint32s[0])); i++) { + // TODO: What if the last read sees length not as a multiple of 4? + column = write32(out, buffer.uint32s[i], column); } } T_FileStream_writeLine(out, "\n"); - sprintf(bufferStr, assemblyHeader[assemblyHeaderIndex].footer, + count = snprintf( + buffer.chars, sizeof(buffer.chars), + assemblyHeader[assemblyHeaderIndex].footer, entry, entry, entry, entry, entry, entry, entry, entry); - T_FileStream_writeLine(out, bufferStr); + if (count >= sizeof(buffer.chars)) { + fprintf(stderr, "genccode: entry name too long (long filename?)\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } + T_FileStream_writeLine(out, buffer.chars); if(T_FileStream_error(in)) { fprintf(stderr, "genccode: file read error while generating from file %s\n", filename); @@ -341,11 +384,17 @@ writeAssemblyCode(const char *filename, const char *destdir, const char *optEntr } U_CAPI void U_EXPORT2 -writeCCode(const char *filename, const char *destdir, const char *optName, const char *optFilename, char *outFilePath) { +writeCCode( + const char *filename, + const char *destdir, + const char *optName, + const char *optFilename, + char *outFilePath, + size_t outFilePathCapacity) { uint32_t column = MAX_COLUMN; - char buffer[4096], entry[64]; + char buffer[4096], entry[96]; FileStream *in, *out; - size_t i, length; + size_t i, length, count; in=T_FileStream_open(filename, "rb"); if(in==NULL) { @@ -354,16 +403,35 @@ writeCCode(const char *filename, const char *destdir, const char *optName, const } if(optName != NULL) { /* prepend 'icudt28_' */ - strcpy(entry, optName); - strcat(entry, "_"); + // +2 includes the _ and the NUL + if (uprv_strlen(optName) + 2 > sizeof(entry)) { + fprintf(stderr, "genccode: entry name too long (long filename?)\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } + strcpy(entry, optName); + strcat(entry, "_"); } else { - entry[0] = 0; + entry[0] = 0; } - getOutFilename(filename, destdir, buffer, entry+uprv_strlen(entry), ".c", optFilename); + getOutFilename( + filename, + destdir, + buffer, + sizeof(buffer), + entry + uprv_strlen(entry), + sizeof(entry) - uprv_strlen(entry), + ".c", + optFilename); + if (outFilePath != NULL) { + if (uprv_strlen(buffer) >= outFilePathCapacity) { + fprintf(stderr, "genccode: filename too long\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } uprv_strcpy(outFilePath, buffer); } + out=T_FileStream_open(buffer, "w"); if(out==NULL) { fprintf(stderr, "genccode: unable to open output file %s\n", buffer); @@ -391,7 +459,7 @@ writeCCode(const char *filename, const char *destdir, const char *optName, const magic numbers we must still use the initial double. [grhoten 4/24/2003] */ - sprintf(buffer, + count = snprintf(buffer, sizeof(buffer), "#ifndef IN_GENERATED_CCODE\n" "#define IN_GENERATED_CCODE\n" "#define U_DISABLE_RENAMING 1\n" @@ -403,6 +471,10 @@ writeCCode(const char *filename, const char *destdir, const char *optName, const " const char *bytes; \n" "} %s={ 0.0, \n", entry); + if (count >= sizeof(buffer)) { + fprintf(stderr, "genccode: entry name too long (long filename?)\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } T_FileStream_writeLine(out, buffer); for(;;) { @@ -418,7 +490,7 @@ writeCCode(const char *filename, const char *destdir, const char *optName, const T_FileStream_writeLine(out, "\"\n};\nU_CDECL_END\n"); #else /* Function renaming shouldn't be done in data */ - sprintf(buffer, + count = snprintf(buffer, sizeof(buffer), "#ifndef IN_GENERATED_CCODE\n" "#define IN_GENERATED_CCODE\n" "#define U_DISABLE_RENAMING 1\n" @@ -430,6 +502,10 @@ writeCCode(const char *filename, const char *destdir, const char *optName, const " uint8_t bytes[%ld]; \n" "} %s={ 0.0, {\n", (long)T_FileStream_size(in), entry); + if (count >= sizeof(buffer)) { + fprintf(stderr, "genccode: entry name too long (long filename?)\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } T_FileStream_writeLine(out, buffer); for(;;) { @@ -583,66 +659,84 @@ write8str(FileStream *out, uint8_t byte, uint32_t column) { #endif static void -getOutFilename(const char *inFilename, const char *destdir, char *outFilename, char *entryName, const char *newSuffix, const char *optFilename) { +getOutFilename( + const char *inFilename, + const char *destdir, + char *outFilename, + int32_t outFilenameCapacity, + char *entryName, + int32_t entryNameCapacity, + const char *newSuffix, + const char *optFilename) { const char *basename=findBasename(inFilename), *suffix=uprv_strrchr(basename, '.'); + icu::CharString outFilenameBuilder; + icu::CharString entryNameBuilder; + icu::ErrorCode status; + /* copy path */ if(destdir!=NULL && *destdir!=0) { - do { - *outFilename++=*destdir++; - } while(*destdir!=0); - if(*(outFilename-1)!=U_FILE_SEP_CHAR) { - *outFilename++=U_FILE_SEP_CHAR; - } - inFilename=basename; + outFilenameBuilder.append(destdir, status); + outFilenameBuilder.ensureEndsWithFileSeparator(status); } else { - while(inFilename= outFilenameCapacity) { + fprintf(stderr, "genccode: output filename too long\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } + + if (entryNameBuilder.length() >= entryNameCapacity) { + fprintf(stderr, "genccode: entry name too long (long filename?)\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } + + uprv_strcpy(outFilename, outFilenameBuilder.data()); + uprv_strcpy(entryName, entryNameBuilder.data()); } #ifdef CAN_GENERATE_OBJECTS @@ -777,7 +871,14 @@ getArchitecture(uint16_t *pCPU, uint16_t *pBits, UBool *pIsBigEndian, const char } U_CAPI void U_EXPORT2 -writeObjectCode(const char *filename, const char *destdir, const char *optEntryPoint, const char *optMatchArch, const char *optFilename, char *outFilePath) { +writeObjectCode( + const char *filename, + const char *destdir, + const char *optEntryPoint, + const char *optMatchArch, + const char *optFilename, + char *outFilePath, + size_t outFilePathCapacity) { /* common variables */ char buffer[4096], entry[96]={ 0 }; FileStream *in, *out; @@ -1061,8 +1162,21 @@ writeObjectCode(const char *filename, const char *destdir, const char *optEntryP } size=T_FileStream_size(in); - getOutFilename(filename, destdir, buffer, entry+entryOffset, newSuffix, optFilename); + getOutFilename( + filename, + destdir, + buffer, + sizeof(buffer), + entry + entryOffset, + sizeof(entry) - entryOffset, + newSuffix, + optFilename); + if (outFilePath != NULL) { + if (uprv_strlen(buffer) >= outFilePathCapacity) { + fprintf(stderr, "genccode: filename too long\n"); + exit(U_ILLEGAL_ARGUMENT_ERROR); + } uprv_strcpy(outFilePath, buffer); } diff --git a/deps/icu-small/source/tools/toolutil/pkg_genc.h b/deps/icu-small/source/tools/toolutil/pkg_genc.h index 5039f27db5e030..47e8304a6890c5 100644 --- a/deps/icu-small/source/tools/toolutil/pkg_genc.h +++ b/deps/icu-small/source/tools/toolutil/pkg_genc.h @@ -75,12 +75,31 @@ U_INTERNAL UBool U_EXPORT2 checkAssemblyHeaderName(const char* optAssembly); U_INTERNAL void U_EXPORT2 -writeCCode(const char *filename, const char *destdir, const char *optName, const char *optFilename, char *outFilePath); +writeCCode( + const char *filename, + const char *destdir, + const char *optName, + const char *optFilename, + char *outFilePath, + size_t outFilePathCapacity); U_INTERNAL void U_EXPORT2 -writeAssemblyCode(const char *filename, const char *destdir, const char *optEntryPoint, const char *optFilename, char *outFilePath); +writeAssemblyCode( + const char *filename, + const char *destdir, + const char *optEntryPoint, + const char *optFilename, + char *outFilePath, + size_t outFilePathCapacity); U_INTERNAL void U_EXPORT2 -writeObjectCode(const char *filename, const char *destdir, const char *optEntryPoint, const char *optMatchArch, const char *optFilename, char *outFilePath); +writeObjectCode( + const char *filename, + const char *destdir, + const char *optEntryPoint, + const char *optMatchArch, + const char *optFilename, + char *outFilePath, + size_t outFilePathCapacity); #endif diff --git a/deps/icu-small/source/tools/toolutil/pkgitems.cpp b/deps/icu-small/source/tools/toolutil/pkgitems.cpp index dd414c2f873e22..b0ea980d605dcb 100644 --- a/deps/icu-small/source/tools/toolutil/pkgitems.cpp +++ b/deps/icu-small/source/tools/toolutil/pkgitems.cpp @@ -305,7 +305,8 @@ ures_enumDependencies(const char *itemName, break; } int32_t length; - const UChar *alias=res_getString(pResData, res, &length); + // No tracing: build tool + const UChar *alias=res_getStringNoTrace(pResData, res, &length); checkAlias(itemName, res, alias, length, useResSuffix, check, context, pErrorCode); } break; diff --git a/deps/icu-small/source/tools/toolutil/toolutil.cpp b/deps/icu-small/source/tools/toolutil/toolutil.cpp index 21dca7fe5d6a82..25f9c116ee18d4 100644 --- a/deps/icu-small/source/tools/toolutil/toolutil.cpp +++ b/deps/icu-small/source/tools/toolutil/toolutil.cpp @@ -243,7 +243,7 @@ struct UToolMemory { char name[64]; int32_t capacity, maxCapacity, size, idx; void *array; - UAlignedMemory staticArray[1]; + alignas(max_align_t) char staticArray[1]; }; U_CAPI UToolMemory * U_EXPORT2 diff --git a/deps/icu-small/source/tools/toolutil/ucbuf.h b/deps/icu-small/source/tools/toolutil/ucbuf.h index 48d41ef4cd2d95..7a9b7af5cc71ac 100644 --- a/deps/icu-small/source/tools/toolutil/ucbuf.h +++ b/deps/icu-small/source/tools/toolutil/ucbuf.h @@ -32,11 +32,11 @@ typedef struct UCHARBUF UCHARBUF; /** * End of file value */ -#define U_EOF 0xFFFFFFFF +#define U_EOF ((int32_t)0xFFFFFFFF) /** * Error value if a sequence cannot be unescaped */ -#define U_ERR 0xFFFFFFFE +#define U_ERR ((int32_t)0xFFFFFFFE) typedef struct ULine ULine; diff --git a/deps/icu-small/source/tools/toolutil/xmlparser.cpp b/deps/icu-small/source/tools/toolutil/xmlparser.cpp index ae7ef170207cf5..e3d5b42ef47a73 100644 --- a/deps/icu-small/source/tools/toolutil/xmlparser.cpp +++ b/deps/icu-small/source/tools/toolutil/xmlparser.cpp @@ -313,7 +313,7 @@ UXMLParser::parseFile(const char *filename, UErrorCode &errorCode) { // reached end of file, convert once more to flush the converter flush=TRUE; } - }; + } exit: ucnv_close(cnv); diff --git a/test/fixtures/bluebird/node_modules/bluebird/js/release/bluebird.js b/deps/npm/.npmrc similarity index 100% rename from test/fixtures/bluebird/node_modules/bluebird/js/release/bluebird.js rename to deps/npm/.npmrc diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml index 151be8440adb19..cec3aac226b1c1 100644 --- a/deps/npm/.travis.yml +++ b/deps/npm/.travis.yml @@ -2,46 +2,16 @@ language: node_js os: - - linux + - windows node_js: - 12 - 10 - 8 + - 6 env: "DEPLOY_VERSION=testing" -# having top-level `env:` adds a phantom build -# https://github.com/travis-ci/travis-ci/issues/4681 -#env: DEPLOY_VERSION=testing -matrix: - include: - # Run the sudotest, but only on Linux - - node_js: "12" - # DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js - # only gather coverage info for LTS - env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN" - script: - # run the sudo tests, with coverage enabled - - "sudo PATH=$PATH $(which node) . run tap -- \"test/tap/*.js\" --coverage --timeout 600" - - # also run standard and license checking - - node_js: "10" - script: - - "npx standard" - - "node . run licenses" - - # separate out node 6 so we can turn off caching, because that - # always breaks for some reason. - - node_js: "6" - cache: false - env: "DEPLOY_VERSION=testing" - - # only run one test on Windows, because it's hella slow - - node_js: "12" - os: "windows" - env: "DEPLOY_VERSION=testing" - notifications: slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8 diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 9e95ac15f62e79..c2a38c02d53f97 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -677,3 +677,17 @@ Fighting-Jack <574637316@qq.com> Bakel, Roel van Charlie West-Toebe <38671683+Hoidberg@users.noreply.github.com> Richard Lau +Felix Yan +Zhenya Vinogradov +Rafael Hengles +Jan-Philip Gehrcke +Caleb Sacks <16855387+clabe45@users.noreply.github.com> +Kyle Getz +Sean Healy +Netanel Gilad +Dave Nicolson +Ajay Narain Mathur +Vitaliy Markitanov <9357021+vit100@users.noreply.github.com> +simon_s +John Kennedy +Bernard Kitchens diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md index 945ac7583bac2a..5cd9c8d8f88615 100644 --- a/deps/npm/CHANGELOG.md +++ b/deps/npm/CHANGELOG.md @@ -1,3 +1,141 @@ +## 6.14.4 (2020-03-24) + +### DEPENDENCIES + +* Bump `minimist@1.2.5` transitive dep to resolve security issue + * [`9c554fd8c`](https://github.com/npm/cli/commit/9c554fd8cd1e9aeb8eb122ccfa3c78d12af4097a) `update-notifier@2.5.0` + * bump `deep-extend@1.2.5` + * bump `deep-extend@0.6.0` + * bump `is-ci@1.2.1` + * bump `is-retry-allowed@1.2.0` + * bump `rc@1.2.8` + * bump `registry-auth-token@3.4.0` + * bump `widest-line@2.0.1` +* [`136832dca`](https://github.com/npm/cli/commit/136832dcae13cb5518b1fe17bd63ea9b2a195f92) `mkdirp@0.5.4` +* [`8bf99b2b5`](https://github.com/npm/cli/commit/8bf99b2b58c14d45dc6739fce77de051ebc8ffb7) [#1053](https://github.com/npm/cli/pull/1053) deps: updates term-size to use signed binary + * [`d2f08a1bdb`](https://github.com/nodejs/node/commit/d2f08a1bdb78655c4a3fc49825986c148d14117e) ([@rvagg](https://github.com/rvagg)) + +## 6.14.3 (2020-03-19) + +### DOCUMENTATION + +* [`4ad221487`](https://github.com/npm/cli/commit4ad2214873cddfd4a0eff1bd188516b08fae9f9e) [#1020](https://github.com/npm/cli/pull/1020) docs(teams): updated team docs to reflect MFA workflow ([@blkdm0n](https://github.com/blkdm0n)) +* [`4a31a4ba2`](https://github.com/npm/cli/commit/4a31a4ba2db0a5db2d1d0890ee934ba1babb73a6) [#1034](https://github.com/npm/cli/pull/1034) docs: cleanup ([@ruyadorno](https://github.com/ruyadorno)) +* [`0eac801cd`](https://github.com/npm/cli/commit/0eac801cdef344e9fbda6270145e062211255b0e) [#1013](https://github.com/npm/cli/pull/1013) docs: fix links to cli commands ([@alenros](https://github.com/alenros)) +* [`7d8e5b99c`](https://github.com/npm/cli/commit/7d8e5b99c4ef8c394cffa7fc845f54a25ff37e3a) [#755](https://github.com/npm/cli/pull/755) docs: correction to `npm update -g` behaviour ([@johnkennedy9147](https://github.com/johnkennedy9147)) + +### DEPENDENCIES + +* [`e11167646`](https://github.com/npm/cli/commit/e111676467f090f73802b97e8da7ece481b18f99) `mkdirp@0.5.3` + * [`c5b97d17d`](https://github.com/isaacs/node-mkdirp/commit/c5b97d17d45a22bcf4c815645cbb989dab57ddd8) fix: bump `minimist` dep to resolve security issue ([@isaacs](https://github.com/isaacs)) +* [`c50d679c6`](https://github.com/npm/cli/commit/c50d679c68b39dd03ad127d34f540ddcb1b1e804) `rimraf@2.7.1` +* [`a2de99ff9`](https://github.com/npm/cli/commit/a2de99ff9e02425a3ccc25280f390178be755a36) `npm-registry-mock@1.3.1` +* [`217debeb9`](https://github.com/npm/cli/commit/217debeb9812e037a6686cbf6ec67a0cd47fa68a) `npm-registry-couchapp@2.7.4` + +## 6.14.2 (2020-03-03) + +### DOCUMENTATION +* [`f9248c0be`](https://github.com/npm/cli/commit/f9248c0be63fba37a30098dc9215c752474380e3) [#730](https://github.com/npm/cli/pull/730) chore(docs): update unpublish docs & policy reference ([@nomadtechie](https://github.com/nomadtechie), [@mikemimik](https://github.com/mikemimik)) + +### DEPENDENCIES + +* [`909cc3918`](https://github.com/npm/cli/commit/909cc39180a352f206898481add5772206c8b65f) `hosted-git-info@2.8.8` ([@darcyclarke](https://github.com/darcyclarke)) + * [`5038b1891`](https://github.com/npm/hosted-git-info/commit/5038b1891a61ca3cd7453acbf85d7011fe0086bb) fix: regression in old node versions w/ respect to url.URL implmentation +* [`9204ffa58`](https://github.com/npm/cli/commit/9204ffa584c140c5e22b1ee37f6df2c98f5dc70b) `npm-profile@4.0.4` ([@isaacs](https://github.com/isaacs)) + * [`6bcf0860a`](https://github.com/npm/npm-profile/commit/6bcf0860a3841865099d0115dbcbde8b78109bd9) fix: treat non-http/https login urls as invalid +* [`0365d39bd`](https://github.com/npm/cli/commit/0365d39bdc74960a18caac674f51d0e2a98b31e6) `glob@7.1.6` ([@isaacs](https://github.com/isaacs)) +* [`dab030536`](https://github.com/nodejs/node-gyp/commit/dab030536b6a70ecae37debc74c581db9e5280fd) `node-gyp@5.1.0` ([@rvagg](https://github.com/rvagg)) + +## 6.14.1 (2020-02-26) + +* [`303e5c11e`](https://github.com/npm/cli/commit/303e5c11e7db34cf014107aecd2e81c821bfde8d) + `hosted-git-info@2.8.7` + Fixes a regression where scp-style git urls are passed to the WhatWG URL + parser, which does not handle them properly. + ([@isaacs](https://github.com/isaacs)) + +## 6.14.0 (2020-02-25) + +### FEATURES +* [`30f170877`](https://github.com/npm/cli/commit/30f170877954acd036cb234a581e4eb155049b82) [#731](https://github.com/npm/cli/pull/731) add support for multiple funding sources ([@ljharb](https://github.com/ljharb) & [@ruyadorno](hhttps://github.com/ruyadorno/)) + +### BUG FIXES +* [`55916b130`](https://github.com/npm/cli/commit/55916b130ef52984584678f2cc17c15c1f031cb5) [#508](https://github.com/npm/cli/pull/508) fix: check `npm.config` before accessing its members ([@kaiyoma](https://github.com/kaiyoma)) +* [`7d0cd65b2`](https://github.com/npm/cli/commit/7d0cd65b23c0986b631b9b54d87bbe74902cc023) [#733](https://github.com/npm/cli/pull/733) fix: access grant with unscoped packages ([@netanelgilad](https://github.com/netanelgilad)) +* [`28c3d40d6`](https://github.com/npm/cli/commit/28c3d40d65eef63f9d6ccb60b99ac57f5057a46e), [`0769c5b20`](https://github.com/npm/cli/commit/30f170877954acd036cb234a581e4eb155049b82) [#945](https://github.com/npm/cli/pull/945), [#697](https://github.com/npm/cli/pull/697) fix: allow new major versions of node to be automatically considered "supported" ([@isaacs](https://github.com/isaacs), [@ljharb](https://github.com/ljharb)) + +### DEPENDENCIES +* [`6f39e93`](https://github.com/npm/hosted-git-info/commit/6f39e93bae9162663af6f15a9d10bce675dd5de3) `hosted-git-info@2.8.6` ([@darcyclarke](https://github.com/darcyclarke)) + * fix: passwords & usernames are escaped properly in git deps ([@stevenhilder](https://github.com/stevenhilder)) +* [`f14b594ee`](https://github.com/npm/cli/commit/f14b594ee9dbfc98ed0b65c65d904782db4f31ad) `chownr@1.1.4` ([@isaacs](https://github.com/isaacs)) +* [`77044150b`](https://github.com/npm/cli/commit/77044150b763d67d997f9ff108219132ea922678) `npm-packlist@1.4.8` ([@isaacs](https://github.com/isaacs)) +* [`1d112461a`](https://github.com/npm/cli/commit/1d112461ad8dc99e5ff7fabb5177e8c2f89a9755) `npm-registry-fetch@4.0.3` ([@isaacs](https://github.com/isaacs)) + * [`ba8b4fe`](https://github.com/npm/npm-registry-fetch/commit/ba8b4fe60eb6cdf9b39012560aec596eda8ce924) fix: always bypass cache when ?write=true +* [`a47fed760`](https://github.com/npm/cli/commit/a47fed7603a6ed31dcc314c0c573805f05a96830) `readable-stream@3.6.0` + * [`3bbf2d6`](https://github.com/nodejs/readable-stream/commit/3bbf2d6feb45b03f4e46a2ae8251601ad2262121) fix: babel's "loose mode" class transform enbrittles BufferList ([@ljharb](https://github.com/ljharb)) + +### DOCUMENTATION +* [`284c1c055`](https://github.com/npm/cli/commit/284c1c055a28c4b334496101799acefe3c54ceb3), [`fbb5f0e50`](https://github.com/npm/cli/commit/fbb5f0e50e54425119fa3f03c5de93e4cb6bfda7) [#729](https://github.com/npm/cli/pull/729) update lifecycle hooks docs + ([@seanhealy](https://github.com/seanhealy), [@mikemimik](https://github.com/mikemimik)) +* [`1c272832d`](https://github.com/npm/cli/commit/1c272832d048300e409882313305c416dc6f21a2) [#787](https://github.com/npm/cli/pull/787) fix: trademarks typo ([@dnicolson](https://github.com/dnicolson)) +* [`f6ff41776`](https://github.com/npm/cli/commit/f6ff417767d52418cc8c9e7b9731ede2c3916d2e) [#936](https://github.com/npm/cli/pull/936) fix: postinstall example ([@ajaymathur](https://github.com/ajaymathur)) +* [`373224b16`](https://github.com/npm/cli/commit/373224b16e019b7b63d8f0b4c5d4adb7e5cb80dd) [#939](https://github.com/npm/cli/pull/939) fix: bad links in publish docs ([@vit100](https://github.com/vit100)) + +### MISCELLANEOUS +* [`85c79636d`](https://github.com/npm/cli/commit/85c79636df31bac586c0e380c4852ee155a7723c) [#736](https://github.com/npm/cli/pull/736) add script to update dist-tags ([@mikemimik](https://github.com/mikemimik)) + +## 6.13.7 (2020-01-28) + +### BUG FIXES +* [`7dbb91438`](https://github.com/npm/cli/commit/7dbb914382ecd2074fffb7eba81d93262e2d23c6) + [#655](https://github.com/npm/cli/pull/655) + Update CI detection cases + ([@isaacs](https://github.com/isaacs)) + +### DEPENDENCIES +* [`0fb1296c7`](https://github.com/npm/cli/commit/0fb1296c7d6d4bb9e78c96978c433cd65e55c0ea) + `libnpx@10.2.2` + ([@mikemimik](https://github.com/mikemimik)) +* [`c9b69d569`](https://github.com/npm/cli/commit/c9b69d569fec7944375a746e9c08a6fa9bec96ff) + `node-gyp@5.0.7` + ([@mikemimik](https://github.com/mikemimik)) +* [`e8dbaf452`](https://github.com/npm/cli/commit/e8dbaf452a1f6c5350bb0c37059b89a7448e7986) + `bin-links@1.1.7` + ([@mikemimik](https://github.com/mikemimik)) + * [#613](https://github.com/npm/cli/issues/613) Fixes bin entry for package + +## 6.13.6 (2020-01-09) + +### DEPENDENCIES + +* [`6dba897a1`](https://github.com/npm/cli/commit/6dba897a1e2d56388fb6df0c814b0bb85af366b4) + `pacote@9.5.12`: + * [`d2f4176`](https://github.com/npm/pacote/commit/d2f4176b6af393d7e29de27e9b638dbcbab9a0c7) + fix(git): Do not drop uid/gid when executing in root-owned directory + ([@isaacs](https://github.com/isaacs)) + +## 6.13.5 (2020-01-09) + +### BUG FIXES + +* [`fd0a802ec`](https://github.com/npm/cli/commit/fd0a802ec468ec7b98d6c15934c355fef0e7ff60) [#550](https://github.com/npm/cli/pull/550) Fix cache location for `npm ci` ([@zhenyavinogradov](https://github.com/zhenyavinogradov)) +* [`4b30f3cca`](https://github.com/npm/cli/commit/4b30f3ccaebf50d6ab3bad130ff94827c017cc16) [#648](https://github.com/npm/cli/pull/648) fix(version): using 'allow-same-version', git commit --allow-empty and git tag -f ([@rhengles](https://github.com/rhengles)) + +### TESTING + +* [`e16f68d30`](https://github.com/npm/cli/commit/e16f68d30d59ce1ddde9fe62f7681b2c07fce84d) test(ci): add failing cache config test ([@ruyadorno](https://github.com/ruyadorno)) +* [`3f009fbf2`](https://github.com/npm/cli/commit/3f009fbf2c42f68c5127efecc6e22db105a74fe0) [#659](https://github.com/npm/cli/pull/659) test: fix bin-overwriting test on Windows ([@isaacs](https://github.com/isaacs)) +* [`43ae0791f`](https://github.com/npm/cli/commit/43ae0791f74f68e02850201a64a6af693657b241) [#601](https://github.com/npm/cli/pull/601) ci: Allow builds to run even if one fails ([@XhmikosR](https://github.com/XhmikosR)) +* [`4a669bee4`](https://github.com/npm/cli/commit/4a669bee4ac54c70adc6979d45cd0605b6dc33fd) [#603](https://github.com/npm/cli/pull/603) Remove the unused appveyor.yml ([@XhmikosR](https://github.com/XhmikosR)) +* [`9295046ac`](https://github.com/npm/cli/commit/9295046ac92bbe82f4d84e1ec90cc81d3b80bfc7) [#600](https://github.com/npm/cli/pull/600) ci: switch to `actions/checkout@v2` ([@XhmikosR](https://github.com/XhmikosR)) + +### DOCUMENTATION + +* [`f2d770ac7`](https://github.com/npm/cli/commit/f2d770ac768ea84867772b90a3c9acbdd0c1cb6a) [#569](https://github.com/npm/cli/pull/569) fix netlify publish path config ([@claudiahdz](https://github.com/claudiahdz)) +* [`462cf0983`](https://github.com/npm/cli/commit/462cf0983dbc18a3d93f77212ca69f878060b2ec) [#627](https://github.com/npm/cli/pull/627) update gatsby dependencies ([@felixonmars](https://github.com/felixonmars)) +* [`6fb5dbb72`](https://github.com/npm/cli/commit/6fb5dbb7213c4c050c9a47a7d5131447b8b7dcc8) + [#532](https://github.com/npm/cli/pull/532) docs: clarify usage of global prefix ([@jgehrcke](https://github.com/jgehrcke)) + ## 6.13.4 (2019-12-11) ## BUGFIXES diff --git a/deps/npm/CONTRIBUTING.md b/deps/npm/CONTRIBUTING.md index 3fc4ff5dc7a828..981f0457d5c6bf 100644 --- a/deps/npm/CONTRIBUTING.md +++ b/deps/npm/CONTRIBUTING.md @@ -3,80 +3,190 @@ ## Table of Contents * [Introduction](#introduction) -* [Roles](#roles) - * [Community Members](#community-members) - * [Collaborators](#collaborators) - * [npm, Inc Employees](#npm-inc-employees) - +* [Code Structure](#code-structure) +* [Running Tests](#running-tests) +* [Debugging](#debugging) +* [Coverage](#coverage) +* [Benchmarking](#benchmarking) +* [Types of Contributions](#types-of-contributions) + * [Contributing an Issue?](#contributing-an-issue) + * [Contributing a Question?](#contributing-a-question) + * [Contributing a Bug Fix?](#contributing-a-bug-fix) + * [Contributing a Feature?](#contributing-a-bug-feature) +* [Development Dependencies](#development-dependencies) +* [Dependencies](#dependencies) ## Introduction -Welcome to the npm CLI Contributor Guide! This document outlines the npm CLI repository's process for community interaction and contribution. This includes the issue tracker, pull requests, wiki pages, and, to a certain extent, outside communication in the context of the npm CLI. It defines roles, responsibilities, and procedures, and is an entry point for anyone wishing to contribute their time and effort to making npm a better tool for the JavaScript community! +Welcome to the npm CLI Contributor Guide! This document outlines the npm CLI repository's process for community interaction and contribution. This includes the issue tracker, pull requests, wiki pages, and, to a certain extent, outside communication in the context of the npm CLI. This is an entry point for anyone wishing to contribute their time and effort to making npm a better tool for the JavaScript community! All interactions in the npm repository are covered by the [npm Code of Conduct](https://www.npmjs.com/policies/conduct) -## Roles -There are three main roles for people participating in the npm issue tracker. Each has a specific set of abilities and responsibilities: [Community members](#community-members), [Collaborators](#collaborators), and [npm, Inc employees](#npm-inc-employees). +## Code Structure +``` +/ +├── bin/ +│ │ # Directory for executable files. It's very rare that you +│ │ # will need to update a file in this directory. +│ │ +│ ├── npm # npm-cli entrypoint for bourne shell +│ ├── npm-cli.js # npm-cli entrypoint for node +│ ├── npm.cmd # npm-cli entrypoint for windows +│ ├── npx # npx entrypoint for bourne shell +│ ├── npx-cli.js # npx entrypoint for node +│ └── npx.cmd # npx entrypoint for windows +│ +├── docs/ 📖 +│ │ # Directory that contains the documentation website for +│ │ # the npm-cli. You can run this website locally, and have +│ │ # offline docs! 🔥📖🤓 +│ │ +│ ├── content/ # Markdown files for site content +│ ├── src/ # Source files for the website; gatsby related +│ └── package.json # Site manifest; scripts and dependencies +│ +├── lib/ 📦 +│ # All the Good Bits(tm) of the CLI project live here +│ +├── node_modules/ 🔋 +│ # Vendored dependencies for the CLI project (See the +│ # dependencies section below for more details). +│ +├── scripts/ 📜 +│ # We've created some helper scripts for working with the +│ # CLI project, specifically around managing our vendored +│ # dependencies, merging in pull-requests, and publishing +│ # releases. +│ +├── test/ 🧪 +│ # All the tests for the CLI live in this folder. We've +│ # got a lot of tests 🤓🧪🩺 +│ +├── CONTRIBUTING.md # This file! 🎉 +└── package.json # The projects main manifest file 📃 +``` + +## Running Tests + +``` +# Make sure you install the dependencies first before running tests. +$ npm install + +# Run tests for the CLI (it could take awhile). +$ npm run test +``` + +## Debugging + +It can be tricky to track down issues in the CLI. It's a large code base that has been evolving for over a decade. There is a handy `make` command that will connect the **cloned repository** you have on your machine with the global command, so you can add `console.log` statements or debug any other way you feel most comfortable with. + +``` +# Clone the repository to start with +$ git clone git@github.com:npm/cli.git + +# Change working directories into the repository +$ cd cli + +# Make sure you have the latest code (if that's what you're trying to debug) +$ git fetch origin latest + +# Connect repository to the global namespace +$ make link + +################# +# ALTERNATIVELY +################# +# If ou're working on a feature or bug, you can run the same command on your +# working branch and link that code. + +# Create new branch to work from (there are many ways) +$ git checkout -b feature/awesome-feature + +# Connect repository to global namespace +$ make link +``` + +## Coverage + +We try and make sure that each new feature or bug fix has tests to go along with them in order to keep code coverages consistent and increasing. We are actively striving for 100% code coverage! + +``` +# You can run the following command to find out coverage +$ npm run test-coverage +``` + +## Benchmarking + +We often want to know if the bug we've fixed for the feature we've added has any sort of performance impact. We've created a [benchmark suite](https://github.com/npm/benchmarks) to run against the CLI project from pull-requests. If you would like to know if there are any performance impacts to the work you're contributing, simply do the following: + +1. Make a pull-request against this repository +2. Add the following comment to the pull-request: "`test this please ✅`" + +This will trigger the [benmark suite](https://github.com/npm/benchmarks) to run against your pull-request, and when it's finished running it will post a comment on your pull-request just like bellow. You'll be able to see the results from the suite inline in your pull-request. + +> You'll notice that the bot-user will also add a 🚀 reaction to your comment to +let you know that it's sent the request to start the benchmark suite. + +![image](https://user-images.githubusercontent.com/2818462/72312698-e2e57f80-3656-11ea-9fcf-4a8f6b97b0d1.png) + +If you've updated your pull-reuqest and you'd like to run the the benchmark suite again, simple update your original comment, by adding `test this please ✅` again, or simply just adding another emoji to the **end**. _(The trigger is the phrase "test this please ✅" at the beginning of a comment. Updates will trigger as well, so long as the phrase stays at the beginning.)_. + +![image](https://user-images.githubusercontent.com/2818462/72313006-ec231c00-3657-11ea-9bd9-227634d67362.png) + +## Types of Contributions + +### Contributing an Issue? -Failure to comply with the expected responsibilities of each role, or violating the Code of Conduct will result in punitive action relative to the transgression, ranging from a warning to full removal from the project, at the discretion of npm employees. +Great!! Is your [new issue](https://github.com/npm/cli/issues/new/choose) a [bug](https://github.com/npm/cli/issues/new?template=bug.md&title=%5BBUG%5D+%3Ctitle%3E), a [feature](https://github.com/npm/cli/issues/new?template=feature.md&title=%5BFEATURE%5D+%3Ctitle%3E), or a [question](https://github.com/npm/cli/issues/new?template=question.md&title=%5BQUESTION%5D+%3Ctitle%3E)? -### Community Members +### Contributing a Question? -This includes anyone who may show up to the npm/npm repo with issues, PRs, comments etc. They may not have any other involvement with npm. +Huh? 🤔 Got a situation you're not sure about?! Perfect! We've got some resources you can use. -#### Abilities +* Our [documentation site](https://docs.npmjs.com/) +* The local docs that come with the CLI project -* Open issues and PRs -* Comment on issues and PRs + > **Example**: `npm help install --viewer browser` -#### Responsibilities +* The man pages that are built and shipped with the CLI -* Comment on issues when they have a reference to the answer. -* If community members aren't sure they are correct and don't have a reference to the answer, please leave the issue and try another one. -* Defer to collaborators and npm employees for answers. -* Make sure to search for [the troubleshooting posts on npm.community](https://npm.community/c/support/troubleshooting) and search on the issue tracker for similar issues before opening a new one. -* Any users with urgent support needs are welcome to email support@npmjs.com, and our dedicated support team will be happy to help. + > **Example**: `man npm-install` (only on linux/macOS) -PLEASE don't @ collaborators or npm employees on issues. The CLI team is small, and has many outstanding commitments to fulfill. +* Search of the [current issues](https://github.com/npm/cli/issues) -### Collaborators +### Contributing a Bug Fix? -These are folks who have the ability to label and close issues. The role of collaborators may expand over time, but for now it is a limited (& important) role. This is an excellent way to contribute to npm without writing code. +We'd be happy to triage and help! Head over to the issues and [create a new one](https://github.com/npm/cli/issues/new?template=bug.md&title=%5BBUG%5D+%3Ctitle%3E)! -Community members may become collaborators by showing consistent, proven track record of quality contributions to the project, a reasonable level of proficiency with the CLI, and regular participation through the tracker and other related mediums, including regular contact with the CLI team itself. This role entails a higher level of responsibility than community member, so we ask for a higher level of understanding and commitment. +> We'll need a little bit of information about what happened, rather than "it broke". Such as: +* When did/does this bug happen? +* Can you reproduce it? _(Can you make it happen more than once.)_ +* What version of `node`/`npm` are you running on your computer? +* What did you expect it to do? +* What did it _actually do? +* etc... -Collaborators who become inactive for 3 months or longer may have their collaborator privileges removed until they are ready to return. +### Contributing a Feature? -#### Abilities +Snazzy, we're always up for fancy new things! If the feature is fairly minor, the team can triage it and prioritize it into our backlog. However, if the feature is a little more complex, then it's best to create an [RFC](https://en.wikipedia.org/wiki/Request_for_Comments) in our [RFC repository](https://github.com/npm/rfcs). Exactly how to do that is outlined in that repository. If you're not sure _exactly_ how to implement your idea, or don't want to make a document about your idea, then please create an issue on that repository. We consider these RRFC's, or a "Requesting Request For Comment". -* Label/triage new issues -* Respond to ongoing issues -* Close resolved issues. +## Development Dependencies -#### Responsibilities +You'll need a few things installed in order to update and test the CLI project during development: -* Only answer questions when they know the answer, and provide a reference to the answer. -* If collaborators aren't totally confident about their answer, please leave the issue and try another one. -* If they've responded to an issue, it becomes their responsibility to see it to resolution. -* Defer to fellow Collaborators & npm employees for answers (Again, please don't @ collaborators or npm employees, thank you!) -* Make sure to search [the troubleshooting posts on npm.community](https://npm.community/c/support/troubleshooting) and search the rest of the forum for similar topics. +* [node](https://nodejs.org/) v8 or greater -### npm, Inc Employees +> We recommend that you have a [node version manager](https://github.com/nvm-sh/nvm) installed if you plan on fixing bugs that might be present in a specific version of node. With a version manager you can easily switch versions of node and test if your changes to the CLI project are working. -Folks who work at npm, Inc, who have a responsibility to ensure the stability and functionality of the tools npm offers. +* [git](https://git-scm.com/) v2.11+ -#### Abilities -* Label/triage new issues -* Respond to ongoing issues -* Close resolved issues -* Land PRs +## Dependencies -Please note that this is a living document, and the CLI team will put up PRs to it as needed. +> Package vendoring is commonly referred to as the case where dependent packages are stored in the same place as your project. That usually means you dependencies are checked into your source management system, such as Git. -#### Responsibilities +The CLI project vendors it's dependencies in the `node_modules/` folder. Meaning all the dependencies that the CLI project uses are contained withing the project itself. This is represented by the `bundledDependencies` section in the root level `package.json` file. The main reason for this is because the `npm` CLI project is distributed with the NodeJS runtime and needs to work out of the box, which means all dependencies need to be available after the runtime is installed. -* Preserve and promote the health of the CLI, the registry, the website, etc. +There are a couple scripts created to help manage this process in the `scripts/` folder. -In special cases, [Collaborators](#collaborators) may request time to speak with an npm employee directly, by contacting them and coordinating a time/place. diff --git a/deps/npm/README.md b/deps/npm/README.md index 16c7e4b18cdf00..05da169f259619 100644 --- a/deps/npm/README.md +++ b/deps/npm/README.md @@ -155,10 +155,6 @@ When you find issues, please report them: Be sure to include *all* of the output from the npm command that didn't work as expected. The `npm-debug.log` file is also helpful to provide. -You can also find npm people in `#npm` on https://package.community/ or -[on Twitter](https://twitter.com/npm_support). Whoever responds will no -doubt tell you to put the output in a gist or email. - ## SEE ALSO * npm(1) diff --git a/deps/npm/appveyor.yml b/deps/npm/appveyor.yml deleted file mode 100644 index 7b97e79d626efc..00000000000000 --- a/deps/npm/appveyor.yml +++ /dev/null @@ -1,34 +0,0 @@ -environment: - matrix: - # LTS is our most important target - - nodejs_version: "6" - # previous LTS is next most important - - nodejs_version: "4" - - nodejs_version: "7" - # then master - - nodejs_version: "8" - COVERALLS_REPO_TOKEN: - secure: XdC0aySefK0HLh1GNk6aKrzZPbCfPQLyA4mYtFGEp4DrTuZA/iuCUS0LDqFYO8JQ -platform: - - x86 - - x64 -install: - - ps: Install-Product node $env:nodejs_version $env:platform - - npm config set spin false - - npm rebuild - - node . install -g . - - set "PATH=%APPDATA%\npm;C:\Program Files\Git\mingw64\libexec;%PATH%" - - npm install --loglevel=http -test_script: - - node --version - - npm --version - - npm run test -- --reporter=classic -notifications: -- provider: Slack - incoming_webhook: - secure: vXiG5AgpqxJsXZ0N0CTYDuVrX6RMjBybZKtOx6IbRxCyjgd+DAx6Z9/0XgYQjuof7QFJY3M/U6HxaREQVYbNVHA+C5N5dNALRbKzAC8QNbA= -# GO_FAST -matrix: - fast_finish: true -# we don't need the builds, we just need tests -build: off diff --git a/deps/npm/docs/content/cli-commands/npm-access.md b/deps/npm/docs/content/cli-commands/npm-access.md index 0fbce9c0759d12..f4088fe8855139 100644 --- a/deps/npm/docs/content/cli-commands/npm-access.md +++ b/deps/npm/docs/content/cli-commands/npm-access.md @@ -87,7 +87,7 @@ Management of teams and team memberships is done with the `npm team` command. ### See Also * [`libnpmaccess`](https://npm.im/libnpmaccess) -* [npm team](/cli-commands/npm-team) -* [npm publish](/cli-commands/npm-publish) -* [npm config](/cli-commands/npm-config) +* [npm team](/cli-commands/team) +* [npm publish](/cli-commands/publish) +* [npm config](/cli-commands/config) * [npm registry](/using-npm/registry) diff --git a/deps/npm/docs/content/cli-commands/npm-adduser.md b/deps/npm/docs/content/cli-commands/npm-adduser.md index 2df35e45fc550e..ec61cdd39acbad 100644 --- a/deps/npm/docs/content/cli-commands/npm-adduser.md +++ b/deps/npm/docs/content/cli-commands/npm-adduser.md @@ -89,7 +89,7 @@ username/password entry in legacy npm. ### See Also * [npm registry](/using-npm/registry) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) -* [npm owner](/cli-commands/npm-owner) -* [npm whoami](/cli-commands/npm-whoami) +* [npm owner](/cli-commands/owner) +* [npm whoami](/cli-commands/whoami) diff --git a/deps/npm/docs/content/cli-commands/npm-audit.md b/deps/npm/docs/content/cli-commands/npm-audit.md index 0aba874f96df8d..8b944e94cc12e2 100644 --- a/deps/npm/docs/content/cli-commands/npm-audit.md +++ b/deps/npm/docs/content/cli-commands/npm-audit.md @@ -131,6 +131,6 @@ configuration setting. ### See Also -* [npm install](/cli-commands/npm-install) +* [npm install](/cli-commands/install) * [package-locks](/configuring-npm/package-locks) * [config](/using-npm/config) diff --git a/deps/npm/docs/content/cli-commands/npm-bin.md b/deps/npm/docs/content/cli-commands/npm-bin.md index 6c7ce0eee54e21..eb0912ae48a92a 100644 --- a/deps/npm/docs/content/cli-commands/npm-bin.md +++ b/deps/npm/docs/content/cli-commands/npm-bin.md @@ -19,8 +19,8 @@ Print the folder where npm will install executables. ### See Also -* [npm prefix](/cli-commands/npm-prefix) -* [npm root](/cli-commands/npm-root) +* [npm prefix](/cli-commands/prefix) +* [npm root](/cli-commands/root) * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-bugs.md b/deps/npm/docs/content/cli-commands/npm-bugs.md index dcc9c358df14d8..6e59f2bd1a05e0 100644 --- a/deps/npm/docs/content/cli-commands/npm-bugs.md +++ b/deps/npm/docs/content/cli-commands/npm-bugs.md @@ -41,10 +41,10 @@ The base URL of the npm package registry. ### See Also -* [npm docs](/cli-commands/npm-docs) -* [npm view](/cli-commands/npm-view) -* [npm publish](/cli-commands/npm-publish) +* [npm docs](/cli-commands/docs) +* [npm view](/cli-commands/view) +* [npm publish](/cli-commands/publish) * [npm registry](/using-npm/registry) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) * [package.json](/configuring-npm/package-json) diff --git a/deps/npm/docs/content/cli-commands/npm-build.md b/deps/npm/docs/content/cli-commands/npm-build.md index b657129787663d..eca5397d9c77d5 100644 --- a/deps/npm/docs/content/cli-commands/npm-build.md +++ b/deps/npm/docs/content/cli-commands/npm-build.md @@ -28,7 +28,7 @@ directly, run: ### See Also -* [npm install](/cli-commands/npm-install) -* [npm link](/cli-commands/npm-link) +* [npm install](/cli-commands/install) +* [npm link](/cli-commands/link) * [npm scripts](/using-npm/scripts) * [package.json](/configuring-npm/package-json) diff --git a/deps/npm/docs/content/cli-commands/npm-bundle.md b/deps/npm/docs/content/cli-commands/npm-bundle.md index 76417ac8b0b0c7..c4fdc5e6bb0e64 100644 --- a/deps/npm/docs/content/cli-commands/npm-bundle.md +++ b/deps/npm/docs/content/cli-commands/npm-bundle.md @@ -18,4 +18,4 @@ Just use `npm install` now to do what `npm bundle` used to do. ### See Also -* [npm install](/cli-commands/npm-install) +* [npm install](/cli-commands/install) diff --git a/deps/npm/docs/content/cli-commands/npm-cache.md b/deps/npm/docs/content/cli-commands/npm-cache.md index ed31a320421b0c..4d19749b80f2d9 100644 --- a/deps/npm/docs/content/cli-commands/npm-cache.md +++ b/deps/npm/docs/content/cli-commands/npm-cache.md @@ -82,10 +82,10 @@ The root cache folder. ### See Also * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) -* [npm install](/cli-commands/npm-install) -* [npm publish](/cli-commands/npm-publish) -* [npm pack](/cli-commands/npm-pack) +* [npm install](/cli-commands/install) +* [npm publish](/cli-commands/publish) +* [npm pack](/cli-commands/pack) * https://npm.im/cacache * https://npm.im/pacote diff --git a/deps/npm/docs/content/cli-commands/npm-ci.md b/deps/npm/docs/content/cli-commands/npm-ci.md index 357ba16cf6ade1..b5b6447a485f8f 100644 --- a/deps/npm/docs/content/cli-commands/npm-ci.md +++ b/deps/npm/docs/content/cli-commands/npm-ci.md @@ -45,7 +45,7 @@ cache: ### Description -This command is similar to [`npm install`](/cli-commands/npm-install), except it's meant to be used in +This command is similar to [`npm install`](/cli-commands/install), except it's meant to be used in automated environments such as test platforms, continuous integration, and deployment -- or any situation where you want to make sure you're doing a clean install of your dependencies. It can be significantly faster than a regular npm @@ -63,5 +63,5 @@ In short, the main differences between using `npm install` and `npm ci` are: ### See Also -* [npm install](/cli-commands/npm-install) +* [npm install](/cli-commands/install) * [package-locks](/configuring-npm/package-locks) diff --git a/deps/npm/docs/content/cli-commands/npm-config.md b/deps/npm/docs/content/cli-commands/npm-config.md index c2f2033b066d29..68d403746fc103 100644 --- a/deps/npm/docs/content/cli-commands/npm-config.md +++ b/deps/npm/docs/content/cli-commands/npm-config.md @@ -79,7 +79,7 @@ global config. ### See Also * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [package.json](/configuring-npm/package-json) * [npmrc](/configuring-npm/npmrc) * [npm](/cli-commands/npm) diff --git a/deps/npm/docs/content/cli-commands/npm-dedupe.md b/deps/npm/docs/content/cli-commands/npm-dedupe.md index e15a12ba7c18a3..a146885a044086 100644 --- a/deps/npm/docs/content/cli-commands/npm-dedupe.md +++ b/deps/npm/docs/content/cli-commands/npm-dedupe.md @@ -62,6 +62,6 @@ result in new modules being installed. ### See Also -* [npm ls](/cli-commands/npm-ls) -* [npm update](/cli-commands/npm-update) -* [npm install](/cli-commands/npm-install) +* [npm ls](/cli-commands/ls) +* [npm update](/cli-commands/update) +* [npm install](/cli-commands/install) diff --git a/deps/npm/docs/content/cli-commands/npm-deprecate.md b/deps/npm/docs/content/cli-commands/npm-deprecate.md index d2d9613f653c6c..252c0e70370791 100644 --- a/deps/npm/docs/content/cli-commands/npm-deprecate.md +++ b/deps/npm/docs/content/cli-commands/npm-deprecate.md @@ -32,5 +32,5 @@ format an empty string. ### See Also -* [npm publish](/cli-commands/npm-publish) +* [npm publish](/cli-commands/publish) * [npm registry](/using-npm/registry) diff --git a/deps/npm/docs/content/cli-commands/npm-dist-tag.md b/deps/npm/docs/content/cli-commands/npm-dist-tag.md index c7921c7f739d72..4f7fcb9f58f1ba 100644 --- a/deps/npm/docs/content/cli-commands/npm-dist-tag.md +++ b/deps/npm/docs/content/cli-commands/npm-dist-tag.md @@ -92,9 +92,9 @@ begin with a number or the letter `v`. ### See Also -* [npm publish](/cli-commands/npm-publish) -* [npm install](/cli-commands/npm-install) -* [npm dedupe](/cli-commands/npm-dedupe) +* [npm publish](/cli-commands/publish) +* [npm install](/cli-commands/install) +* [npm dedupe](/cli-commands/dedupe) * [npm registry](/using-npm/registry) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-docs.md b/deps/npm/docs/content/cli-commands/npm-docs.md index 46f5cd0d900a47..f157e200dc514f 100644 --- a/deps/npm/docs/content/cli-commands/npm-docs.md +++ b/deps/npm/docs/content/cli-commands/npm-docs.md @@ -44,9 +44,9 @@ The base URL of the npm package registry. ### See Also -* [npm view](/cli-commands/npm-view) -* [npm publish](/cli-commands/npm-publish) +* [npm view](/cli-commands/view) +* [npm publish](/cli-commands/publish) * [npm registry](/using-npm/registry) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) * [package.json](/configuring-npm/package-json) diff --git a/deps/npm/docs/content/cli-commands/npm-doctor.md b/deps/npm/docs/content/cli-commands/npm-doctor.md index 7cec349e5a8145..60a57ea4765a26 100644 --- a/deps/npm/docs/content/cli-commands/npm-doctor.md +++ b/deps/npm/docs/content/cli-commands/npm-doctor.md @@ -106,6 +106,6 @@ cache, you should probably run `npm cache clean` and reset the cache. ### See Also -* [npm bugs](/cli-commands/npm-bugs) -* [npm help](/cli-commands/npm-help) -* [npm ping](/cli-commands/npm-ping) +* [npm bugs](/cli-commands/bugs) +* [npm help](/cli-commands/help) +* [npm ping](/cli-commands/ping) diff --git a/deps/npm/docs/content/cli-commands/npm-edit.md b/deps/npm/docs/content/cli-commands/npm-edit.md index 94b6a087fa102f..d4b9bbb819b94f 100644 --- a/deps/npm/docs/content/cli-commands/npm-edit.md +++ b/deps/npm/docs/content/cli-commands/npm-edit.md @@ -41,7 +41,7 @@ The command to run for `npm edit` or `npm config edit`. ### See Also * [npm folders](/configuring-npm/folders) -* [npm explore](/cli-commands/npm-explore) -* [npm install](/cli-commands/npm-install) -* [npm config](/cli-commands/npm-config) +* [npm explore](/cli-commands/explore) +* [npm install](/cli-commands/install) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-explore.md b/deps/npm/docs/content/cli-commands/npm-explore.md index 8ded96d40984fe..dfa4d9c0737412 100644 --- a/deps/npm/docs/content/cli-commands/npm-explore.md +++ b/deps/npm/docs/content/cli-commands/npm-explore.md @@ -44,7 +44,7 @@ The shell to run for the `npm explore` command. ### See Also * [npm folders](/configuring-npm/folders) -* [npm edit](/cli-commands/npm-edit) -* [npm rebuild](/cli-commands/npm-rebuild) -* [npm build](/cli-commands/npm-build) -* [npm install](/cli-commands/npm-install) +* [npm edit](/cli-commands/edit) +* [npm rebuild](/cli-commands/rebuild) +* [npm build](/cli-commands/build) +* [npm install](/cli-commands/install) diff --git a/deps/npm/docs/content/cli-commands/npm-fund.md b/deps/npm/docs/content/cli-commands/npm-fund.md index 64894e291fc4f6..73910ff7c07bde 100644 --- a/deps/npm/docs/content/cli-commands/npm-fund.md +++ b/deps/npm/docs/content/cli-commands/npm-fund.md @@ -21,7 +21,8 @@ a given project. If no package name is provided, it will list all dependencies that are looking for funding in a tree-structure in which are listed the type of funding and the url to visit. If a package name is provided then it tries to open its funding url using the `--browser` -config param. +config param; if there are multiple funding sources for the package, the +user will be instructed to pass the `--which` command to disambiguate. The list will avoid duplicated entries and will stack all packages that share the same type/url as a single entry. Given this nature the @@ -38,8 +39,8 @@ The browser that is called by the `npm fund` command to open websites. #### json -* Default: false * Type: Boolean +* Default: false Show information in JSON format. @@ -51,10 +52,17 @@ Show information in JSON format. Whether to represent the tree structure using unicode characters. Set it to `false` in order to use all-ansi output. +#### which + +* Type: Number +* Default: undefined + +If there are multiple funding sources, which 1-indexed source URL to open. + ## See Also -* [npm docs](/cli-commands/npm-docs) -* [npm config](/cli-commands/npm-config) -* [npm install](/cli-commands/npm-install) -* [npm ls](/cli-commands/npm-ls) +* [npm docs](/cli-commands/docs) +* [npm config](/cli-commands/config) +* [npm install](/cli-commands/install) +* [npm ls](/cli-commands/ls) diff --git a/deps/npm/docs/content/cli-commands/npm-help-search.md b/deps/npm/docs/content/cli-commands/npm-help-search.md index 69d005cb160ed7..96781856551383 100644 --- a/deps/npm/docs/content/cli-commands/npm-help-search.md +++ b/deps/npm/docs/content/cli-commands/npm-help-search.md @@ -40,4 +40,4 @@ If false, then help-search will just list out the help topics found. ### See Also * [npm](/cli-commands/npm) -* [npm help](/cli-commands/npm-help) +* [npm help](/cli-commands/help) diff --git a/deps/npm/docs/content/cli-commands/npm-help.md b/deps/npm/docs/content/cli-commands/npm-help.md index c47676ffcac1d3..358010c05ece33 100644 --- a/deps/npm/docs/content/cli-commands/npm-help.md +++ b/deps/npm/docs/content/cli-commands/npm-help.md @@ -38,7 +38,7 @@ Set to `"browser"` to view html help content in the default web browser. * [npm](/cli-commands/npm) * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) * [package.json](/configuring-npm/package-json) -* [npm help-search](/cli-commands/npm-help-search) +* [npm help-search](/cli-commands/help-search) diff --git a/deps/npm/docs/content/cli-commands/npm-init.md b/deps/npm/docs/content/cli-commands/npm-init.md index 73ad74b23ea998..32b7f823019910 100644 --- a/deps/npm/docs/content/cli-commands/npm-init.md +++ b/deps/npm/docs/content/cli-commands/npm-init.md @@ -70,5 +70,5 @@ will create a scoped package. * * [package.json](/configuring-npm/package-json) -* [npm version](/cli-commands/npm-version) +* [npm version](/cli-commands/version) * [npm scope](/using-npm/scope) diff --git a/deps/npm/docs/content/cli-commands/npm-install-ci-test.md b/deps/npm/docs/content/cli-commands/npm-install-ci-test.md index 98e40f4b27a77d..09d738c79fbed5 100644 --- a/deps/npm/docs/content/cli-commands/npm-install-ci-test.md +++ b/deps/npm/docs/content/cli-commands/npm-install-ci-test.md @@ -22,5 +22,5 @@ This command runs an `npm ci` followed immediately by an `npm test`. ### See Also -* [npm ci](/cli-commands/npm-ci) -* [npm test](/cli-commands/npm-test) +* [npm ci](/cli-commands/ci) +* [npm test](/cli-commands/test) diff --git a/deps/npm/docs/content/cli-commands/npm-install-test.md b/deps/npm/docs/content/cli-commands/npm-install-test.md index b86a5199117c4a..58b8844b4fcfff 100644 --- a/deps/npm/docs/content/cli-commands/npm-install-test.md +++ b/deps/npm/docs/content/cli-commands/npm-install-test.md @@ -31,5 +31,5 @@ takes exactly the same arguments as `npm install`. ### See Also -* [npm install](/cli-commands/npm-install) -* [npm test](/cli-commands/npm-test) +* [npm install](/cli-commands/install) +* [npm test](/cli-commands/test) diff --git a/deps/npm/docs/content/cli-commands/npm-install.md b/deps/npm/docs/content/cli-commands/npm-install.md index 8e661bf643f394..be196fa825546b 100644 --- a/deps/npm/docs/content/cli-commands/npm-install.md +++ b/deps/npm/docs/content/cli-commands/npm-install.md @@ -32,7 +32,7 @@ common options: [-P|--save-prod|-D|--save-dev|-O|--save-optional] [-E|--save-exa This command installs a package, and any packages that it depends on. If the package has a package-lock or shrinkwrap file, the installation of dependencies will be driven by that, with an `npm-shrinkwrap.json` taking precedence if both -files exist. See [package-lock.json](/configuring-npm/package-lock-json) and [`npm shrinkwrap`](/cli-commands/npm-shrinkwrap). +files exist. See [package-lock.json](/configuring-npm/package-lock-json) and [`npm shrinkwrap`](/cli-commands/shrinkwrap). A `package` is: @@ -40,7 +40,7 @@ A `package` is: * b) a gzipped tarball containing (a) * c) a url that resolves to (b) * d) a `@` that is published on the registry (see [`registry`](/using-npm/registry)) with (c) -* e) a `@` (see [`npm dist-tag`](/cli-commands/npm-dist-tag)) that points to (d) +* e) a `@` (see [`npm dist-tag`](/cli-commands/dist-tag)) that points to (d) * f) a `` that has a "latest" tag satisfying (e) * g) a `` that resolves to (a) @@ -503,17 +503,17 @@ affects a real use-case, it will be investigated. ### See Also * [npm folders](/configuring-npm/folders) -* [npm update](/cli-commands/npm-update) -* [npm audit](/cli-commands/npm-audit) -* [npm fund](/cli-commands/npm-fund) -* [npm link](/cli-commands/npm-link) -* [npm rebuild](/cli-commands/npm-rebuild) +* [npm update](/cli-commands/update) +* [npm audit](/cli-commands/audit) +* [npm fund](/cli-commands/fund) +* [npm link](/cli-commands/link) +* [npm rebuild](/cli-commands/rebuild) * [npm scripts](/using-npm/scripts) -* [npm build](/cli-commands/npm-build) -* [npm config](/cli-commands/npm-config) +* [npm build](/cli-commands/build) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) * [npm registry](/using-npm/registry) -* [npm dist-tag](/cli-commands/npm-dist-tag) -* [npm uninstall](/cli-commands/npm-uninstall) -* [npm shrinkwrap](/cli-commands/npm-shrinkwrap) +* [npm dist-tag](/cli-commands/dist-tag) +* [npm uninstall](/cli-commands/uninstall) +* [npm shrinkwrap](/cli-commands/shrinkwrap) * [package.json](/configuring-npm/package-json) diff --git a/deps/npm/docs/content/cli-commands/npm-link.md b/deps/npm/docs/content/cli-commands/npm-link.md index 5c417dd143778d..3f513868dfebd6 100644 --- a/deps/npm/docs/content/cli-commands/npm-link.md +++ b/deps/npm/docs/content/cli-commands/npm-link.md @@ -23,8 +23,8 @@ Package linking is a two-step process. First, `npm link` in a package folder will create a symlink in the global folder `{prefix}/lib/node_modules/` that links to the package where the `npm -link` command was executed. (see [`npm-config`](npm-config) for the value of `prefix`). It -will also link any bins in the package to `{prefix}/bin/{name}`. +link` command was executed. It will also link any bins in the package to `{prefix}/bin/{name}`. +Note that `npm link` uses the global prefix (see `npm prefix -g` for its value). Next, in some other location, `npm link package-name` will create a symbolic link from globally-installed `package-name` to `node_modules/` @@ -86,7 +86,7 @@ npm link @myorg/privatepackage * [npm developers](/using-npm/developers) * [package.json](/configuring-npm/package-json) -* [npm- nstall](/cli-commands/npm-install) +* [npm- nstall](/cli-commands/install) * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-logout.md b/deps/npm/docs/content/cli-commands/npm-logout.md index ca7d86f2d1960e..5fb7100e8ef7d0 100644 --- a/deps/npm/docs/content/cli-commands/npm-logout.md +++ b/deps/npm/docs/content/cli-commands/npm-logout.md @@ -48,7 +48,7 @@ npm logout --scope=@myco ### See Also -* [npm adduser](/cli-commands/npm-adduser) +* [npm adduser](/cli-commands/adduser) * [npm registry](/using-npm/registry) -* [npm config](/cli-commands/npm-config) -* [npm whoami](/cli-commands/npm-whoami) +* [npm config](/cli-commands/config) +* [npm whoami](/cli-commands/whoami) diff --git a/deps/npm/docs/content/cli-commands/npm-ls.md b/deps/npm/docs/content/cli-commands/npm-ls.md index 64a399155ff601..797f15a50d8494 100644 --- a/deps/npm/docs/content/cli-commands/npm-ls.md +++ b/deps/npm/docs/content/cli-commands/npm-ls.md @@ -119,11 +119,11 @@ Set it to false in order to use all-ansi output. ### See Also -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) * [npm folders](/configuring-npm/folders) -* [npm install](/cli-commands/npm-install) -* [npm link](/cli-commands/npm-link) -* [npm prune](/cli-commands/npm-prune) -* [npm outdated](/cli-commands/npm-outdated) -* [npm update](/cli-commands/npm-update) +* [npm install](/cli-commands/install) +* [npm link](/cli-commands/link) +* [npm prune](/cli-commands/prune) +* [npm outdated](/cli-commands/outdated) +* [npm update](/cli-commands/update) diff --git a/deps/npm/docs/content/cli-commands/npm-outdated.md b/deps/npm/docs/content/cli-commands/npm-outdated.md index c7934109dca370..3dae28c465f4e6 100644 --- a/deps/npm/docs/content/cli-commands/npm-outdated.md +++ b/deps/npm/docs/content/cli-commands/npm-outdated.md @@ -118,7 +118,7 @@ Max depth for checking dependency tree. ### See Also -* [npm update](/cli-commands/npm-update) -* [npm dist-tag](/cli-commands/npm-dist-tag) +* [npm update](/cli-commands/update) +* [npm dist-tag](/cli-commands/dist-tag) * [npm registry](/using-npm/registry) * [npm folders](/configuring-npm/folders) diff --git a/deps/npm/docs/content/cli-commands/npm-owner.md b/deps/npm/docs/content/cli-commands/npm-owner.md index bc2fbc82fb280e..7088cdaf5cb396 100644 --- a/deps/npm/docs/content/cli-commands/npm-owner.md +++ b/deps/npm/docs/content/cli-commands/npm-owner.md @@ -41,7 +41,7 @@ with `--otp`. ### See Also -* [npm publish](/cli-commands/npm-publish) +* [npm publish](/cli-commands/publish) * [npm registry](/using-npm/registry) -* [npm adduser](/cli-commands/npm-adduser) +* [npm adduser](/cli-commands/adduser) * [npm disputes](/using-npm/disputes) diff --git a/deps/npm/docs/content/cli-commands/npm-pack.md b/deps/npm/docs/content/cli-commands/npm-pack.md index acf18559c14e00..d4774ff3716710 100644 --- a/deps/npm/docs/content/cli-commands/npm-pack.md +++ b/deps/npm/docs/content/cli-commands/npm-pack.md @@ -32,7 +32,7 @@ actually packing anything. Reports on what would have gone into the tarball. ### See Also -* [npm cache](/cli-commands/npm-cache) -* [npm publish](/cli-commands/npm-publish) -* [npm config](/cli-commands/npm-config) +* [npm cache](/cli-commands/cache) +* [npm publish](/cli-commands/publish) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-ping.md b/deps/npm/docs/content/cli-commands/npm-ping.md index 93d18b57f840b0..8f765501ac9f33 100644 --- a/deps/npm/docs/content/cli-commands/npm-ping.md +++ b/deps/npm/docs/content/cli-commands/npm-ping.md @@ -29,5 +29,5 @@ Ping error: {*Detail about error} ### See Also -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-prefix.md b/deps/npm/docs/content/cli-commands/npm-prefix.md index b82fec663a147d..c6b1f7441bcd65 100644 --- a/deps/npm/docs/content/cli-commands/npm-prefix.md +++ b/deps/npm/docs/content/cli-commands/npm-prefix.md @@ -21,12 +21,12 @@ to contain a `package.json` file or `node_modules` directory, unless `-g` is also specified. If `-g` is specified, this will be the value of the global prefix. See -[`npm config`](/cli-commands/npm-config) for more detail. +[`npm config`](/cli-commands/config) for more detail. ### See Also -* [npm root](/cli-commands/npm-root) -* [npm bin](/cli-commands/npm-bin) +* [npm root](/cli-commands/root) +* [npm bin](/cli-commands/bin) * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-profile.md b/deps/npm/docs/content/cli-commands/npm-profile.md index 9fe82cd2d3a952..7cc38e2c9c3fe3 100644 --- a/deps/npm/docs/content/cli-commands/npm-profile.md +++ b/deps/npm/docs/content/cli-commands/npm-profile.md @@ -79,4 +79,4 @@ available on non npmjs.com registries. ### See Also -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) diff --git a/deps/npm/docs/content/cli-commands/npm-prune.md b/deps/npm/docs/content/cli-commands/npm-prune.md index c6b61e62f828a2..586c2e7024642b 100644 --- a/deps/npm/docs/content/cli-commands/npm-prune.md +++ b/deps/npm/docs/content/cli-commands/npm-prune.md @@ -41,6 +41,6 @@ and it's up to you to run `npm prune` from time-to-time to remove them. ### See Also -* [npm uninstall](/cli-commands/npm-uninstall) +* [npm uninstall](/cli-commands/uninstall) * [npm folders](/configuring-npm/folders) -* [npm ls](/cli-commands/npm-ls) +* [npm ls](/cli-commands/ls) diff --git a/deps/npm/docs/content/cli-commands/npm-publish.md b/deps/npm/docs/content/cli-commands/npm-publish.md index b9d0cf1449e760..199377fa0df32d 100644 --- a/deps/npm/docs/content/cli-commands/npm-publish.md +++ b/deps/npm/docs/content/cli-commands/npm-publish.md @@ -60,22 +60,22 @@ the specified registry. Once a package is published with a given name and version, that specific name and version combination can never be used again, even if -it is removed with [`npm unpublish`](/cli-commands/npm-unpublish). +it is removed with [`npm unpublish`](/cli-commands/unpublish). As of `npm@5`, both a sha1sum and an integrity field with a sha512sum of the tarball will be submitted to the registry during publication. Subsequent installs will use the strongest supported algorithm to verify downloads. -Similar to `--dry-run` see [`npm pack`](/cli-commands/npm-pack), which figures out the files to be +Similar to `--dry-run` see [`npm pack`](/cli-commands/pack), which figures out the files to be included and packs them into a tarball to be uploaded to the registry. ### See Also * [npm registry](/using-npm/registry) * [npm scope](/using-npm/scope) -* [npm adduser](/cli-commands/npm-adduser) -* [npm owner](/cli-commands/npm-owner) -* [npm deprecate](/cli-commands/npm-deprecate) -* [npm dist-tag](/cli-commands/npm-dist-tag) -* [npm pack](/cli-commands/npm-pack) -* [npm profile](/cli-commands/npm-profile) +* [npm adduser](/cli-commands/adduser) +* [npm owner](/cli-commands/owner) +* [npm deprecate](/cli-commands/deprecate) +* [npm dist-tag](/cli-commands/dist-tag) +* [npm pack](/cli-commands/pack) +* [npm profile](/cli-commands/profile) diff --git a/deps/npm/docs/content/cli-commands/npm-rebuild.md b/deps/npm/docs/content/cli-commands/npm-rebuild.md index 414b9ca55a1932..9503d6aae84263 100644 --- a/deps/npm/docs/content/cli-commands/npm-rebuild.md +++ b/deps/npm/docs/content/cli-commands/npm-rebuild.md @@ -22,5 +22,5 @@ This command runs the `npm build` command on the matched folders. This is usefu ### See Also -* [npm build](/cli-commands/npm-build) -* [npm install](/cli-commands/npm-install) +* [npm build](/cli-commands/build) +* [npm install](/cli-commands/install) diff --git a/deps/npm/docs/content/cli-commands/npm-repo.md b/deps/npm/docs/content/cli-commands/npm-repo.md index ad41ea571253fd..48021d9af5d912 100644 --- a/deps/npm/docs/content/cli-commands/npm-repo.md +++ b/deps/npm/docs/content/cli-commands/npm-repo.md @@ -32,5 +32,5 @@ The browser that is called by the `npm repo` command to open websites. ### See Also -* [npm docs](/cli-commands/npm-docs) -* [npm config](/cli-commands/npm-config) +* [npm docs](/cli-commands/docs) +* [npm config](/cli-commands/config) diff --git a/deps/npm/docs/content/cli-commands/npm-restart.md b/deps/npm/docs/content/cli-commands/npm-restart.md index d6d388b224ab1f..663b8f45066084 100644 --- a/deps/npm/docs/content/cli-commands/npm-restart.md +++ b/deps/npm/docs/content/cli-commands/npm-restart.md @@ -41,9 +41,9 @@ behavior will be accompanied by an increase in major version number ### See Also -* [npm run-script](/cli-commands/npm-run-script) +* [npm run-script](/cli-commands/run-script) * [npm scripts](/using-npm/scripts) -* [npm test](/cli-commands/npm-test) -* [npm start](/cli-commands/npm-start) -* [npm stop](/cli-commands/npm-stop) -* [npm restart](/cli-commands/npm-restart) \ No newline at end of file +* [npm test](/cli-commands/test) +* [npm start](/cli-commands/start) +* [npm stop](/cli-commands/stop) +* [npm restart](/cli-commands/restart) \ No newline at end of file diff --git a/deps/npm/docs/content/cli-commands/npm-root.md b/deps/npm/docs/content/cli-commands/npm-root.md index 2b27878af4c6dc..fce4490de78eac 100644 --- a/deps/npm/docs/content/cli-commands/npm-root.md +++ b/deps/npm/docs/content/cli-commands/npm-root.md @@ -19,8 +19,8 @@ Print the effective `node_modules` folder to standard out. ### See Also -* [npm prefix](/cli-commands/npm-prefix) -* [npm bin](/cli-commands/npm-bin) +* [npm prefix](/cli-commands/prefix) +* [npm bin](/cli-commands/bin) * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-run-script.md b/deps/npm/docs/content/cli-commands/npm-run-script.md index 51def74c3c4c33..1ee381e00f2f1e 100644 --- a/deps/npm/docs/content/cli-commands/npm-run-script.md +++ b/deps/npm/docs/content/cli-commands/npm-run-script.md @@ -90,8 +90,8 @@ without breaking the execution chain. ### See Also * [npm scripts](/using-npm/scripts) -* [npm test](/cli-commands/npm-test) -* [npm start](/cli-commands/npm-start) -* [npm restart](/cli-commands/npm-restart) -* [npm stop](/cli-commands/npm-stop) -* [npm config](/cli-commands/npm-config) +* [npm test](/cli-commands/test) +* [npm start](/cli-commands/start) +* [npm restart](/cli-commands/restart) +* [npm stop](/cli-commands/stop) +* [npm config](/cli-commands/config) diff --git a/deps/npm/docs/content/cli-commands/npm-search.md b/deps/npm/docs/content/cli-commands/npm-search.md index e066106faf71f4..c65e489cba27c8 100644 --- a/deps/npm/docs/content/cli-commands/npm-search.md +++ b/deps/npm/docs/content/cli-commands/npm-search.md @@ -109,6 +109,6 @@ setting. ### See Also * [npm registry](/using-npm/registry) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) -* [npm view](/cli-commands/npm-view) +* [npm view](/cli-commands/view) diff --git a/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md b/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md index 342fb001675ab3..a22aed88e125fe 100644 --- a/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md +++ b/deps/npm/docs/content/cli-commands/npm-shrinkwrap.md @@ -24,11 +24,11 @@ of package locks in npm, see [package-locks](/configuring-npm/package-locks). ### See Also -* [npm install](/cli-commands/npm-install) -* [npm run-script](/cli-commands/npm-run-script) +* [npm install](/cli-commands/install) +* [npm run-script](/cli-commands/run-script) * [npm scripts](/using-npm/scripts) * [package.js](/configuring-npm/package-json) * [package-locks](/configuring-npm/package-locks) * [package-lock.json](/configuring-npm/package-lock-json) * [shrinkwrap.json](/configuring-npm/shrinkwrap-json) -* [npm ls](/cli-commands/npm-ls) +* [npm ls](/cli-commands/ls) diff --git a/deps/npm/docs/content/cli-commands/npm-star.md b/deps/npm/docs/content/cli-commands/npm-star.md index 1912e9c654bc28..440d15d05c652e 100644 --- a/deps/npm/docs/content/cli-commands/npm-star.md +++ b/deps/npm/docs/content/cli-commands/npm-star.md @@ -26,6 +26,6 @@ It's a boolean thing. Starring repeatedly has no additional effect. ### See Also -* [npm view](/cli-commands/npm-view) -* [npm whoami](/cli-commands/npm-whoami) -* [npm adduser](/cli-commands/npm-adduser) +* [npm view](/cli-commands/view) +* [npm whoami](/cli-commands/whoami) +* [npm adduser](/cli-commands/adduser) diff --git a/deps/npm/docs/content/cli-commands/npm-stars.md b/deps/npm/docs/content/cli-commands/npm-stars.md index 475547bb4b7f2f..87b1664ef8595d 100644 --- a/deps/npm/docs/content/cli-commands/npm-stars.md +++ b/deps/npm/docs/content/cli-commands/npm-stars.md @@ -23,7 +23,7 @@ you will most certainly enjoy this command. ### See Also -* [npm star](/cli-commands/npm-star) -* [npm view](/cli-commands/npm-view) -* [npm whoami](/cli-commands/npm-whoami) -* [npm adduser](/cli-commands/npm-adduser) +* [npm star](/cli-commands/star) +* [npm view](/cli-commands/view) +* [npm whoami](/cli-commands/whoami) +* [npm adduser](/cli-commands/adduser) diff --git a/deps/npm/docs/content/cli-commands/npm-start.md b/deps/npm/docs/content/cli-commands/npm-start.md index 839528257b6d95..70221c9926a5d8 100644 --- a/deps/npm/docs/content/cli-commands/npm-start.md +++ b/deps/npm/docs/content/cli-commands/npm-start.md @@ -21,12 +21,12 @@ its `"scripts"` object. If no `"start"` property is specified on the `"scripts"` object, it will run `node server.js`. As of [`npm@2.0.0`](https://blog.npmjs.org/post/98131109725/npm-2-0-0), you can -use custom arguments when executing scripts. Refer to [`npm run-script`](/cli-commands/npm-run-script) for more details. +use custom arguments when executing scripts. Refer to [`npm run-script`](/cli-commands/run-script) for more details. ### See Also -* [npm run-script](/cli-commands/npm-run-script) +* [npm run-script](/cli-commands/run-script) * [npm scripts](/using-npm/scripts) -* [npm test](/cli-commands/npm-test) -* [npm restart](/cli-commands/npm-restart) -* [npm stop](/cli-commands/npm-stop) +* [npm test](/cli-commands/test) +* [npm restart](/cli-commands/restart) +* [npm stop](/cli-commands/stop) diff --git a/deps/npm/docs/content/cli-commands/npm-stop.md b/deps/npm/docs/content/cli-commands/npm-stop.md index da759047cb19a5..889f04ec41e3e2 100644 --- a/deps/npm/docs/content/cli-commands/npm-stop.md +++ b/deps/npm/docs/content/cli-commands/npm-stop.md @@ -20,8 +20,8 @@ This runs a package's "stop" script, if one was provided. ### See Also -* [npm run-script](/cli-commands/npm-run-script) +* [npm run-script](/cli-commands/run-script) * [npm scripts](/using-npm/scripts) -* [npm test](/cli-commands/npm-test) -* [npm start](/cli-commands/npm-start) -* [npm restart](/cli-commands/npm-restart) +* [npm test](/cli-commands/test) +* [npm start](/cli-commands/start) +* [npm restart](/cli-commands/restart) diff --git a/deps/npm/docs/content/cli-commands/npm-team.md b/deps/npm/docs/content/cli-commands/npm-team.md index 9a63b10c26f325..53e084d47d14a3 100644 --- a/deps/npm/docs/content/cli-commands/npm-team.md +++ b/deps/npm/docs/content/cli-commands/npm-team.md @@ -30,6 +30,8 @@ handle permissions for packages. Teams must always be fully qualified with the organization/scope they belong to when operating on them, separated by a colon (`:`). That is, if you have a `wombats` team in a `wisdom` organization, you must always refer to that team as `wisdom:wombats` in these commands. +If you have two-factor authentication enabled in `auth-and-writes` mode, then you can provide a code from your authenticator with `[--otp ]`. If you don't include this then you will be prompted. + * create / destroy: Create a new team, or destroy an existing one. Note: You cannot remove the `developers` team, learn more. * add / rm: @@ -60,5 +62,5 @@ use the `npm access` command to grant or revoke the appropriate permissions. ### See Also -* [npm access](/cli-commands/npm-access) +* [npm access](/cli-commands/access) * [npm registry](/using-npm/registry) diff --git a/deps/npm/docs/content/cli-commands/npm-test.md b/deps/npm/docs/content/cli-commands/npm-test.md index 99c027e3e057af..11900fd2fbf5e1 100644 --- a/deps/npm/docs/content/cli-commands/npm-test.md +++ b/deps/npm/docs/content/cli-commands/npm-test.md @@ -22,8 +22,8 @@ This runs a package's "test" script, if one was provided. ### See Also -* [npm run-script](/cli-commands/npm-run-script) +* [npm run-script](/cli-commands/run-script) * [npm scripts](/using-npm/scripts) -* [npm start](/cli-commands/npm-start) -* [npm restart](/cli-commands/npm-restart) -* [npm stop](/cli-commands/npm-stop) +* [npm start](/cli-commands/start) +* [npm restart](/cli-commands/restart) +* [npm stop](/cli-commands/stop) diff --git a/deps/npm/docs/content/cli-commands/npm-uninstall.md b/deps/npm/docs/content/cli-commands/npm-uninstall.md index 96fdc4ebe05ba9..2b994ba6180b65 100644 --- a/deps/npm/docs/content/cli-commands/npm-uninstall.md +++ b/deps/npm/docs/content/cli-commands/npm-uninstall.md @@ -57,8 +57,8 @@ npm uninstall lodash --no-save ### See Also -* [npm prune](/cli-commands/npm-prune) -* [npm install](/cli-commands/npm-install) +* [npm prune](/cli-commands/prune) +* [npm install](/cli-commands/install) * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) diff --git a/deps/npm/docs/content/cli-commands/npm-unpublish.md b/deps/npm/docs/content/cli-commands/npm-unpublish.md index 5348023d9a8400..9b918ed432c306 100644 --- a/deps/npm/docs/content/cli-commands/npm-unpublish.md +++ b/deps/npm/docs/content/cli-commands/npm-unpublish.md @@ -10,19 +10,21 @@ description: Remove a package from the registry ### Synopsis +#### Unpublishing a single version of a package + ```bash -npm unpublish [<@scope>/][@] +npm unpublish [<@scope>/]@ ``` -### Warning +#### Unpublishing an entire package -**It is generally considered bad behavior to remove versions of a library -that others are depending on!** +```bash +npm unpublish [<@scope>/] --force +``` -Consider using the `deprecate` command -instead, if your intent is to encourage users to upgrade. +### Warning -There is plenty of room on the registry. +Consider using the `deprecate` command instead, if your intent is to encourage users to upgrade, or if you no longer want to maintain a package. ### Description @@ -34,21 +36,15 @@ the root package entry is removed from the registry entirely. Even if a package version is unpublished, that specific name and version combination can never be reused. In order to publish the -package again, a new version number must be used. Additionally, -new versions of packages with every version unpublished may not -be republished until 24 hours have passed. +package again, a new version number must be used. If you unpublish the entire package, you may not publish any new versions of that package until 24 hours have passed. -With the default registry (`registry.npmjs.org`), unpublish is -only allowed with versions published in the last 72 hours. If you -are trying to unpublish a version published longer ago than that, -contact support@npmjs.com. +To learn more about how unpublish is treated on the npm registry, see our unpublish policies. -The scope is optional and follows the usual rules for [`scope`](/using-npm/scope). ### See Also -* [npm deprecate](/cli-commands/npm-deprecate) -* [npm publish](/cli-commands/npm-publish) +* [npm deprecate](/cli-commands/deprecate) +* [npm publish](/cli-commands/publish) * [npm registry](/using-npm/registry) -* [npm adduser](/cli-commands/npm-adduser) -* [npm owner](/cli-commands/npm-owner) +* [npm adduser](/cli-commands/adduser) +* [npm owner](/cli-commands/owner) diff --git a/deps/npm/docs/content/cli-commands/npm-update.md b/deps/npm/docs/content/cli-commands/npm-update.md index f2e93b6dc33df1..706d8acf208f91 100644 --- a/deps/npm/docs/content/cli-commands/npm-update.md +++ b/deps/npm/docs/content/cli-commands/npm-update.md @@ -122,7 +122,9 @@ version that satisfies `^0.4.0` (`>= 0.4.0 <0.5.0`) `npm update -g` will apply the `update` action to each globally installed package that is `outdated` -- that is, has a version that is different from -`latest`. +`wanted`. + +Note: Globally installed packages are treated as if they are installed with a caret semver range specified. So if you require to update to `latest` you may need to run `npm install -g [...]` NOTE: If a package has been upgraded to a version newer than `latest`, it will be _downgraded_. @@ -130,9 +132,9 @@ be _downgraded_. ### See Also -* [npm install](/cli-commands/npm-install) -* [npm outdated](/cli-commands/npm-outdated) -* [npm shrinkwrap](/cli-commands/npm-shrinkwrap) +* [npm install](/cli-commands/install) +* [npm outdated](/cli-commands/outdated) +* [npm shrinkwrap](/cli-commands/shrinkwrap) * [npm registry](/using-npm/registry) * [npm folders](/configuring-npm/folders) -* [npm ls](/cli-commands/npm-ls) +* [npm ls](/cli-commands/ls) diff --git a/deps/npm/docs/content/cli-commands/npm-version.md b/deps/npm/docs/content/cli-commands/npm-version.md index a47e9e33326acf..05a2ea4c8d8097 100644 --- a/deps/npm/docs/content/cli-commands/npm-version.md +++ b/deps/npm/docs/content/cli-commands/npm-version.md @@ -126,8 +126,8 @@ Note that you must have a default GPG key set up in your git config for this to ### See Also -* [npm init](/cli-commands/npm-init) -* [npm run-script](/cli-commands/npm-run-script) +* [npm init](/cli-commands/init) +* [npm run-script](/cli-commands/run-script) * [npm scripts](/using-npm/scripts) * [package.json](/configuring-npm/package-json) * [semver](/using-npm/semver) diff --git a/deps/npm/docs/content/cli-commands/npm-view.md b/deps/npm/docs/content/cli-commands/npm-view.md index 0c108e6f566154..b4c68471f5a7dc 100644 --- a/deps/npm/docs/content/cli-commands/npm-view.md +++ b/deps/npm/docs/content/cli-commands/npm-view.md @@ -117,8 +117,8 @@ the field name. ### See Also -* [npm search](/cli-commands/npm-search) +* [npm search](/cli-commands/search) * [npm registry](/using-npm/registry) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) -* [npm docs](/cli-commands/npm-docs) +* [npm docs](/cli-commands/docs) diff --git a/deps/npm/docs/content/cli-commands/npm-whoami.md b/deps/npm/docs/content/cli-commands/npm-whoami.md index b0eda4e46aa61b..d82f1f89732def 100644 --- a/deps/npm/docs/content/cli-commands/npm-whoami.md +++ b/deps/npm/docs/content/cli-commands/npm-whoami.md @@ -19,6 +19,6 @@ Print the `username` config to standard output. ### See Also -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) -* [npm adduser](/cli-commands/npm-adduser) +* [npm adduser](/cli-commands/adduser) diff --git a/deps/npm/docs/content/configuring-npm/folders.md b/deps/npm/docs/content/configuring-npm/folders.md index 96a8f4783d719b..abb6133fd1702f 100644 --- a/deps/npm/docs/content/configuring-npm/folders.md +++ b/deps/npm/docs/content/configuring-npm/folders.md @@ -73,7 +73,7 @@ Man pages are not installed on Windows systems. #### Cache -See [`npm cache`](/cli-commands/npm-cache). Cache files are stored in `~/.npm` on Posix, or +See [`npm cache`](/cli-commands/cache). Cache files are stored in `~/.npm` on Posix, or `%AppData%/npm-cache` on Windows. This is controlled by the `cache` configuration param. @@ -214,10 +214,10 @@ cannot be found elsewhere. See [`package.json`](/configuring-npm/package.json) ### See also * [package.json](/configuring-npm/package-json) -* [npm install](/cli-commands/npm-install) -* [npm pack](/cli-commands/npm-pack) -* [npm cache](/cli-commands/npm-cache) -* [npm config](/cli-commands/npm-config) +* [npm install](/cli-commands/install) +* [npm pack](/cli-commands/pack) +* [npm cache](/cli-commands/cache) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) * [config](/using-npm/config) -* [npm publish](/cli-commands/npm-publish) +* [npm publish](/cli-commands/publish) diff --git a/deps/npm/docs/content/configuring-npm/npmrc.md b/deps/npm/docs/content/configuring-npm/npmrc.md index 090ed5944fcce5..3439c0a8bfcf8b 100644 --- a/deps/npm/docs/content/configuring-npm/npmrc.md +++ b/deps/npm/docs/content/configuring-npm/npmrc.md @@ -97,7 +97,7 @@ manner. ### See also * [npm folders](/configuring-npm/folders) -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [config](/using-npm/config) * [package.json](/configuring-npm/package-json) * [npm](/cli-commands/npm) diff --git a/deps/npm/docs/content/configuring-npm/package-json.md b/deps/npm/docs/content/configuring-npm/package-json.md index b7759f482f914a..6d9cae346b1944 100644 --- a/deps/npm/docs/content/configuring-npm/package-json.md +++ b/deps/npm/docs/content/configuring-npm/package-json.md @@ -197,7 +197,8 @@ npm also sets a top-level "maintainers" field with your npm user info. ### funding You can specify an object containing an URL that provides up-to-date -information about ways to help fund development of your package: +information about ways to help fund development of your package, or +a string URL, or an array of these: "funding": { "type" : "individual", @@ -209,10 +210,26 @@ information about ways to help fund development of your package: "url" : "https://www.patreon.com/my-account" } + "funding": "http://example.com/donate" + + "funding": [ + { + "type" : "individual", + "url" : "http://example.com/donate" + }, + "http://example.com/donateAlso", + { + "type" : "patreon", + "url" : "https://www.patreon.com/my-account" + } + ] + + Users can use the `npm fund` subcommand to list the `funding` URLs of all dependencies of their project, direct and indirect. A shortcut to visit each funding url is also available when providing the project name such as: -`npm fund `. +`npm fund ` (when there are multiple URLs, the first one will be +visited) ### files @@ -516,7 +533,7 @@ See [semver](/using-npm/semver) for more details about specifying version ranges * `range1 || range2` Passes if either range1 or range2 are satisfied. * `git...` See 'Git URLs as Dependencies' below * `user/repo` See 'GitHub URLs' below -* `tag` A specific version tagged and published as `tag` See [`npm dist-tag`](/cli-commands/npm-dist-tag) +* `tag` A specific version tagged and published as `tag` See [`npm dist-tag`](/cli-commands/dist-tag) * `path/path/path` See [Local Paths](#local-paths) below For example, these are all valid: @@ -740,7 +757,8 @@ If a dependency can be used, but you would like npm to proceed if it cannot be found or fails to install, then you may put it in the `optionalDependencies` object. This is a map of package name to version or url, just like the `dependencies` object. The difference is that build failures do not cause -installation to fail. +installation to fail. Running `npm install --no-optional` will prevent these +dependencies from being installed. It is still your program's responsibility to handle the lack of the dependency. For example, something like this: @@ -892,10 +910,10 @@ npm will default some values based on package contents. ### SEE ALSO * [semver](/using-npm/semver) -* [npm init](/cli-commands/npm-init) -* [npm version](/cli-commands/npm-version) -* [npm config](/cli-commands/npm-config) -* [npm help](/cli-commands/npm-help) -* [npm install](/cli-commands/npm-install) -* [npm publish](/cli-commands/npm-publish) -* [npm uninstall](/cli-commands/npm-uninstall) +* [npm init](/cli-commands/init) +* [npm version](/cli-commands/version) +* [npm config](/cli-commands/config) +* [npm help](/cli-commands/help) +* [npm install](/cli-commands/install) +* [npm publish](/cli-commands/publish) +* [npm uninstall](/cli-commands/uninstall) diff --git a/deps/npm/docs/content/configuring-npm/package-lock-json.md b/deps/npm/docs/content/configuring-npm/package-lock-json.md index 9f3ca4683defe7..0ab0aaa4ce247e 100644 --- a/deps/npm/docs/content/configuring-npm/package-lock-json.md +++ b/deps/npm/docs/content/configuring-npm/package-lock-json.md @@ -142,8 +142,8 @@ The dependencies of this dependency, exactly as at the top level. ### See also -* [npm shrinkwrap](/cli-commands/npm-shrinkwrap) +* [npm shrinkwrap](/cli-commands/shrinkwrap) * [shrinkwrap.json](/configuring-npm/shrinkwrap-json) * [package-locks](/configuring-npm/package-locks) * [package.json](/configuring-npm/package-json) -* [npm install](/cli-commands/npm-install) +* [npm install](/cli-commands/install) diff --git a/deps/npm/docs/content/configuring-npm/package-locks.md b/deps/npm/docs/content/configuring-npm/package-locks.md index de65e3c634f077..81d21298ae84dd 100644 --- a/deps/npm/docs/content/configuring-npm/package-locks.md +++ b/deps/npm/docs/content/configuring-npm/package-locks.md @@ -10,7 +10,7 @@ description: An explanation of npm lockfiles ### Description -Conceptually, the "input" to [`npm install`](/cli-commands/npm-install) is a [package.json](/configuring-npm/package-json), while its +Conceptually, the "input" to [`npm install`](/cli-commands/install) is a [package.json](/configuring-npm/package-json), while its "output" is a fully-formed `node_modules` tree: a representation of the dependencies you declared. In an ideal world, npm would work like a pure function: the same `package.json` should produce the exact same `node_modules` @@ -179,4 +179,4 @@ pre-`npm@5.7.0` versions of npm 5, albeit a bit more noisily. Note that if * [package.json](/configuring-npm/package-json) * [package-lock.json](/configuring-npm/package-lock-json) * [shrinkwrap.json](/configuring-npm/shrinkwrap-json) -* [npm shrinkwrap](/cli-commands/npm-shrinkwrap) +* [npm shrinkwrap](/cli-commands/shrinkwrap) diff --git a/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md b/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md index bc5e061d55b095..fcb32952f93776 100644 --- a/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md +++ b/deps/npm/docs/content/configuring-npm/shrinkwrap-json.md @@ -10,7 +10,7 @@ description: A publishable lockfile ### Description -`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/cli-commands/npm-shrinkwrap). It is identical to +`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/cli-commands/shrinkwrap). It is identical to `package-lock.json`, with one major caveat: Unlike `package-lock.json`, `npm-shrinkwrap.json` may be included when publishing a package. @@ -28,7 +28,7 @@ to the manual page for [package-lock.json](/configuring-npm/package-lock-json). ### See also -* [npm shrinkwrap](/cli-commands/npm-shrinkwrap) +* [npm shrinkwrap](/cli-commands/shrinkwrap) * [package-lock.json](/configuring-npm/package-lock-json) * [package.json](/configuring-npm/package-json) -* [npm install](/cli-commands/npm-install) +* [npm install](/cli-commands/install) diff --git a/deps/npm/docs/content/using-npm/config.md b/deps/npm/docs/content/using-npm/config.md index a6947b17d58d15..fcf116d7f1ff66 100644 --- a/deps/npm/docs/content/using-npm/config.md +++ b/deps/npm/docs/content/using-npm/config.md @@ -179,7 +179,7 @@ When "dev" or "development" and running local `npm shrinkwrap`, When "true" submit audit reports alongside `npm install` runs to the default registry and all registries configured for scopes. See the documentation -for [`npm audit`](/cli-commands/npm-audit) for details on what is submitted. +for [`npm audit`](/cli-commands/audit) for details on what is submitted. #### audit-level @@ -270,7 +270,7 @@ well as for the CA information to be stored in a file on disk. * Default: Windows: `%AppData%\npm-cache`, Posix: `~/.npm` * Type: path -The location of npm's cache directory. See [`npm cache`](/cli-commands/npm-cache) +The location of npm's cache directory. See [`npm cache`](/cli-commands/cache) #### cache-lock-stale @@ -456,7 +456,7 @@ packages. When "true" displays the message at the end of each `npm install` aknowledging the number of dependencies looking for funding. -See [`npm fund`](/cli-commands/npm-fund) for details. +See [`npm fund`](/cli-commands/fund) for details. #### git @@ -571,7 +571,7 @@ If true, npm does not run scripts specified in package.json files. A module that will be loaded by the `npm init` command. See the documentation for the [init-package-json](https://github.com/isaacs/init-package-json) module -for more information, or [npm init](/cli-commands/npm-init). +for more information, or [npm init](/cli-commands/init). #### init-author-name @@ -1228,7 +1228,7 @@ version of npm than the latest. * Type: Boolean Set to show short usage output (like the -H output) -instead of complete help when doing [`npm help`](/cli-commands/npm-help). +instead of complete help when doing [`npm help`](/cli-commands/help). #### user @@ -1293,7 +1293,7 @@ Set to `"browser"` to view html help content in the default web browser. ### See also -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [npmrc](/configuring-npm/npmrc) * [npm scripts](/using-npm/scripts) * [npm folders](/configuring-npm/folders) diff --git a/deps/npm/docs/content/using-npm/disputes.md b/deps/npm/docs/content/using-npm/disputes.md index 65751618cab8ae..37a724e6b0f1c2 100644 --- a/deps/npm/docs/content/using-npm/disputes.md +++ b/deps/npm/docs/content/using-npm/disputes.md @@ -105,7 +105,7 @@ If you see bad behavior like this, please report it to right away. **You are never expected to resolve abusive behavior on your own. We are here to help.** -### Trademarkss +### Trademarks If you think another npm publisher is infringing your trademark, such as by using a confusingly similar package name, email with a link to @@ -134,4 +134,4 @@ License. ### See also * [npm registry](/using-npm/registry) -* [npm owner](/cli-commands/npm-owner) +* [npm owner](/cli-commands/owner) diff --git a/deps/npm/docs/content/using-npm/orgs.md b/deps/npm/docs/content/using-npm/orgs.md index 9709a12d726752..107bac7a9454bd 100644 --- a/deps/npm/docs/content/using-npm/orgs.md +++ b/deps/npm/docs/content/using-npm/orgs.md @@ -24,8 +24,8 @@ The developer will be able to access packages based on the teams they are on. Ac There are two main commands: -1. `npm team` see [npm team](/cli-commands/npm-team) for more details -2. `npm access` see [npm access](/cli-commands/npm-access) for more details +1. `npm team` see [npm team](/cli-commands/team) for more details +2. `npm access` see [npm access](/cli-commands/access) for more details ### Team Admins create teams @@ -92,6 +92,6 @@ npm access ls-collaborators ### See also -* [npm team](/cli-commands/npm-team) -* [npm access](/cli-commands/npm-access) +* [npm team](/cli-commands/team) +* [npm access](/cli-commands/access) * [npm scope](/using-npm/scope) diff --git a/deps/npm/docs/content/using-npm/registry.md b/deps/npm/docs/content/using-npm/registry.md index cd6a2e4d71eebc..44d0594132929f 100644 --- a/deps/npm/docs/content/using-npm/registry.md +++ b/deps/npm/docs/content/using-npm/registry.md @@ -33,7 +33,7 @@ available at . The registry URL used is determined by the scope of the package (see [`scope`](/using-npm/scope). If no scope is specified, the default registry is used, which is -supplied by the `registry` config parameter. See [`npm config`](/cli-commands/npm-config), +supplied by the `registry` config parameter. See [`npm config`](/cli-commands/config), [`npmrc`](/configuring-npm/npmrc), and [`config`](/using-npm/config) for more on managing npm's configuration. ### Does npm send any information about me back to the registry? @@ -100,7 +100,7 @@ Yes, head over to ### See also -* [npm config](/cli-commands/npm-config) +* [npm config](/cli-commands/config) * [config](/using-npm/config) * [npmrc](/configuring-npm/npmrc) * [npm developers](/using-npm/developers) diff --git a/deps/npm/docs/content/using-npm/removal.md b/deps/npm/docs/content/using-npm/removal.md index 7c836846732403..20f353dc3475d8 100644 --- a/deps/npm/docs/content/using-npm/removal.md +++ b/deps/npm/docs/content/using-npm/removal.md @@ -66,5 +66,5 @@ find /usr/local/{lib/node,bin} -exec grep -l npm \{\} \; ; ### See also -* [npm uninstall](/cli-commands/npm-uninstall) -* [npm prune](/cli-commands/npm-prune) +* [npm uninstall](/cli-commands/uninstall) +* [npm prune](/cli-commands/prune) diff --git a/deps/npm/docs/content/using-npm/scope.md b/deps/npm/docs/content/using-npm/scope.md index 2cbc108f0db92c..81c55060ff601e 100644 --- a/deps/npm/docs/content/using-npm/scope.md +++ b/deps/npm/docs/content/using-npm/scope.md @@ -55,7 +55,7 @@ Or in `package.json`: ``` Note that if the `@` symbol is omitted, in either case, npm will instead attempt to -install from GitHub; see [`npm install`](/cli-commands/npm-install). +install from GitHub; see [`npm install`](/cli-commands/install). ### Requiring scoped packages @@ -125,7 +125,7 @@ that registry instead. ### See also -* [npm install](/cli-commands/npm-install) -* [npm publish](/cli-commands/npm-publish) -* [npm access](/cli-commands/npm-access) +* [npm install](/cli-commands/install) +* [npm publish](/cli-commands/publish) +* [npm access](/cli-commands/access) * [npm registry](/using-npm/registry) diff --git a/deps/npm/docs/content/using-npm/scripts.md b/deps/npm/docs/content/using-npm/scripts.md index 6a2522fba43a77..a9ca433fdea08c 100644 --- a/deps/npm/docs/content/using-npm/scripts.md +++ b/deps/npm/docs/content/using-npm/scripts.md @@ -10,90 +10,64 @@ description: How npm handles the "scripts" field ### Description -npm supports the "scripts" property of the package.json file, for the -following scripts: - -* **prepublish** (_as of npm@5, `prepublish` is deprecated. Use `prepare` for build steps and `prepublishOnly` for upload-only._): - Run BEFORE the package is packed and published, as well as on local `npm - install` without any arguments. (See below) -* **prepare**: - Run both BEFORE the package is packed and published, on local `npm - install` without any arguments, and when installing git dependencies (See - below). This is run AFTER `prepublish`, but BEFORE `prepublishOnly`. -* **prepublishOnly**: - Run BEFORE the package is prepared and packed, ONLY on `npm publish`. (See - below.) -* **prepack**: - run BEFORE a tarball is packed (on `npm pack`, `npm publish`, and when - installing git dependencies) -* **postpack**: - Run AFTER the tarball has been generated and moved to its final destination. -* **publish**, **postpublish**: - Run AFTER the package is published. -* **preinstall**: - Run BEFORE the package is installed -* **install**, **postinstall**: - Run AFTER the package is installed. -* **preuninstall**, **uninstall**: - Run BEFORE the package is uninstalled. -* **postuninstall**: - Run AFTER the package is uninstalled. -* **preversion**: - Run BEFORE bumping the package version. -* **version**: - Run AFTER bumping the package version, but BEFORE commit. -* **postversion**: - Run AFTER bumping the package version, and AFTER commit. -* **pretest**, **test**, **posttest**: - Run by the `npm test` command. -* **prestop**, **stop**, **poststop**: - Run by the `npm stop` command. -* **prestart**, **start**, **poststart**: - Run by the `npm start` command. -* **prerestart**, **restart**, **postrestart**: - Run by the `npm restart` command. Note: `npm restart` will run the - stop and start scripts if no `restart` script is provided. -* **preshrinkwrap**, **shrinkwrap**, **postshrinkwrap**: - Run by the `npm shrinkwrap` command. - -Additionally, arbitrary scripts can be executed by running `npm -run-script `. *Pre* and *post* commands with matching -names will be run for those as well (e.g. `premyscript`, `myscript`, -`postmyscript`). Scripts from dependencies can be run with -`npm explore -- npm run `. - -#### Prepublish and Prepare - -#### Deprecation Note - -Since `npm@1.1.71`, the npm CLI has run the `prepublish` script for both `npm -publish` and `npm install`, because it's a convenient way to prepare a package -for use (some common use cases are described in the section below). It has -also turned out to be, in practice, [very -confusing](https://github.com/npm/npm/issues/10074). As of `npm@4.0.0`, a new -event has been introduced, `prepare`, that preserves this existing behavior. A -_new_ event, `prepublishOnly` has been added as a transitional strategy to -allow users to avoid the confusing behavior of existing npm versions and only -run on `npm publish` (for instance, running the tests one last time to ensure -they're in good shape). - -See for a much lengthier -justification, with further reading, for this change. - -#### Use Cases - -If you need to perform operations on your package before it is used, in a way -that is not dependent on the operating system or architecture of the -target system, use a `prepublish` script. This includes -tasks such as: +The `"scripts"` property of of your `package.json` file supports a number of built-in scripts and their preset life cycle events as well as arbitrary scripts. These all can be executed by running `npm run-script ` or `npm run ` for short. *Pre* and *post* commands with matching names will be run for those as well (e.g. `premyscript`, `myscript`, `postmyscript`). Scripts from dependencies can be run with `npm explore -- npm run `. + +### Pre & Post Scripts + +To create "pre" or "post" scripts for any scripts defined in the `"scripts"` section of the `package.json`, simply create another script *with a matching name* and add "pre" or "post" to the beginning of them. + +```json +{ + "scripts": { + "precompress": "{{ executes BEFORE the `compress` script }}", + "compress": "{{ run command to compress files }}", + "postcompress": "{{ executes AFTER `compress` script }}" + } +} +``` + +### Life Cycle Scripts + +There are some special life cycle scripts that happen only in certain situations. These scripts happen in addtion to the "pre" and "post" script. +* `prepare`, `prepublish`, `prepublishOnly`, `prepack`, `postpack` + +**prepare** (since `npm@4.0.0`) +* Runs BEFORE the package is packed +* Runs BEFORE the package is published +* Runs on local `npm install` without any arguments +* Run AFTER `prepublish`, but BEFORE `prepublishOnly` +* NOTE: If a package being installed through git contains a `prepare` script, its `dependencies` and `devDependencies` will be installed, and the prepare script will be run, before the package is packaged and installed. + +**prepublish** (DEPRECATED) +* Same as `prepare` + +**prepublishOnly** +* Runs BEFORE the package is prepared and packed, ONLY on `npm publish`. + +**prepack** +* Runs BEFORE a tarball is packed (on "`npm pack`", "`npm publish`", and when installing a git dependencies). +* NOTE: "`npm run pack`" is NOT the same as "`npm pack`". "`npm run pack`" is an arbitrary user defined script name, where as, "`npm pack`" is a CLI defined command. + +**postpack** +* Runs AFTER the tarball has been generated and moved to its final destination. + +#### Prepare and Prepublish + +**Deprecation Note: prepublish** + +Since `npm@1.1.71`, the npm CLI has run the `prepublish` script for both `npm publish` and `npm install`, because it's a convenient way to prepare a package for use (some common use cases are described in the section below). It has also turned out to be, in practice, [very confusing](https://github.com/npm/npm/issues/10074). As of `npm@4.0.0`, a new event has been introduced, `prepare`, that preserves this existing behavior. A _new_ event, `prepublishOnly` has been added as a transitional strategy to allow users to avoid the confusing behavior of existing npm versions and only run on `npm publish` (for instance, running the tests one last time to ensure they're in good shape). + +See for a much lengthier justification, with further reading, for this change. + +**Use Cases** + +If you need to perform operations on your package before it is used, in a way that is not dependent on the operating system or architecture of the target system, use a `prepublish` script. This includes tasks such as: * Compiling CoffeeScript source code into JavaScript. * Creating minified versions of JavaScript source code. * Fetching remote resources that your package will use. -The advantage of doing these things at `prepublish` time is that they can be done once, in a -single place, thus reducing complexity and variability. -Additionally, this means that: +The advantage of doing these things at `prepublish` time is that they can be done once, in a single place, thus reducing complexity and variability. Additionally, this means that: * You can depend on `coffee-script` as a `devDependency`, and thus your users don't need to have it installed. @@ -102,8 +76,41 @@ Additionally, this means that: * You don't need to rely on your users having `curl` or `wget` or other system tools on the target machines. -### Default Values +### Life Cycle Operation Order + +#### [`npm publish`](/cli-commands/publish) + +* `prepublishOnly` +* `prepare` +* `prepublish` +* `publish` +* `postpublish` + +#### [`npm pack`](/cli-commands/pack) + +* `prepack` +* `postpack` +#### [`npm install`](/cli-commands/install) + +* `preinstall` +* `install` +* `postinstall` + +Also triggers + +* `prepublish` (when on local) +* `prepare` (when on local) + +#### [`npm start`](/cli-commands/start) + +`npm run start` has an `npm start` shorthand. + +* `prestart` +* `start` +* `poststart` + +### Default Values npm will default some script values based on package contents. * `"start": "node server.js"`: @@ -208,7 +215,7 @@ For example, if your package.json contains this: ```json { "scripts" : { "install" : "scripts/install.js" - , "postinstall" : "scripts/install.js" + , "postinstall" : "scripts/postinstall.js" , "uninstall" : "scripts/uninstall.js" } } @@ -283,7 +290,7 @@ above. ### See Also -* [npm run-script](/cli-commands/npm-run-script) +* [npm run-script](/cli-commands/run-script) * [package.json](/configuring-npm/package-json) * [npm developers](/using-npm/developers) -* [npm install](/cli-commands/npm-install) +* [npm install](/cli-commands/install) diff --git a/deps/npm/docs/package-lock.json b/deps/npm/docs/package-lock.json index 7fbff27b294df3..75bda15a6ee8d0 100644 --- a/deps/npm/docs/package-lock.json +++ b/deps/npm/docs/package-lock.json @@ -13,18 +13,18 @@ } }, "@babel/core": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz", - "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz", + "integrity": "sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==", "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.5.5", - "@babel/helpers": "^7.5.5", - "@babel/parser": "^7.5.5", - "@babel/template": "^7.4.4", - "@babel/traverse": "^7.5.5", - "@babel/types": "^7.5.5", - "convert-source-map": "^1.1.0", + "@babel/generator": "^7.7.7", + "@babel/helpers": "^7.7.4", + "@babel/parser": "^7.7.7", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4", + "convert-source-map": "^1.7.0", "debug": "^4.1.0", "json5": "^2.1.0", "lodash": "^4.17.13", @@ -33,157 +33,162 @@ "source-map": "^0.5.0" }, "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, "@babel/generator": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", - "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", "requires": { - "@babel/types": "^7.5.5", + "@babel/types": "^7.7.4", "jsesc": "^2.5.1", "lodash": "^4.17.13", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" + "source-map": "^0.5.0" } }, "@babel/helper-annotate-as-pure": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz", - "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz", + "integrity": "sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==", "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz", - "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz", + "integrity": "sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==", "requires": { - "@babel/helper-explode-assignable-expression": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-explode-assignable-expression": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-builder-react-jsx": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz", - "integrity": "sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz", + "integrity": "sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA==", "requires": { - "@babel/types": "^7.3.0", + "@babel/types": "^7.7.4", "esutils": "^2.0.0" } }, "@babel/helper-call-delegate": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz", - "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz", + "integrity": "sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==", "requires": { - "@babel/helper-hoist-variables": "^7.4.4", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4" + "@babel/helper-hoist-variables": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-create-class-features-plugin": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz", - "integrity": "sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz", + "integrity": "sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==", "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-member-expression-to-functions": "^7.5.5", - "@babel/helper-optimise-call-expression": "^7.0.0", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.5.5", - "@babel/helper-split-export-declaration": "^7.4.4" + "@babel/helper-replace-supers": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4" + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz", + "integrity": "sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==", + "requires": { + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.6.0" } }, "@babel/helper-define-map": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz", - "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz", + "integrity": "sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==", "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/types": "^7.5.5", + "@babel/helper-function-name": "^7.7.4", + "@babel/types": "^7.7.4", "lodash": "^4.17.13" } }, "@babel/helper-explode-assignable-expression": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz", - "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz", + "integrity": "sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==", "requires": { - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-function-name": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", - "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", "requires": { - "@babel/helper-get-function-arity": "^7.0.0", - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-get-function-arity": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-hoist-variables": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz", - "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz", + "integrity": "sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==", "requires": { - "@babel/types": "^7.4.4" + "@babel/types": "^7.7.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz", - "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz", + "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==", "requires": { - "@babel/types": "^7.5.5" + "@babel/types": "^7.7.4" } }, "@babel/helper-module-imports": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz", - "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz", + "integrity": "sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==", "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-module-transforms": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz", - "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==", - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/template": "^7.4.4", - "@babel/types": "^7.5.5", + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz", + "integrity": "sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==", + "requires": { + "@babel/helper-module-imports": "^7.7.4", + "@babel/helper-simple-access": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4", "lodash": "^4.17.13" } }, "@babel/helper-optimise-call-expression": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz", - "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz", + "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==", "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.7.4" } }, "@babel/helper-plugin-utils": { @@ -200,64 +205,64 @@ } }, "@babel/helper-remap-async-to-generator": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz", - "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz", + "integrity": "sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==", "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-wrap-function": "^7.1.0", - "@babel/template": "^7.1.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-wrap-function": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-replace-supers": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz", - "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz", + "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.5.5", - "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/traverse": "^7.5.5", - "@babel/types": "^7.5.5" + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-simple-access": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz", - "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz", + "integrity": "sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==", "requires": { - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", "requires": { - "@babel/types": "^7.4.4" + "@babel/types": "^7.7.4" } }, "@babel/helper-wrap-function": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz", - "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz", + "integrity": "sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==", "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/template": "^7.1.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.2.0" + "@babel/helper-function-name": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/helpers": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz", - "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz", + "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==", "requires": { - "@babel/template": "^7.4.4", - "@babel/traverse": "^7.5.5", - "@babel/types": "^7.5.5" + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/highlight": { @@ -271,640 +276,650 @@ } }, "@babel/parser": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", - "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==" + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==" }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz", - "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz", + "integrity": "sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.1.0", - "@babel/plugin-syntax-async-generators": "^7.2.0" + "@babel/helper-remap-async-to-generator": "^7.7.4", + "@babel/plugin-syntax-async-generators": "^7.7.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz", - "integrity": "sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz", + "integrity": "sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.5.5", + "@babel/helper-create-class-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz", - "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz", + "integrity": "sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0" + "@babel/plugin-syntax-dynamic-import": "^7.7.4" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", - "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz", + "integrity": "sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-syntax-json-strings": "^7.7.4" + } + }, + "@babel/plugin-proposal-nullish-coalescing-operator": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.7.4.tgz", + "integrity": "sha512-TbYHmr1Gl1UC7Vo2HVuj/Naci5BEGNZ0AJhzqD2Vpr6QPFWpUmBRLrIDjedzx7/CShq0bRDS2gI4FIs77VHLVQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-json-strings": "^7.2.0" + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.7.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz", - "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz", + "integrity": "sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0" + "@babel/plugin-syntax-object-rest-spread": "^7.7.4" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4" } }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz", - "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==", + "@babel/plugin-proposal-optional-chaining": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.5.tgz", + "integrity": "sha512-sOwFqT8JSchtJeDD+CjmWCaiFoLxY4Ps7NjvwHC/U7l4e9i5pTRNt8nDMIFSOUL+ncFbYSwruHM8WknYItWdXw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" + "@babel/plugin-syntax-optional-chaining": "^7.7.4" } }, - "@babel/plugin-syntax-async-generators": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz", - "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==", + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz", + "integrity": "sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w==", "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-syntax-class-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.2.0.tgz", - "integrity": "sha512-UxYaGXYQ7rrKJS/PxIKRkv3exi05oH7rokBAsmCSsCxz1sVPZ7Fu6FzKoGgUvmY+0YgSkYHgUoCh5R5bCNBQlw==", + "@babel/plugin-syntax-async-generators": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz", + "integrity": "sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-dynamic-import": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz", - "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz", + "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-syntax-flow": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz", - "integrity": "sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==", + "@babel/plugin-syntax-json-strings": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz", + "integrity": "sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-syntax-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", - "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==", + "@babel/plugin-syntax-jsx": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz", + "integrity": "sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-syntax-jsx": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz", - "integrity": "sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==", + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.7.4.tgz", + "integrity": "sha512-XKh/yIRPiQTOeBg0QJjEus5qiSKucKAiApNtO1psqG7D17xmE+X2i5ZqBEuSvo0HRuyPaKaSN/Gy+Ha9KFQolw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-object-rest-spread": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", - "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz", + "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz", + "integrity": "sha512-2MqYD5WjZSbJdUagnJvIdSfkb/ucOC9/1fRJxm7GAxY6YQLWlUvkfxoNbUPcPLHJyetKUDQ4+yyuUyAoc0HriA==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz", + "integrity": "sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz", - "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz", + "integrity": "sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz", - "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz", + "integrity": "sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==", "requires": { - "@babel/helper-module-imports": "^7.0.0", + "@babel/helper-module-imports": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.1.0" + "@babel/helper-remap-async-to-generator": "^7.7.4" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz", - "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz", + "integrity": "sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz", - "integrity": "sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz", + "integrity": "sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", "lodash": "^4.17.13" } }, "@babel/plugin-transform-classes": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz", - "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-define-map": "^7.5.5", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-optimise-call-expression": "^7.0.0", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz", + "integrity": "sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-define-map": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.5.5", - "@babel/helper-split-export-declaration": "^7.4.4", + "@babel/helper-replace-supers": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", "globals": "^11.1.0" + }, + "dependencies": { + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + } } }, "@babel/plugin-transform-computed-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz", - "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz", + "integrity": "sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-destructuring": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz", - "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz", + "integrity": "sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz", - "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz", + "integrity": "sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" + "@babel/helper-create-regexp-features-plugin": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz", - "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz", + "integrity": "sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz", - "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz", + "integrity": "sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==", "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, - "@babel/plugin-transform-flow-strip-types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz", - "integrity": "sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==", - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-flow": "^7.2.0" - } - }, "@babel/plugin-transform-for-of": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz", - "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz", + "integrity": "sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-function-name": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz", - "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz", + "integrity": "sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==", "requires": { - "@babel/helper-function-name": "^7.1.0", + "@babel/helper-function-name": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz", - "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz", + "integrity": "sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", - "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz", + "integrity": "sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz", - "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==", + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz", + "integrity": "sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==", "requires": { - "@babel/helper-module-transforms": "^7.1.0", + "@babel/helper-module-transforms": "^7.7.5", "@babel/helper-plugin-utils": "^7.0.0", "babel-plugin-dynamic-import-node": "^2.3.0" - }, - "dependencies": { - "babel-plugin-dynamic-import-node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", - "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", - "requires": { - "object.assign": "^4.1.0" - } - } } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz", - "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==", + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz", + "integrity": "sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==", "requires": { - "@babel/helper-module-transforms": "^7.4.4", + "@babel/helper-module-transforms": "^7.7.5", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0", + "@babel/helper-simple-access": "^7.7.4", "babel-plugin-dynamic-import-node": "^2.3.0" - }, - "dependencies": { - "babel-plugin-dynamic-import-node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", - "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", - "requires": { - "object.assign": "^4.1.0" - } - } } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz", - "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz", + "integrity": "sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==", "requires": { - "@babel/helper-hoist-variables": "^7.4.4", + "@babel/helper-hoist-variables": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", "babel-plugin-dynamic-import-node": "^2.3.0" - }, - "dependencies": { - "babel-plugin-dynamic-import-node": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", - "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", - "requires": { - "object.assign": "^4.1.0" - } - } } }, "@babel/plugin-transform-modules-umd": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz", - "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz", + "integrity": "sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==", "requires": { - "@babel/helper-module-transforms": "^7.1.0", + "@babel/helper-module-transforms": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz", - "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz", + "integrity": "sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==", "requires": { - "regexp-tree": "^0.1.6" + "@babel/helper-create-regexp-features-plugin": "^7.7.4" } }, "@babel/plugin-transform-new-target": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz", - "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz", + "integrity": "sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-object-super": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz", - "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz", + "integrity": "sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.5.5" + "@babel/helper-replace-supers": "^7.7.4" } }, "@babel/plugin-transform-parameters": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz", - "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz", + "integrity": "sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==", "requires": { - "@babel/helper-call-delegate": "^7.4.4", - "@babel/helper-get-function-arity": "^7.0.0", + "@babel/helper-call-delegate": "^7.7.4", + "@babel/helper-get-function-arity": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-property-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz", - "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz", + "integrity": "sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-react-display-name": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz", - "integrity": "sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.7.4.tgz", + "integrity": "sha512-sBbIvqYkthai0X0vkD2xsAwluBp+LtNHH+/V4a5ydifmTtb8KOVOlrMIk/MYmIc4uTYDnjZUHQildYNo36SRJw==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-react-jsx": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz", - "integrity": "sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.7.tgz", + "integrity": "sha512-SlPjWPbva2+7/ZJbGcoqjl4LsQaLpKEzxW9hcxU7675s24JmdotJOSJ4cgAbV82W3FcZpHIGmRZIlUL8ayMvjw==", "requires": { - "@babel/helper-builder-react-jsx": "^7.3.0", + "@babel/helper-builder-react-jsx": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.2.0" + "@babel/plugin-syntax-jsx": "^7.7.4" } }, "@babel/plugin-transform-react-jsx-self": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz", - "integrity": "sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.7.4.tgz", + "integrity": "sha512-PWYjSfqrO273mc1pKCRTIJXyqfc9vWYBax88yIhQb+bpw3XChVC7VWS4VwRVs63wFHKxizvGSd00XEr+YB9Q2A==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.2.0" + "@babel/plugin-syntax-jsx": "^7.7.4" } }, "@babel/plugin-transform-react-jsx-source": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz", - "integrity": "sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.7.4.tgz", + "integrity": "sha512-5ZU9FnPhqtHsOXxutRtXZAzoEJwDaP32QcobbMP1/qt7NYcsCNK8XgzJcJfoEr/ZnzVvUNInNjIW22Z6I8p9mg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.2.0" + "@babel/plugin-syntax-jsx": "^7.7.4" } }, "@babel/plugin-transform-regenerator": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz", - "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==", + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz", + "integrity": "sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==", "requires": { "regenerator-transform": "^0.14.0" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz", - "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz", + "integrity": "sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-runtime": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz", - "integrity": "sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==", + "version": "7.7.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz", + "integrity": "sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==", "requires": { - "@babel/helper-module-imports": "^7.0.0", + "@babel/helper-module-imports": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", "resolve": "^1.8.1", "semver": "^5.5.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz", - "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz", + "integrity": "sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-spread": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz", - "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz", + "integrity": "sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz", - "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz", + "integrity": "sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-regex": "^7.0.0" } }, "@babel/plugin-transform-template-literals": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz", - "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz", + "integrity": "sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==", "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", + "@babel/helper-annotate-as-pure": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz", - "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz", + "integrity": "sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==", "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz", - "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz", + "integrity": "sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==", "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" + "@babel/helper-create-regexp-features-plugin": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/polyfill": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz", - "integrity": "sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.7.0.tgz", + "integrity": "sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==", "requires": { "core-js": "^2.6.5", "regenerator-runtime": "^0.13.2" } }, "@babel/preset-env": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz", - "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.7.tgz", + "integrity": "sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg==", "requires": { - "@babel/helper-module-imports": "^7.0.0", + "@babel/helper-module-imports": "^7.7.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.2.0", - "@babel/plugin-proposal-dynamic-import": "^7.5.0", - "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.5.5", - "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-syntax-async-generators": "^7.2.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/plugin-syntax-json-strings": "^7.2.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", - "@babel/plugin-transform-arrow-functions": "^7.2.0", - "@babel/plugin-transform-async-to-generator": "^7.5.0", - "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.5.5", - "@babel/plugin-transform-classes": "^7.5.5", - "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.5.0", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/plugin-transform-duplicate-keys": "^7.5.0", - "@babel/plugin-transform-exponentiation-operator": "^7.2.0", - "@babel/plugin-transform-for-of": "^7.4.4", - "@babel/plugin-transform-function-name": "^7.4.4", - "@babel/plugin-transform-literals": "^7.2.0", - "@babel/plugin-transform-member-expression-literals": "^7.2.0", - "@babel/plugin-transform-modules-amd": "^7.5.0", - "@babel/plugin-transform-modules-commonjs": "^7.5.0", - "@babel/plugin-transform-modules-systemjs": "^7.5.0", - "@babel/plugin-transform-modules-umd": "^7.2.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5", - "@babel/plugin-transform-new-target": "^7.4.4", - "@babel/plugin-transform-object-super": "^7.5.5", - "@babel/plugin-transform-parameters": "^7.4.4", - "@babel/plugin-transform-property-literals": "^7.2.0", - "@babel/plugin-transform-regenerator": "^7.4.5", - "@babel/plugin-transform-reserved-words": "^7.2.0", - "@babel/plugin-transform-shorthand-properties": "^7.2.0", - "@babel/plugin-transform-spread": "^7.2.0", - "@babel/plugin-transform-sticky-regex": "^7.2.0", - "@babel/plugin-transform-template-literals": "^7.4.4", - "@babel/plugin-transform-typeof-symbol": "^7.2.0", - "@babel/plugin-transform-unicode-regex": "^7.4.4", - "@babel/types": "^7.5.5", + "@babel/plugin-proposal-async-generator-functions": "^7.7.4", + "@babel/plugin-proposal-dynamic-import": "^7.7.4", + "@babel/plugin-proposal-json-strings": "^7.7.4", + "@babel/plugin-proposal-object-rest-spread": "^7.7.7", + "@babel/plugin-proposal-optional-catch-binding": "^7.7.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.7.7", + "@babel/plugin-syntax-async-generators": "^7.7.4", + "@babel/plugin-syntax-dynamic-import": "^7.7.4", + "@babel/plugin-syntax-json-strings": "^7.7.4", + "@babel/plugin-syntax-object-rest-spread": "^7.7.4", + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4", + "@babel/plugin-syntax-top-level-await": "^7.7.4", + "@babel/plugin-transform-arrow-functions": "^7.7.4", + "@babel/plugin-transform-async-to-generator": "^7.7.4", + "@babel/plugin-transform-block-scoped-functions": "^7.7.4", + "@babel/plugin-transform-block-scoping": "^7.7.4", + "@babel/plugin-transform-classes": "^7.7.4", + "@babel/plugin-transform-computed-properties": "^7.7.4", + "@babel/plugin-transform-destructuring": "^7.7.4", + "@babel/plugin-transform-dotall-regex": "^7.7.7", + "@babel/plugin-transform-duplicate-keys": "^7.7.4", + "@babel/plugin-transform-exponentiation-operator": "^7.7.4", + "@babel/plugin-transform-for-of": "^7.7.4", + "@babel/plugin-transform-function-name": "^7.7.4", + "@babel/plugin-transform-literals": "^7.7.4", + "@babel/plugin-transform-member-expression-literals": "^7.7.4", + "@babel/plugin-transform-modules-amd": "^7.7.5", + "@babel/plugin-transform-modules-commonjs": "^7.7.5", + "@babel/plugin-transform-modules-systemjs": "^7.7.4", + "@babel/plugin-transform-modules-umd": "^7.7.4", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.4", + "@babel/plugin-transform-new-target": "^7.7.4", + "@babel/plugin-transform-object-super": "^7.7.4", + "@babel/plugin-transform-parameters": "^7.7.7", + "@babel/plugin-transform-property-literals": "^7.7.4", + "@babel/plugin-transform-regenerator": "^7.7.5", + "@babel/plugin-transform-reserved-words": "^7.7.4", + "@babel/plugin-transform-shorthand-properties": "^7.7.4", + "@babel/plugin-transform-spread": "^7.7.4", + "@babel/plugin-transform-sticky-regex": "^7.7.4", + "@babel/plugin-transform-template-literals": "^7.7.4", + "@babel/plugin-transform-typeof-symbol": "^7.7.4", + "@babel/plugin-transform-unicode-regex": "^7.7.4", + "@babel/types": "^7.7.4", "browserslist": "^4.6.0", - "core-js-compat": "^3.1.1", + "core-js-compat": "^3.6.0", "invariant": "^2.2.2", "js-levenshtein": "^1.1.3", "semver": "^5.5.0" }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, "@babel/preset-react": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.0.0.tgz", - "integrity": "sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.7.4.tgz", + "integrity": "sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==", "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-transform-react-display-name": "^7.0.0", - "@babel/plugin-transform-react-jsx": "^7.0.0", - "@babel/plugin-transform-react-jsx-self": "^7.0.0", - "@babel/plugin-transform-react-jsx-source": "^7.0.0" + "@babel/plugin-transform-react-display-name": "^7.7.4", + "@babel/plugin-transform-react-jsx": "^7.7.4", + "@babel/plugin-transform-react-jsx-self": "^7.7.4", + "@babel/plugin-transform-react-jsx-source": "^7.7.4" } }, "@babel/runtime": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz", - "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==", + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.7.tgz", + "integrity": "sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==", + "requires": { + "regenerator-runtime": "^0.13.2" + } + }, + "@babel/runtime-corejs3": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.7.7.tgz", + "integrity": "sha512-kr3W3Fw8mB/CTru2M5zIRQZZgC/9zOxNSoJ/tVCzjPt3H1/p5uuGbz6WwmaQy/TLQcW31rUhUUWKY28sXFRelA==", "requires": { + "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.2" } }, "@babel/template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", - "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" } }, "@babel/traverse": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", - "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.5.5", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.5.5", - "@babel/types": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" }, "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" } } }, "@babel/types": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", - "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", "requires": { "esutils": "^2.0.2", "lodash": "^4.17.13", @@ -912,141 +927,118 @@ } }, "@emotion/cache": { - "version": "10.0.17", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.17.tgz", - "integrity": "sha512-442/miwbuwIDfSzfMqZNxuzxSEbskcz/bZ86QBYzEjFrr/oq9w+y5kJY1BHbGhDtr91GO232PZ5NN9XYMwr/Qg==", + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.27.tgz", + "integrity": "sha512-Zp8BEpbMunFsTcqAK4D7YTm3MvCp1SekflSLJH8lze2fCcSZ/yMkXHo8kb3t1/1Tdd3hAqf3Fb7z9VZ+FMiC9w==", "requires": { - "@emotion/sheet": "0.9.3", - "@emotion/stylis": "0.8.4", - "@emotion/utils": "0.11.2", - "@emotion/weak-memoize": "0.2.3" + "@emotion/sheet": "0.9.4", + "@emotion/stylis": "0.8.5", + "@emotion/utils": "0.11.3", + "@emotion/weak-memoize": "0.2.5" } }, "@emotion/core": { - "version": "10.0.17", - "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.17.tgz", - "integrity": "sha512-gykyjjr0sxzVuZBVTVK4dUmYsorc2qLhdYgSiOVK+m7WXgcYTKZevGWZ7TLAgTZvMelCTvhNq8xnf8FR1IdTbg==", + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.27.tgz", + "integrity": "sha512-XbD5R36pVbohQMnKfajHv43g8EbN4NHdF6Zh9zg/C0nr0jqwOw3gYnC07Xj3yG43OYSRyrGsoQ5qPwc8ycvLZw==", "requires": { "@babel/runtime": "^7.5.5", - "@emotion/cache": "^10.0.17", - "@emotion/css": "^10.0.14", - "@emotion/serialize": "^0.11.10", - "@emotion/sheet": "0.9.3", - "@emotion/utils": "0.11.2" + "@emotion/cache": "^10.0.27", + "@emotion/css": "^10.0.27", + "@emotion/serialize": "^0.11.15", + "@emotion/sheet": "0.9.4", + "@emotion/utils": "0.11.3" } }, "@emotion/css": { - "version": "10.0.14", - "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.14.tgz", - "integrity": "sha512-MozgPkBEWvorcdpqHZE5x1D/PLEHUitALQCQYt2wayf4UNhpgQs2tN0UwHYS4FMy5ROBH+0ALyCFVYJ/ywmwlg==", + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz", + "integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==", "requires": { - "@emotion/serialize": "^0.11.8", - "@emotion/utils": "0.11.2", - "babel-plugin-emotion": "^10.0.14" + "@emotion/serialize": "^0.11.15", + "@emotion/utils": "0.11.3", + "babel-plugin-emotion": "^10.0.27" } }, "@emotion/hash": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.2.tgz", - "integrity": "sha512-RMtr1i6E8MXaBWwhXL3yeOU8JXRnz8GNxHvaUfVvwxokvayUY0zoBeWbKw1S9XkufmGEEdQd228pSZXFkAln8Q==" + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.4.tgz", + "integrity": "sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A==" }, "@emotion/is-prop-valid": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.2.tgz", - "integrity": "sha512-ZQIMAA2kLUWiUeMZNJDTeCwYRx1l8SQL0kHktze4COT22occKpDML1GDUXP5/sxhOMrZO8vZw773ni4H5Snrsg==", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.6.tgz", + "integrity": "sha512-mnZMho3Sq8BfzkYYRVc8ilQTnc8U02Ytp6J1AwM6taQStZ3AhsEJBX2LzhA/LJirNCwM2VtHL3VFIZ+sNJUgUQ==", "requires": { - "@emotion/memoize": "0.7.2" + "@emotion/memoize": "0.7.4" } }, "@emotion/memoize": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.2.tgz", - "integrity": "sha512-hnHhwQzvPCW1QjBWFyBtsETdllOM92BfrKWbUTmh9aeOlcVOiXvlPsK4104xH8NsaKfg86PTFsWkueQeUfMA/w==" + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", + "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" }, "@emotion/serialize": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.10.tgz", - "integrity": "sha512-04AB+wU00vv9jLgkWn13c/GJg2yXp3w7ZR3Q1O6mBSE6mbUmYeNX3OpBhfp//6r47lFyY0hBJJue+bA30iokHQ==", - "requires": { - "@emotion/hash": "0.7.2", - "@emotion/memoize": "0.7.2", - "@emotion/unitless": "0.7.4", - "@emotion/utils": "0.11.2", + "version": "0.11.15", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.15.tgz", + "integrity": "sha512-YE+qnrmGwyR+XB5j7Bi+0GT1JWsdcjM/d4POu+TXkcnrRs4RFCCsi3d/Ebf+wSStHqAlTT2+dfd+b9N9EO2KBg==", + "requires": { + "@emotion/hash": "0.7.4", + "@emotion/memoize": "0.7.4", + "@emotion/unitless": "0.7.5", + "@emotion/utils": "0.11.3", "csstype": "^2.5.7" } }, "@emotion/sheet": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.3.tgz", - "integrity": "sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A==" + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz", + "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==" }, "@emotion/styled": { - "version": "10.0.17", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.17.tgz", - "integrity": "sha512-zHMgWjHDMNjD+ux64POtDnjLAObniu3znxFBLSdV/RiEhSLjHIowfvSbbd/C33/3uwtI6Uzs2KXnRZtka/PpAQ==", + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.0.27.tgz", + "integrity": "sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==", "requires": { - "@emotion/styled-base": "^10.0.17", - "babel-plugin-emotion": "^10.0.17" + "@emotion/styled-base": "^10.0.27", + "babel-plugin-emotion": "^10.0.27" } }, "@emotion/styled-base": { - "version": "10.0.17", - "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.17.tgz", - "integrity": "sha512-vqQvxluZZKPByAB4zYZys0Qo/kVDP/03hAeg1K+TYpnZRwTi7WteOodc+/5669RPVNcfb93fphQpM5BYJnI1/g==", + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/@emotion/styled-base/-/styled-base-10.0.27.tgz", + "integrity": "sha512-ufHM/HhE3nr309hJG9jxuFt71r6aHn7p+bwXduFxcwPFEfBIqvmZUMtZ9YxIsY61PVwK3bp4G1XhaCzy9smVvw==", "requires": { "@babel/runtime": "^7.5.5", - "@emotion/is-prop-valid": "0.8.2", - "@emotion/serialize": "^0.11.10", - "@emotion/utils": "0.11.2" + "@emotion/is-prop-valid": "0.8.6", + "@emotion/serialize": "^0.11.15", + "@emotion/utils": "0.11.3" } }, "@emotion/stylis": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.4.tgz", - "integrity": "sha512-TLmkCVm8f8gH0oLv+HWKiu7e8xmBIaokhxcEKPh1m8pXiV/akCiq50FvYgOwY42rjejck8nsdQxZlXZ7pmyBUQ==" + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz", + "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==" }, "@emotion/unitless": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.4.tgz", - "integrity": "sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ==" + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", + "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, "@emotion/utils": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.2.tgz", - "integrity": "sha512-UHX2XklLl3sIaP6oiMmlVzT0J+2ATTVpf0dHQVyPJHTkOITvXfaSqnRk6mdDhV9pR8T/tHc3cex78IKXssmzrA==" + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz", + "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==" }, "@emotion/weak-memoize": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.3.tgz", - "integrity": "sha512-zVgvPwGK7c1aVdUVc9Qv7SqepOGRDrqCw7KZPSZziWGxSlbII3gmvGLPzLX4d0n0BMbamBacUrN22zOMyFFEkQ==" - }, - "@gatsbyjs/relay-compiler": { - "version": "2.0.0-printer-fix.2", - "resolved": "https://registry.npmjs.org/@gatsbyjs/relay-compiler/-/relay-compiler-2.0.0-printer-fix.2.tgz", - "integrity": "sha512-7GeCCEQ7O15lMTT/SXy9HuRde4cv5vs465ZnLK2QCajSDLior+20yrMqHn1PGsJYK6nNZH7p3lw9qTCpqmuc7Q==", - "requires": { - "@babel/generator": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/polyfill": "^7.0.0", - "@babel/runtime": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0", - "babel-preset-fbjs": "^3.1.2", - "chalk": "^2.4.1", - "fast-glob": "^2.2.2", - "fb-watchman": "^2.0.0", - "fbjs": "^1.0.0", - "immutable": "~3.7.6", - "nullthrows": "^1.1.0", - "relay-runtime": "2.0.0", - "signedsource": "^1.0.0", - "yargs": "^9.0.0" - } + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", + "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@hapi/address": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz", - "integrity": "sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==" + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", + "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==" }, "@hapi/bourne": { "version": "1.3.2", @@ -1054,9 +1046,9 @@ "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==" }, "@hapi/hoek": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.1.tgz", - "integrity": "sha512-JPiBy+oSmsq3St7XlipfN5pNA6bDJ1kpa73PrK/zR29CVClDVqy04AanM/M/qx5bSF+I61DdCfAvRrujau+zRg==" + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz", + "integrity": "sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==" }, "@hapi/joi": { "version": "15.1.1", @@ -1070,29 +1062,29 @@ } }, "@hapi/topo": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz", - "integrity": "sha512-JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", + "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", "requires": { - "@hapi/hoek": "8.x.x" + "@hapi/hoek": "^8.3.0" } }, "@jimp/bmp": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.6.4.tgz", - "integrity": "sha512-dhKM7Cjw4XoOefx3/we2+vWyTP6hQPpM7mEsziGjtsrK2f/e3/+hhHbEsQNgO9BOA1FPJRXAOiYHts9IlMH1mg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.6.8.tgz", + "integrity": "sha512-uxVgSkI62uAzk5ZazYHEHBehow590WAkLKmDXLzkr/XP/Hv2Fx1T4DKwJ/15IY5ktq5VAhAUWGXTyd8KWFsx7w==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "bmp-js": "^0.1.0", "core-js": "^2.5.7" } }, "@jimp/core": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.6.4.tgz", - "integrity": "sha512-nyiAXI8/uU54fGO53KrRB8pdn1s+IODZ+rj0jG2owsNJlTlagFrsZAy8IVTUCOiiXjh9TbwFo7D5XMrmi4KUww==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.6.8.tgz", + "integrity": "sha512-JOFqBBcSNiDiMZJFr6OJqC6viXj5NVBQISua0eacoYvo4YJtTajOIxC4MqWyUmGrDpRMZBR8QhSsIOwsFrdROA==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", @@ -1106,9 +1098,9 @@ }, "dependencies": { "buffer": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.0.tgz", - "integrity": "sha512-Xpgy0IwHK2N01ncykXTy6FpCWuM+CJSHoPVBLyNqyrWxsedpLvwsYUhf0ME3WRFNUhos0dMamz9cOS/xRDtU5g==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz", + "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==", "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4" @@ -1122,252 +1114,252 @@ } }, "@jimp/custom": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.6.4.tgz", - "integrity": "sha512-sdBHrBoVr1+PFx4dlUAgXvvu4dG0esQobhg7qhpSLRje1ScavIgE2iXdJKpycgzrqwAOL8vW4/E5w2/rONlaoQ==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.6.8.tgz", + "integrity": "sha512-FrYlzZRVXP2vuVwd7Nc2dlK+iZk4g6IaT1Ib8Z6vU5Kkwlt83FJIPJ2UUFABf3bF5big0wkk8ZUihWxE4Nzdng==", "requires": { - "@jimp/core": "^0.6.4", + "@jimp/core": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/gif": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.6.4.tgz", - "integrity": "sha512-14mLoyG0UrYJsGNRoXBFvSJdFtBD0BSBwQ1zCNeW+HpQqdl+Kh5E1Pz4nqT2KNylJe1jypyR51Q2yndgcfGVyg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.6.8.tgz", + "integrity": "sha512-yyOlujjQcgz9zkjM5ihZDEppn9d1brJ7jQHP5rAKmqep0G7FU1D0AKcV+Ql18RhuI/CgWs10wAVcrQpmLnu4Yw==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7", "omggif": "^1.0.9" } }, "@jimp/jpeg": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.6.4.tgz", - "integrity": "sha512-NrFla9fZC/Bhw1Aa9vJ6cBOqpB5ylEPb9jD+yZ0fzcAw5HwILguS//oXv9EWLApIY1XsOMFFe0XWpY653rv8hw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.6.8.tgz", + "integrity": "sha512-rGtXbYpFXAn471qLpTGvhbBMNHJo5KiufN+vC5AWyufntmkt5f0Ox2Cx4ijuBMDtirZchxbMLtrfGjznS4L/ew==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" } }, "@jimp/plugin-blit": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.6.4.tgz", - "integrity": "sha512-suVznd4XozkQIuECX0u8kMl+cAQpZN3WcbWXUcJaVxRi+VBvHIetG1Qs5qGLzuEg9627+kE7ppv0UgZ5mkE6lg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.6.8.tgz", + "integrity": "sha512-7Tl6YpKTSpvwQbnGNhsfX2zyl3jRVVopd276Y2hF2zpDz9Bycow7NdfNU/4Nx1jaf96X6uWOtSVINcQ7rGd47w==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-blur": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.6.4.tgz", - "integrity": "sha512-M2fDMYUUtEKVNnCJZk5J0KSMzzISobmWfnG88RdHXJCkOn98kdawQFwTsYOfJJfCM8jWfhIxwZLFhC/2lkTN2w==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.6.8.tgz", + "integrity": "sha512-NpZCMKxXHLDQsX9zPlWtpMA660DQStY6/z8ZetyxCDbqrLe9YCXpeR4MNhdJdABIiwTm1W5FyFF4kp81PHJx3Q==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-color": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.6.4.tgz", - "integrity": "sha512-6Nfr2l9KSb6zH2fij8G6fQOw85TTkyRaBlqMvDmsQp/I1IlaDbXzA2C2Eh9jkQYZQDPu61B1MkmlEhJp/TUx6Q==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.6.8.tgz", + "integrity": "sha512-jjFyU0zNmGOH2rjzHuOMU4kaia0oo82s/7UYfn5h7OUkmUZTd6Do3ZSK1PiXA7KR+s4B76/Omm6Doh/0SGb7BQ==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" } }, "@jimp/plugin-contain": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.6.4.tgz", - "integrity": "sha512-qI1MxU1noS6NbEPu/bDDeP405aMviuIsfpOz8J3En8IwIwrJV22qt6QIHmF+eyng8CYgivwIPjEPzFzLR566Nw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.6.8.tgz", + "integrity": "sha512-p/P2wCXhAzbmEgXvGsvmxLmbz45feF6VpR4m9suPSOr8PC/i/XvTklTqYEUidYYAft4vHgsYJdS74HKSMnH8lw==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-cover": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.6.4.tgz", - "integrity": "sha512-z6eafPonj3LJY8cTEfRkXmOfCDi1+f0tbYaNvmiu+OrWJ3Ojw2hMt+BVVvJ8pKe1dWIFkCjxOjyjZWj1gEkaLw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.6.8.tgz", + "integrity": "sha512-2PvWgk+PJfRsfWDI1G8Fpjrsu0ZlpNyZxO2+fqWlVo6y/y2gP4v08FqvbkcqSjNlOu2IDWIFXpgyU0sTINWZLg==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-crop": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.6.4.tgz", - "integrity": "sha512-w9TR+pn+GeWbznscGe2HRkPxInge0whAF3TLPWhPwBVjZChTT8dSDXsUpUlxQqvI4SfzuKp8z3/0SBqYDCzxxA==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.6.8.tgz", + "integrity": "sha512-CbrcpWE2xxPK1n/JoTXzhRUhP4mO07mTWaSavenCg664oQl/9XCtL+A0FekuNHzIvn4myEqvkiTwN7FsbunS/Q==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-displace": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.6.4.tgz", - "integrity": "sha512-MEvtBXOAio/3iGJkKBrTtFs3Q38ez2Wy/wTD0Ruas+L8fjJR7l4mDgV+zjRr57CqB5mpY+L48VEoa2/gNXh9cg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.6.8.tgz", + "integrity": "sha512-RmV2bPxoPE6mrPxtYSPtHxm2cGwBQr5a2p+9gH6SPy+eUMrbGjbvjwKNfXWUYD0leML+Pt5XOmAS9pIROmuruQ==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-dither": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.6.4.tgz", - "integrity": "sha512-w+AGLcIMUeJZ4CI0FvFomahgKLcW+ICsLidUNOqyLzceluPAfug4X7vDhQ41pNkzKg0M1+Q1j0aWV8bdyF+LhA==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.6.8.tgz", + "integrity": "sha512-x6V/qjxe+xypjpQm7GbiMNqci1EW5UizrcebOhHr8AHijOEqHd2hjXh5f6QIGfrkTFelc4/jzq1UyCsYntqz9Q==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-flip": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.6.4.tgz", - "integrity": "sha512-ukINMegMUM9KYjyDCiyYKYdSsbhNRLHDwOJN0xVRalmOKqNaZmjNbiMbaVxKlYt6sHW76RhSMOekw9f6GQB9tQ==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.6.8.tgz", + "integrity": "sha512-4il6Da6G39s9MyWBEee4jztEOUGJ40E6OlPjkMrdpDNvge6hYEAB31BczTYBP/CEY74j4LDSoY5LbcU4kv06yA==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-gaussian": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.6.4.tgz", - "integrity": "sha512-C1P6ohzIddpNb7CX5X+ygbp+ow8Fpt64ZLoIgdjYPs/42HxKluvY62fVfMhY6m5zUGKIMbg0uYeAtz/9LRJPyw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.6.8.tgz", + "integrity": "sha512-pVOblmjv7stZjsqloi4YzHVwAPXKGdNaHPhp4KP4vj41qtc6Hxd9z/+VWGYRTunMFac84gUToe0UKIXd6GhoKw==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-invert": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.6.4.tgz", - "integrity": "sha512-sleGz1jXaNEsP/5Ayqw8oez/6KesWcyCqovIuK4Z4kDmMc2ncuhsXIJQXDWtIF4tTQVzNEgrxUDNA4bi9xpCUA==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.6.8.tgz", + "integrity": "sha512-11zuLiXDHr6tFv4U8aieXqNXQEKbDbSBG/h+X62gGTNFpyn8EVPpncHhOqrAFtZUaPibBqMFlNJ15SzwC7ExsQ==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-mask": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.6.4.tgz", - "integrity": "sha512-3D4FbRxnpO9nzwa6cF8AImgO1aVReYbfRRO4I4bku4/iZ+kuU3fBLV+SRhB4c7di3ejG5u+rGsIfaNc94iYYvw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.6.8.tgz", + "integrity": "sha512-hZJ0OiKGJyv7hDSATwJDkunB1Ie80xJnONMgpUuUseteK45YeYNBOiZVUe8vum8QI1UwavgBzcvQ9u4fcgXc9g==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-normalize": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.6.4.tgz", - "integrity": "sha512-nOFMwOaVkOKArHkD/T6/1HKAPj3jlW6l0JduVDn1A5eIPCtlnyhlE9zdjgi5Q9IBR/gRjwW6tTzBKuJenS51kg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.6.8.tgz", + "integrity": "sha512-Q4oYhU+sSyTJI7pMZlg9/mYh68ujLfOxXzQGEXuw0sHGoGQs3B0Jw7jmzGa6pIS06Hup5hD2Zuh1ppvMdjJBfQ==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-print": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.6.4.tgz", - "integrity": "sha512-3z5DLVCKg0NfZhHATEaYH/4XanIboPP1pOUoxIUeF++qOnGiGgH2giFJlRprHmx2l3E3DukR1v8pt54PGvfrFw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.6.8.tgz", + "integrity": "sha512-2aokejGn4Drv1FesnZGqh5KEq0FQtR0drlmtyZrBH+r9cx7hh0Qgf4D1BOTDEgXkfSSngjGRjKKRW/fwOrVXYw==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" } }, "@jimp/plugin-resize": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.6.4.tgz", - "integrity": "sha512-fk2+KheUNClrOWj6aDNWj1r4byVQb6Qxy4aT1UHX5GXPHDA+nhlej7ghaYdzeWZYodeM3lpasYtByu1XE2qScQ==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.6.8.tgz", + "integrity": "sha512-27nPh8L1YWsxtfmV/+Ub5dOTpXyC0HMF2cu52RQSCYxr+Lm1+23dJF70AF1poUbUe+FWXphwuUxQzjBJza9UoA==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-rotate": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.6.4.tgz", - "integrity": "sha512-44VgV5D4xQIYInJAVevdW9J3SOhGKyz0OEr2ciA8Q3ktonKx0O5Q1g2kbruiqxFSkK/u2CKPLeKXZzYCFrmJGQ==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.6.8.tgz", + "integrity": "sha512-GbjETvL05BDoLdszNUV4Y0yLkHf177MnqGqilA113LIvx9aD0FtUopGXYfRGVvmtTOTouoaGJUc+K6qngvKxww==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugin-scale": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.6.4.tgz", - "integrity": "sha512-RAQRaDiCHmEz+A8QS5d/Z38EnlNsQizz3Mu3NsjA8uFtJsv1yMKWXZSQuzniofZw8tlMV6oI3VdM0eQVE07/5w==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.6.8.tgz", + "integrity": "sha512-GzIYWR/oCUK2jAwku23zt19V1ssaEU4pL0x2XsLNKuuJEU6DvEytJyTMXCE7OLG/MpDBQcQclJKHgiyQm5gIOQ==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7" } }, "@jimp/plugins": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.6.4.tgz", - "integrity": "sha512-NpO/87CKnF4Q9r8gMl6w+jPKOM/C089qExkViD9cPvcFZEnyVOu7ucGzcMmTcabWOU62iQTOkRViPYr6XaK0LQ==", - "requires": { - "@jimp/plugin-blit": "^0.6.4", - "@jimp/plugin-blur": "^0.6.4", - "@jimp/plugin-color": "^0.6.4", - "@jimp/plugin-contain": "^0.6.4", - "@jimp/plugin-cover": "^0.6.4", - "@jimp/plugin-crop": "^0.6.4", - "@jimp/plugin-displace": "^0.6.4", - "@jimp/plugin-dither": "^0.6.4", - "@jimp/plugin-flip": "^0.6.4", - "@jimp/plugin-gaussian": "^0.6.4", - "@jimp/plugin-invert": "^0.6.4", - "@jimp/plugin-mask": "^0.6.4", - "@jimp/plugin-normalize": "^0.6.4", - "@jimp/plugin-print": "^0.6.4", - "@jimp/plugin-resize": "^0.6.4", - "@jimp/plugin-rotate": "^0.6.4", - "@jimp/plugin-scale": "^0.6.4", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.6.8.tgz", + "integrity": "sha512-fMcTI72Vn/Lz6JftezTURmyP5ml/xGMe0Ljx2KRJ85IWyP33vDmGIUuutFiBEbh2+y7lRT+aTSmjs0QGa/xTmQ==", + "requires": { + "@jimp/plugin-blit": "^0.6.8", + "@jimp/plugin-blur": "^0.6.8", + "@jimp/plugin-color": "^0.6.8", + "@jimp/plugin-contain": "^0.6.8", + "@jimp/plugin-cover": "^0.6.8", + "@jimp/plugin-crop": "^0.6.8", + "@jimp/plugin-displace": "^0.6.8", + "@jimp/plugin-dither": "^0.6.8", + "@jimp/plugin-flip": "^0.6.8", + "@jimp/plugin-gaussian": "^0.6.8", + "@jimp/plugin-invert": "^0.6.8", + "@jimp/plugin-mask": "^0.6.8", + "@jimp/plugin-normalize": "^0.6.8", + "@jimp/plugin-print": "^0.6.8", + "@jimp/plugin-resize": "^0.6.8", + "@jimp/plugin-rotate": "^0.6.8", + "@jimp/plugin-scale": "^0.6.8", "core-js": "^2.5.7", "timm": "^1.6.1" } }, "@jimp/png": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.6.4.tgz", - "integrity": "sha512-qv3oo6ll3XWVIToBwVC1wQX0MFKwpxbe2o+1ld9B4ZDavqvAHzalzcmTd/iyooI85CVDAcC3RRDo66oiizGZCQ==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.6.8.tgz", + "integrity": "sha512-JHHg/BZ7KDtHQrcG+a7fztw45rdf7okL/YwkN4qU5FH7Fcrp41nX5QnRviDtD9hN+GaNC7kvjvcqRAxW25qjew==", "requires": { - "@jimp/utils": "^0.6.4", + "@jimp/utils": "^0.6.8", "core-js": "^2.5.7", "pngjs": "^3.3.3" } }, "@jimp/tiff": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.6.4.tgz", - "integrity": "sha512-8/vD4qleexmhPdppiu6fSstj/n/kGNTn8iIlf1emiqOuMN2PL9q5GOPDWU0xWdGNyJMMIDXJPgUFUkKfqXdg7w==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.6.8.tgz", + "integrity": "sha512-iWHbxd+0IKWdJyJ0HhoJCGYmtjPBOusz1z1HT/DnpePs/Lo3TO4d9ALXqYfUkyG74ZK5jULZ69KLtwuhuJz1bg==", "requires": { "core-js": "^2.5.7", "utif": "^2.0.1" } }, "@jimp/types": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.6.4.tgz", - "integrity": "sha512-/EMbipQDg5U6DnBAgcSiydlMBRYoKhnaK7MJRImeTzhDJ6xfgNOF7lYq66o0kmaezKdG/cIwZ1CLecn2y3D8SQ==", - "requires": { - "@jimp/bmp": "^0.6.4", - "@jimp/gif": "^0.6.4", - "@jimp/jpeg": "^0.6.4", - "@jimp/png": "^0.6.4", - "@jimp/tiff": "^0.6.4", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.6.8.tgz", + "integrity": "sha512-vCZ/Cp2osy69VP21XOBACfHI5HeR60Rfd4Jidj4W73UL+HrFWOtyQiJ7hlToyu1vI5mR/NsUQpzyQvz56ADm5A==", + "requires": { + "@jimp/bmp": "^0.6.8", + "@jimp/gif": "^0.6.8", + "@jimp/jpeg": "^0.6.8", + "@jimp/png": "^0.6.8", + "@jimp/tiff": "^0.6.8", "core-js": "^2.5.7", "timm": "^1.6.1" } }, "@jimp/utils": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.6.4.tgz", - "integrity": "sha512-EFQurCyEnZLSM2Q1BYDTUmsOJPSOYEQd18Fvq8bGo8hnBHoGLWLWWyNi2l4cYhtpKmIXyhvQqa6/WaEpKPzvqA==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.6.8.tgz", + "integrity": "sha512-7RDfxQ2C/rarNG9iso5vmnKQbcvlQjBIlF/p7/uYj72WeZgVCB+5t1fFBKJSU4WhniHX4jUMijK+wYGE3Y3bGw==", "requires": { "core-js": "^2.5.7" } @@ -1386,10 +1378,28 @@ "glob-to-regexp": "^0.3.0" } }, + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" + } + }, "@nodelib/fs.stat": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", - "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + }, + "@nodelib/fs.walk": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "requires": { + "@nodelib/fs.scandir": "2.1.3", + "fastq": "^1.6.0" + } }, "@pieh/friendly-errors-webpack-plugin": { "version": "1.7.0-chalk-2", @@ -1400,6 +1410,52 @@ "error-stack-parser": "^2.0.0", "string-width": "^2.0.0", "strip-ansi": "^3" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + } + } + } } }, "@reach/router": { @@ -1415,122 +1471,135 @@ } }, "@sindresorhus/is": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", - "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==" + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" }, "@styled-system/background": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/background/-/background-5.1.1.tgz", - "integrity": "sha512-AtcDYXVO3Rfui2jZGNBuFinqx25FQ54d6d8JKRPd4g/5wlyw24hgps6VvB3fqNgsA6JKwulIuZf9mfUX4RnPFg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/background/-/background-5.1.2.tgz", + "integrity": "sha512-jtwH2C/U6ssuGSvwTN3ri/IyjdHb8W9X/g8Y0JLcrH02G+BW3OS8kZdHphF1/YyRklnrKrBT2ngwGUK6aqqV3A==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/border": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/border/-/border-5.1.1.tgz", - "integrity": "sha512-N4jSiyq18zfY2xg1G2+adGCQ3s+geRYZPJ4R/PT/rZM7kbzCRr8xqHNg+OWkDiDTqgZ0eU7OSsRQD/byQpziZg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/border/-/border-5.1.2.tgz", + "integrity": "sha512-mSSxyQGXELdNSOlf4RqaOKsX+w6//zooR3p6qDj5Zgc5pIdEsJm63QLz6EST/6xBJwTX0Z1w4ExItdd6Q7rlTQ==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/color": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/color/-/color-5.1.1.tgz", - "integrity": "sha512-LHG5HQPZQdMNouXq9/cs/ovadNnnvPFkb6SkTqT9uxTUzTT416erGBaXZPGFqdwPpcDw4Y1MsmrAd1taeJEzvQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/color/-/color-5.1.2.tgz", + "integrity": "sha512-1kCkeKDZkt4GYkuFNKc7vJQMcOmTl3bJY3YBUs7fCNM6mMYJeT1pViQ2LwBSBJytj3AB0o4IdLBoepgSgGl5MA==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/core": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/core/-/core-5.1.1.tgz", - "integrity": "sha512-8doP1Uptn1nlNrG44O/DfiRtLvoh9OkPqxEv9Gp1YAKAD2RgRTTQou/wYw/4y4pqmV3Hjb3NA/5Nbp/Uo5eGUQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/core/-/core-5.1.2.tgz", + "integrity": "sha512-XclBDdNIy7OPOsN4HBsawG2eiWfCcuFt6gxKn1x4QfMIgeO6TOlA2pZZ5GWZtIhCUqEPTgIBta6JXsGyCkLBYw==", "requires": { "object-assign": "^4.1.1" } }, "@styled-system/css": { - "version": "5.0.23", - "resolved": "https://registry.npmjs.org/@styled-system/css/-/css-5.0.23.tgz", - "integrity": "sha512-yC3S0Iox8OTPAyrP1t5yY9nURUICcUdhVYOkwffftuxa5+txxI4qkT2e9JNCc2aaem+DG8mlXTdnYefjqge5wg==" + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@styled-system/css/-/css-5.1.4.tgz", + "integrity": "sha512-79IFT37Kxb6dlbx/0hwIGOakNHkK5oU3cMypGziShnEK8WMgK/+vuAi4MHO7uLI+FZ5U8MGYvGY9Gtk0mBzxSg==" }, "@styled-system/flexbox": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/flexbox/-/flexbox-5.1.1.tgz", - "integrity": "sha512-r9kBiCpXJee4zUQJnBom/c8d2CfUXEqrnZ5sdH62RsisoAByJ6vF5a3jI3zQXc8diEHjvNaunZL+K3gQjwJQGg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/flexbox/-/flexbox-5.1.2.tgz", + "integrity": "sha512-6hHV52+eUk654Y1J2v77B8iLeBNtc+SA3R4necsu2VVinSD7+XY5PCCEzBFaWs42dtOEDIa2lMrgL0YBC01mDQ==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/grid": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/grid/-/grid-5.1.1.tgz", - "integrity": "sha512-vzBNBg62syA62jEpxS21QEIwgndtxFgpCWWpitytApAybEll0mZctB06eOFhFgSNgarzOyox+1NdETB5h9KGnw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/grid/-/grid-5.1.2.tgz", + "integrity": "sha512-K3YiV1KyHHzgdNuNlaw8oW2ktMuGga99o1e/NAfTEi5Zsa7JXxzwEnVSDSBdJC+z6R8WYTCYRQC6bkVFcvdTeg==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/layout": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/layout/-/layout-5.1.1.tgz", - "integrity": "sha512-a0YnXNlORdpfcxejQEwMGd1k+pamRj+VjnAIafRdFBxBXsw55T8eG0iqWEs8U/d3i0+isKcfIyw/9OrElsksBg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/layout/-/layout-5.1.2.tgz", + "integrity": "sha512-wUhkMBqSeacPFhoE9S6UF3fsMEKFv91gF4AdDWp0Aym1yeMPpqz9l9qS/6vjSsDPF7zOb5cOKC3tcKKOMuDCPw==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/position": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/position/-/position-5.1.1.tgz", - "integrity": "sha512-75+EvQA5Juh+Zbq1Hkcm0QHx5GwEGoG7BABpG/n/K0Uz2aBGKVKJ4Y3NmPRvSS7fl1Ktl7azIGAPW9XOZ9TdHA==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/position/-/position-5.1.2.tgz", + "integrity": "sha512-60IZfMXEOOZe3l1mCu6sj/2NAyUmES2kR9Kzp7s2D3P4qKsZWxD1Se1+wJvevb+1TP+ZMkGPEYYXRyU8M1aF5A==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/shadow": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/shadow/-/shadow-5.1.1.tgz", - "integrity": "sha512-axdgRJ0gU8Rbw/DS24G4AAQIxYjo/fMmqxiegWja2XZDpeljqjyiYfGc7Dad3fgc+DUMn3Jjc1fHcTziTGWA4g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/shadow/-/shadow-5.1.2.tgz", + "integrity": "sha512-wqniqYb7XuZM7K7C0d1Euxc4eGtqEe/lvM0WjuAFsQVImiq6KGT7s7is+0bNI8O4Dwg27jyu4Lfqo/oIQXNzAg==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/should-forward-prop": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/should-forward-prop/-/should-forward-prop-5.1.1.tgz", - "integrity": "sha512-vWgA9qtmo+Cjg63UiLNbuIHUA+nUMvl2tAFtiYE8KKIAz+CB8D11spVXE4JL89HG77sjuuQFwI5D778CKz7q6Q==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@styled-system/should-forward-prop/-/should-forward-prop-5.1.4.tgz", + "integrity": "sha512-WvKlXdbzz64QX8E66dlt/t+AsHhE5mJPyxMAufKeUKn5DSj+1w7CfLtwVH2oYje7XFcrcZOV9elzaeMWE0znTw==", "requires": { "@emotion/is-prop-valid": "^0.8.1", "@emotion/memoize": "^0.7.1", - "styled-system": "^5.1.1" + "styled-system": "^5.1.4" } }, "@styled-system/space": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/space/-/space-5.1.1.tgz", - "integrity": "sha512-hwF938Zx83YRZmk30HtBE2EPWT8Z8H3+Rvpkdg13Q6P93DpSNH8wIlIObFKSgcmbOcqXzvFlAYcQ3l6F6Hu3IA==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/space/-/space-5.1.2.tgz", + "integrity": "sha512-+zzYpR8uvfhcAbaPXhH8QgDAV//flxqxSjHiS9cDFQQUSznXMQmxJegbhcdEF7/eNnJgHeIXv1jmny78kipgBA==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/typography": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/typography/-/typography-5.1.1.tgz", - "integrity": "sha512-zqrA9+nboPl5h/VhSKdlsUDUciHKb+Ly9YSCsvYb0Di1vI0lnYAtHzbBmI1xsfQW5us1BNflUpirCAQJshJMSQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@styled-system/typography/-/typography-5.1.2.tgz", + "integrity": "sha512-BxbVUnN8N7hJ4aaPOd7wEsudeT7CxarR+2hns8XCX1zp0DFfbWw4xYa/olA0oQaqx7F1hzDg+eRaGzAJbF+jOg==", "requires": { - "@styled-system/core": "^5.1.1" + "@styled-system/core": "^5.1.2" } }, "@styled-system/variant": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@styled-system/variant/-/variant-5.1.1.tgz", - "integrity": "sha512-Gh3iBqksx+cTx5drqazu56KL5cJrGEdxMFQ/6Yo4ravrZd0dRmzBhsUh0+UWtSvfWfN0M0ziE3m/Zu4ZKMHMaQ==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@styled-system/variant/-/variant-5.1.4.tgz", + "integrity": "sha512-4bI2AYQfWU/ljvWlysKU8T+6gsVx5xXEI/yBvg2De7Jd6o03ZQ9tsL3OJwbzyMkIKg+UZp7YG190txEOb8K6tg==", + "requires": { + "@styled-system/core": "^5.1.2", + "@styled-system/css": "^5.1.4" + } + }, + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", "requires": { - "@styled-system/core": "^5.1.1", - "@styled-system/css": "^5.0.23" + "defer-to-connect": "^1.0.1" } }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" + }, "@types/configstore": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@types/configstore/-/configstore-2.1.1.tgz", @@ -1541,6 +1610,11 @@ "resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.29.tgz", "integrity": "sha1-oeUUrfvZLwOiJLpU1pMRHb8fN1Q=" }, + "@types/eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==" + }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -1552,9 +1626,9 @@ "integrity": "sha1-62u3Qj2fiItjJmDcfS/T5po1ZD4=" }, "@types/glob": { - "version": "5.0.36", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.36.tgz", - "integrity": "sha512-KEzSKuP2+3oOjYYjujue6Z3Yqis5HKA1BsIC+jZ1v3lrRNdsqyNNtX0rQf6LSuI4DJJ2z5UV//zBZCcvM0xikg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", "requires": { "@types/events": "*", "@types/minimatch": "*", @@ -1562,9 +1636,22 @@ } }, "@types/history": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.2.tgz", - "integrity": "sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==" + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.3.tgz", + "integrity": "sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==" + }, + "@types/json-schema": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz", + "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==" + }, + "@types/mdast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz", + "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==", + "requires": { + "@types/unist": "*" + } }, "@types/minimatch": { "version": "3.0.3", @@ -1577,14 +1664,19 @@ "integrity": "sha1-fyrX7FX5FEgvybHsS7GuYCjUYGY=" }, "@types/node": { - "version": "7.10.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.10.7.tgz", - "integrity": "sha512-4I7+hXKyq7e1deuzX9udu0hPIYqSSkdKXtjow6fMnQ3OR9qkxIErGHbGY08YrfZJrCS1ajK8lOuzd0k3n2WM4A==" + "version": "13.1.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.4.tgz", + "integrity": "sha512-Lue/mlp2egZJoHXZr4LndxDAd7i/7SQYhV0EjWfb/a4/OZ6tuVwMCVPiwkU5nsEipxEf7hmkSU7Em5VQ8P5NGA==" + }, + "@types/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "@types/prop-types": { - "version": "15.7.1", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz", - "integrity": "sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==" + "version": "15.7.3", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", + "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" }, "@types/q": { "version": "1.5.2", @@ -1592,18 +1684,18 @@ "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==" }, "@types/reach__router": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.2.4.tgz", - "integrity": "sha512-a+MFhebeSGi0LwHZ0UhH/ke77rWtNQnt8YmaHnquSaY3HmyEi+BPQi3GhPcUPnC9X5BLw/qORw3BPxGb1mCtEw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.2.6.tgz", + "integrity": "sha512-Oh5DAVr/L2svBvubw6QEFpXGu295Y406BPs4i9t1n2pp7M+q3pmCmhzb9oZV5wncR41KCD3NHl1Yhi7uKnTPsA==", "requires": { "@types/history": "*", "@types/react": "*" } }, "@types/react": { - "version": "16.9.2", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.2.tgz", - "integrity": "sha512-jYP2LWwlh+FTqGd9v7ynUKZzjj98T8x7Yclz479QdRhHfuW9yQ+0jjnD31eXSXutmBpppj5PYNLYLRfnZJvcfg==", + "version": "16.9.17", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.17.tgz", + "integrity": "sha512-UP27In4fp4sWF5JgyV6pwVPAQM83Fj76JOcg02X5BZcpSu5Wx+fP9RMqc2v0ssBoQIFvD5JdKY41gjJJKmw6Bg==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -1630,166 +1722,223 @@ } }, "@types/vfile-message": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-1.0.1.tgz", - "integrity": "sha512-mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-2.0.0.tgz", + "integrity": "sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==", "requires": { - "@types/node": "*", - "@types/unist": "*" + "vfile-message": "*" } }, - "@webassemblyjs/ast": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz", - "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==", + "@typescript-eslint/eslint-plugin": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.15.0.tgz", + "integrity": "sha512-XRJFznI5v4K1WvIrWmjFjBAdQWaUTz4xJEdqR7+wAFsv6Q9dP3mOlE6BMNT3pdlp9eF1+bC5m5LZTmLMqffCVw==", "requires": { - "@webassemblyjs/helper-module-context": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/wast-parser": "1.7.11" + "@typescript-eslint/experimental-utils": "2.15.0", + "eslint-utils": "^1.4.3", + "functional-red-black-tree": "^1.0.1", + "regexpp": "^3.0.0", + "tsutils": "^3.17.1" + }, + "dependencies": { + "regexpp": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz", + "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==" + } } }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz", - "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==" - }, - "@webassemblyjs/helper-api-error": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz", - "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==" - }, - "@webassemblyjs/helper-buffer": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz", - "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==" - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz", - "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==", + "@typescript-eslint/experimental-utils": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.15.0.tgz", + "integrity": "sha512-Qkxu5zndY5hqlcQkmA88gfLvqQulMpX/TN91XC7OuXsRf4XG5xLGie0sbpX97o/oeccjeZYRMipIsjKk/tjDHA==", "requires": { - "@webassemblyjs/wast-printer": "1.7.11" + "@types/json-schema": "^7.0.3", + "@typescript-eslint/typescript-estree": "2.15.0", + "eslint-scope": "^5.0.0" } }, - "@webassemblyjs/helper-fsm": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz", - "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==" + "@typescript-eslint/parser": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.15.0.tgz", + "integrity": "sha512-6iSgQsqAYTaHw59t0tdjzZJluRAjswdGltzKEdLtcJOxR2UVTPHYvZRqkAVGCkaMVb6Fpa60NnuozNCvsSpA9g==", + "requires": { + "@types/eslint-visitor-keys": "^1.0.0", + "@typescript-eslint/experimental-utils": "2.15.0", + "@typescript-eslint/typescript-estree": "2.15.0", + "eslint-visitor-keys": "^1.1.0" + } + }, + "@typescript-eslint/typescript-estree": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.15.0.tgz", + "integrity": "sha512-L6Pog+w3VZzXkAdyqA0VlwybF8WcwZX+mufso86CMxSdWmcizJ38lgBdpqTbc9bo92iyi0rOvmATKiwl+amjxg==", + "requires": { + "debug": "^4.1.1", + "eslint-visitor-keys": "^1.1.0", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash.unescape": "4.0.1", + "semver": "^6.3.0", + "tsutils": "^3.17.1" + } + }, + "@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", + "requires": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } + }, + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", + "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==" + }, + "@webassemblyjs/helper-api-error": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", + "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" + }, + "@webassemblyjs/helper-buffer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", + "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==" + }, + "@webassemblyjs/helper-code-frame": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", + "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", + "requires": { + "@webassemblyjs/wast-printer": "1.8.5" + } + }, + "@webassemblyjs/helper-fsm": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz", + "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==" }, "@webassemblyjs/helper-module-context": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz", - "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==" + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", + "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "mamacro": "^0.0.3" + } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz", - "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==" + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" }, "@webassemblyjs/helper-wasm-section": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz", - "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", + "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-buffer": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/wasm-gen": "1.7.11" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5" } }, "@webassemblyjs/ieee754": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz", - "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", + "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz", - "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", + "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", "requires": { - "@xtuc/long": "4.2.1" + "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz", - "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==" + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", + "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==" }, "@webassemblyjs/wasm-edit": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz", - "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", + "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-buffer": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/helper-wasm-section": "1.7.11", - "@webassemblyjs/wasm-gen": "1.7.11", - "@webassemblyjs/wasm-opt": "1.7.11", - "@webassemblyjs/wasm-parser": "1.7.11", - "@webassemblyjs/wast-printer": "1.7.11" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/helper-wasm-section": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-opt": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "@webassemblyjs/wast-printer": "1.8.5" } }, "@webassemblyjs/wasm-gen": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz", - "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", + "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/ieee754": "1.7.11", - "@webassemblyjs/leb128": "1.7.11", - "@webassemblyjs/utf8": "1.7.11" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" } }, "@webassemblyjs/wasm-opt": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz", - "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", + "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-buffer": "1.7.11", - "@webassemblyjs/wasm-gen": "1.7.11", - "@webassemblyjs/wasm-parser": "1.7.11" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5" } }, "@webassemblyjs/wasm-parser": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz", - "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", + "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-api-error": "1.7.11", - "@webassemblyjs/helper-wasm-bytecode": "1.7.11", - "@webassemblyjs/ieee754": "1.7.11", - "@webassemblyjs/leb128": "1.7.11", - "@webassemblyjs/utf8": "1.7.11" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" } }, "@webassemblyjs/wast-parser": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz", - "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", + "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/floating-point-hex-parser": "1.7.11", - "@webassemblyjs/helper-api-error": "1.7.11", - "@webassemblyjs/helper-code-frame": "1.7.11", - "@webassemblyjs/helper-fsm": "1.7.11", - "@xtuc/long": "4.2.1" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/floating-point-hex-parser": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-code-frame": "1.8.5", + "@webassemblyjs/helper-fsm": "1.8.5", + "@xtuc/long": "4.2.2" } }, "@webassemblyjs/wast-printer": { - "version": "1.7.11", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz", - "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", + "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/wast-parser": "1.7.11", - "@xtuc/long": "4.2.1" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5", + "@xtuc/long": "4.2.2" } }, "@xtuc/ieee754": { @@ -1798,9 +1947,9 @@ "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" }, "@xtuc/long": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz", - "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, "accepts": { "version": "1.3.7", @@ -1812,40 +1961,34 @@ } }, "acorn": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz", - "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==" - }, - "acorn-dynamic-import": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", - "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", - "requires": { - "acorn": "^5.0.0" - }, - "dependencies": { - "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" - } - } + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", + "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==" }, "acorn-jsx": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz", - "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", + "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==" }, "address": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/address/-/address-1.1.0.tgz", - "integrity": "sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz", + "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==" }, "after": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", @@ -1880,11 +2023,6 @@ "string-width": "^3.0.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -1904,14 +2042,6 @@ "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } } } }, @@ -1921,11 +2051,11 @@ "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==" }, "ansi-escapes": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", - "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", + "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", "requires": { - "type-fest": "^0.5.2" + "type-fest": "^0.8.1" } }, "ansi-html": { @@ -1934,9 +2064,9 @@ "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=" }, "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "ansi-styles": { "version": "3.2.1", @@ -2047,12 +2177,13 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", + "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.7.0" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" } }, "array-iterate": { @@ -2071,12 +2202,9 @@ "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=" }, "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "requires": { - "array-uniq": "^1.0.1" - } + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" }, "array-uniq": { "version": "1.0.3", @@ -2088,15 +2216,25 @@ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, + "array.prototype.flat": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz", + "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, "arraybuffer.slice": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==" }, "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "optional": true }, "asap": { "version": "2.0.6", @@ -2191,36 +2329,33 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "auto-bind": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-2.1.0.tgz", - "integrity": "sha512-qZuFvkes1eh9lB2mg8/HG18C+5GIO51r+RrCSst/lh+i5B1CtVlkhTE488M805Nr3dKl0sM/pIFKSKUIlg3zUg==", - "optional": true, - "requires": { - "@types/react": "^16.8.12" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-3.0.0.tgz", + "integrity": "sha512-v0A231a/lfOo6kxQtmEkdBfTApvC21aJYukA8pkKnoTvVqh3Wmm7/Rwy4GBCHTTHVoLVA5qsBDDvf1XY1nIV2g==", + "optional": true }, "autoprefixer": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", - "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.3.tgz", + "integrity": "sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==", "requires": { - "browserslist": "^4.6.3", - "caniuse-lite": "^1.0.30000980", + "browserslist": "^4.8.0", + "caniuse-lite": "^1.0.30001012", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^7.0.17", - "postcss-value-parser": "^4.0.0" + "postcss": "^7.0.23", + "postcss-value-parser": "^4.0.2" }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } } } @@ -2231,9 +2366,9 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz", + "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==" }, "axios": { "version": "0.19.0", @@ -2242,21 +2377,15 @@ "requires": { "follow-redirects": "1.5.10", "is-buffer": "^2.0.2" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" - } } }, "axobject-query": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", - "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.1.tgz", + "integrity": "sha512-lF98xa/yvy6j3fBHAgQXIYl+J4eZadOSqsPojemUqClzNbBV38wWGpUbQbVEyf4eUF5yF7eHmGgGA2JiHyjeqw==", "requires": { - "ast-types-flow": "0.0.7" + "@babel/runtime": "^7.7.4", + "@babel/runtime-corejs3": "^7.7.4" } }, "babel-code-frame": { @@ -2269,6 +2398,11 @@ "js-tokens": "^3.0.2" }, "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", @@ -2291,6 +2425,14 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -2304,16 +2446,16 @@ "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==" }, "babel-eslint": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-9.0.0.tgz", - "integrity": "sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz", + "integrity": "sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==", "requires": { "@babel/code-frame": "^7.0.0", "@babel/parser": "^7.0.0", "@babel/traverse": "^7.0.0", "@babel/types": "^7.0.0", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "^1.0.0" + "eslint-visitor-keys": "^1.0.0", + "resolve": "^1.12.0" } }, "babel-extract-comments": { @@ -2333,13 +2475,6 @@ "loader-utils": "^1.0.2", "mkdirp": "^0.5.1", "pify": "^4.0.1" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } } }, "babel-plugin-add-module-exports": { @@ -2348,25 +2483,74 @@ "integrity": "sha512-hC37mm7aAdEb1n8SgggG8a1QuhZapsY/XLCi4ETSH6AVjXBCWEa50CXlOsAMPPWLnSx5Ns6mzz39uvuseh0Xjg==", "requires": { "chokidar": "^2.0.4" + }, + "dependencies": { + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "optional": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "optional": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "optional": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "optional": true + } } }, "babel-plugin-dynamic-import-node": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-1.2.0.tgz", - "integrity": "sha512-yeDwKaLgGdTpXL7RgGt5r6T4LmnTza/hUn5Ul8uZSGGMtEjYo13Nxai7SQaGCTEzUtg9Zq9qJn0EjEr7SeSlTQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", + "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", "requires": { - "babel-plugin-syntax-dynamic-import": "^6.18.0" + "object.assign": "^4.1.0" } }, "babel-plugin-emotion": { - "version": "10.0.17", - "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.17.tgz", - "integrity": "sha512-KNuBadotqYWpQexHhHOu7M9EV1j2c+Oh/JJqBfEQDusD6mnORsCZKHkl+xYwK82CPQ/23wRrsBIEYnKjtbMQJw==", + "version": "10.0.27", + "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.27.tgz", + "integrity": "sha512-SUNYcT4FqhOqvwv0z1oeYhqgheU8qrceLojuHyX17ngo7WtWqN5I9l3IGHzf21Xraj465CVzF4IvOlAF+3ed0A==", "requires": { "@babel/helper-module-imports": "^7.0.0", - "@emotion/hash": "0.7.2", - "@emotion/memoize": "0.7.2", - "@emotion/serialize": "^0.11.10", + "@emotion/hash": "0.7.4", + "@emotion/memoize": "0.7.4", + "@emotion/serialize": "^0.11.15", "babel-plugin-macros": "^2.0.0", "babel-plugin-syntax-jsx": "^6.18.0", "convert-source-map": "^1.5.0", @@ -2376,19 +2560,19 @@ } }, "babel-plugin-macros": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz", - "integrity": "sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", + "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", "requires": { - "@babel/runtime": "^7.4.2", - "cosmiconfig": "^5.2.0", - "resolve": "^1.10.0" + "@babel/runtime": "^7.7.2", + "cosmiconfig": "^6.0.0", + "resolve": "^1.12.0" } }, "babel-plugin-remove-graphql-queries": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.3.tgz", - "integrity": "sha512-xuOzXil34XPhkIGE/1EmCyfPlMgX2sXBaNf3n+ico5pM3HNrKc8vHcng9CoK2jnSXEwoX5wASFfKZg1eNNdz1w==" + "version": "2.7.19", + "resolved": "https://registry.npmjs.org/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.7.19.tgz", + "integrity": "sha512-/DS620ztyyrqrqjmz/KHDt++ktn+4RdvfDf5KCUmt6iJOglgNm7uHkE+snuvvL/xhNNuuPBLErc23Q0cR6MSiQ==" }, "babel-plugin-styled-components": { "version": "1.10.6", @@ -2401,11 +2585,6 @@ "lodash": "^4.17.11" } }, - "babel-plugin-syntax-dynamic-import": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", - "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=" - }, "babel-plugin-syntax-jsx": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", @@ -2416,11 +2595,6 @@ "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=" }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "7.0.0-beta.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz", - "integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==" - }, "babel-plugin-transform-object-rest-spread": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", @@ -2435,54 +2609,22 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" }, - "babel-preset-fbjs": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.2.0.tgz", - "integrity": "sha512-5Jo+JeWiVz2wHUUyAlvb/sSYnXNig9r+HqGAOSfh5Fzxp7SnAaR/tEGRJ1ZX7C77kfk82658w6R5Z+uPATTD9g==", - "requires": { - "@babel/plugin-proposal-class-properties": "^7.0.0", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-syntax-class-properties": "^7.0.0", - "@babel/plugin-syntax-flow": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "@babel/plugin-transform-arrow-functions": "^7.0.0", - "@babel/plugin-transform-block-scoped-functions": "^7.0.0", - "@babel/plugin-transform-block-scoping": "^7.0.0", - "@babel/plugin-transform-classes": "^7.0.0", - "@babel/plugin-transform-computed-properties": "^7.0.0", - "@babel/plugin-transform-destructuring": "^7.0.0", - "@babel/plugin-transform-flow-strip-types": "^7.0.0", - "@babel/plugin-transform-for-of": "^7.0.0", - "@babel/plugin-transform-function-name": "^7.0.0", - "@babel/plugin-transform-literals": "^7.0.0", - "@babel/plugin-transform-member-expression-literals": "^7.0.0", - "@babel/plugin-transform-modules-commonjs": "^7.0.0", - "@babel/plugin-transform-object-super": "^7.0.0", - "@babel/plugin-transform-parameters": "^7.0.0", - "@babel/plugin-transform-property-literals": "^7.0.0", - "@babel/plugin-transform-react-display-name": "^7.0.0", - "@babel/plugin-transform-react-jsx": "^7.0.0", - "@babel/plugin-transform-shorthand-properties": "^7.0.0", - "@babel/plugin-transform-spread": "^7.0.0", - "@babel/plugin-transform-template-literals": "^7.0.0", - "babel-plugin-syntax-trailing-function-commas": "^7.0.0-beta.0" - } - }, "babel-preset-gatsby": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.10.tgz", - "integrity": "sha512-MQmh2nERGZvxhMSr5M00AK7mCWSIZBazX8vn75oUdbPQ9LI68xj3i1S0q01RJid+yFFI0k+oEAAKkYAa8TRyqA==", - "requires": { - "@babel/plugin-proposal-class-properties": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.0.0", - "@babel/plugin-transform-runtime": "^7.0.0", - "@babel/plugin-transform-spread": "^7.2.2", - "@babel/preset-env": "^7.4.1", - "@babel/preset-react": "^7.0.0", - "@babel/runtime": "^7.4.5", - "babel-plugin-dynamic-import-node": "^1.2.0", - "babel-plugin-macros": "^2.6.1", + "version": "0.2.26", + "resolved": "https://registry.npmjs.org/babel-preset-gatsby/-/babel-preset-gatsby-0.2.26.tgz", + "integrity": "sha512-qOM26AhAPW5xetUj579jBFICg16sqFHf3dPptRXi3zS7HpEHbtsOvB9VB68MEUj+WZrrlbR/EQuT69GA1XiBdQ==", + "requires": { + "@babel/plugin-proposal-class-properties": "^7.7.4", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4", + "@babel/plugin-proposal-optional-chaining": "^7.7.5", + "@babel/plugin-syntax-dynamic-import": "^7.7.4", + "@babel/plugin-transform-runtime": "^7.7.6", + "@babel/plugin-transform-spread": "^7.7.4", + "@babel/preset-env": "^7.7.6", + "@babel/preset-react": "^7.7.4", + "@babel/runtime": "^7.7.6", + "babel-plugin-dynamic-import-node": "^2.3.0", + "babel-plugin-macros": "^2.8.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24" } }, @@ -2583,9 +2725,9 @@ "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" }, "base64id": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", - "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", + "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==" }, "batch": { "version": "0.6.1", @@ -2609,11 +2751,11 @@ } }, "better-opn": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-0.1.4.tgz", - "integrity": "sha512-7V92EnOdjWOB9lKsVsthCcu1FdFT5qNJVTiOgGy5wPuTsSptMMxm2G1FGHgWu22MyX3tyDRzTWk4lxY2Ppdu7A==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-1.0.0.tgz", + "integrity": "sha512-q3eO2se4sFbTERB1dFBDdjTiIIpRohMErpwBX21lhPvmgmQNNrcQj0zbWRhMREDesJvyod9kxBS3kOtdAvkB/A==", "requires": { - "opn": "^5.4.0" + "open": "^6.4.0" } }, "better-queue": { @@ -2646,151 +2788,89 @@ "execa": "^0.7.0", "p-map-series": "^1.0.0", "tempfile": "^2.0.0" - } - }, - "bin-check": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz", - "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==", - "requires": { - "execa": "^0.7.0", - "executable": "^4.1.0" - } - }, - "bin-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz", - "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==", - "requires": { - "execa": "^1.0.0", - "find-versions": "^3.0.0" }, "dependencies": { "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", + "lru-cache": "^4.0.1", "shebang-command": "^1.2.0", "which": "^1.2.9" } }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } - } - } - }, - "bin-version-check": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz", - "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==", - "requires": { - "bin-version": "^3.0.0", - "semver": "^5.6.0", - "semver-truncate": "^1.1.2" - } - }, - "bin-wrapper": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz", - "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==", - "requires": { - "bin-check": "^4.1.0", - "bin-version-check": "^4.0.0", - "download": "^7.1.0", - "import-lazy": "^3.1.0", - "os-filter-obj": "^2.0.0", - "pify": "^4.0.1" - }, - "dependencies": { "download": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz", - "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==", + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz", + "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==", "requires": { - "archive-type": "^4.0.0", - "caw": "^2.0.1", + "caw": "^2.0.0", "content-disposition": "^0.5.2", - "decompress": "^4.2.0", + "decompress": "^4.0.0", "ext-name": "^5.0.0", - "file-type": "^8.1.0", + "file-type": "5.2.0", "filenamify": "^2.0.0", "get-stream": "^3.0.0", - "got": "^8.3.1", - "make-dir": "^1.2.0", - "p-event": "^2.1.0", + "got": "^7.0.0", + "make-dir": "^1.0.0", + "p-event": "^1.0.0", "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "file-type": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz", - "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "got": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", - "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", + "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", + "decompress-response": "^3.2.0", "duplexer3": "^0.1.4", "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", + "is-plain-obj": "^1.1.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", "isurl": "^1.0.0-alpha5", "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.4.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^1.1.1", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "url-parse-lax": "^1.0.0", "url-to-options": "^1.0.1" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } } }, - "import-lazy": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz", - "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==" + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } }, "make-dir": { "version": "1.3.0", @@ -2798,68 +2878,192 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } } }, "p-cancelable": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", - "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" }, "p-event": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz", - "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz", + "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=", "requires": { - "p-timeout": "^2.0.1" + "p-timeout": "^1.1.1" } }, "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", - "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", + "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", "requires": { "p-finally": "^1.0.0" } }, "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "requires": { + "prepend-http": "^1.0.1" + } + } + } + }, + "bin-check": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz", + "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==", + "requires": { + "execa": "^0.7.0", + "executable": "^4.1.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + } + } + }, + "bin-version": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz", + "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==", + "requires": { + "execa": "^1.0.0", + "find-versions": "^3.0.0" + }, + "dependencies": { + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "requires": { - "prepend-http": "^2.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } } } }, + "bin-version-check": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz", + "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==", + "requires": { + "bin-version": "^3.0.0", + "semver": "^5.6.0", + "semver-truncate": "^1.1.2" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "bin-wrapper": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz", + "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==", + "requires": { + "bin-check": "^4.1.0", + "bin-version-check": "^4.0.0", + "download": "^7.1.0", + "import-lazy": "^3.1.0", + "os-filter-obj": "^2.0.0", + "pify": "^4.0.1" + }, + "dependencies": { + "import-lazy": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz", + "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==" + } + } + }, "binary-extensions": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", + "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", "requires": { - "readable-stream": "^2.3.5", - "safe-buffer": "^5.1.1" + "readable-stream": "^3.0.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "blob": { @@ -2868,9 +3072,9 @@ "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" }, "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "bmp-js": { "version": "0.1.0", @@ -2945,62 +3149,63 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "boxen": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz", - "integrity": "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", + "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", "requires": { "ansi-align": "^3.0.0", "camelcase": "^5.3.1", - "chalk": "^2.4.2", + "chalk": "^3.0.0", "cli-boxes": "^2.2.0", - "string-width": "^3.0.0", - "term-size": "^1.2.0", - "type-fest": "^0.3.0", - "widest-line": "^2.0.0" + "string-width": "^4.1.0", + "term-size": "^2.1.0", + "type-fest": "^0.8.1", + "widest-line": "^3.1.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "requires": { - "ansi-regex": "^4.1.0" + "color-name": "~1.1.4" } }, - "type-fest": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", - "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==" + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -3119,18 +3324,10 @@ "electron-to-chromium": "^1.3.47" } }, - "bser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz", - "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==", - "requires": { - "node-int64": "^0.4.0" - } - }, "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", @@ -3197,15 +3394,16 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "cacache": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", - "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", + "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", "requires": { "bluebird": "^3.5.5", "chownr": "^1.1.1", "figgy-pudding": "^3.5.1", "glob": "^7.1.4", "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "mkdirp": "^0.5.1", @@ -3225,15 +3423,10 @@ "yallist": "^3.0.2" } }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" } } }, @@ -3254,23 +3447,12 @@ } }, "cache-manager": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.10.0.tgz", - "integrity": "sha512-IuPx05r5L0uZyBDYicB2Llld1o+/1WYjoHUnrC0TNQejMAnkoYxYS9Y8Uwr+lIBytDiyu7dwwmBCup2M9KugwQ==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.10.1.tgz", + "integrity": "sha512-bk17v9IkLqNcbCzggEh82LEJhjHp+COnL57L7a0ESbM/cOuXIIBatdVjD/ps7vOsofI48++zAC14Ye+8v50flg==", "requires": { "async": "1.5.2", "lru-cache": "4.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz", - "integrity": "sha1-tcvwFVbBaWb+vlTO7A+03JDfbCg=", - "requires": { - "pseudomap": "^1.0.1", - "yallist": "^2.0.0" - } - } } }, "cache-manager-fs-hash": { @@ -3283,38 +3465,36 @@ } }, "cacheable-request": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", - "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", - "requires": { - "clone-response": "1.0.2", - "get-stream": "3.0.0", - "http-cache-semantics": "3.8.1", - "keyv": "3.0.0", - "lowercase-keys": "1.0.0", - "normalize-url": "2.0.1", - "responselike": "1.0.2" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", + "requires": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" }, "dependencies": { - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=" - }, - "normalize-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", - "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", "requires": { - "prepend-http": "^2.0.0", - "query-string": "^5.0.1", - "sort-keys": "^2.0.0" + "pump": "^3.0.0" } }, - "prepend-http": { + "lowercase-keys": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + }, + "normalize-url": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" } } }, @@ -3329,6 +3509,13 @@ "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "requires": { "callsites": "^2.0.0" + }, + "dependencies": { + "callsites": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" + } } }, "caller-path": { @@ -3345,14 +3532,14 @@ "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=" }, "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "camelcase-keys": { "version": "2.1.0", @@ -3387,26 +3574,21 @@ }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } } } }, "caniuse-lite": { - "version": "1.0.30000989", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz", - "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==" - }, - "capture-stack-trace": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", - "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==" + "version": "1.0.30001019", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz", + "integrity": "sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==" }, "caseless": { "version": "0.12.0", @@ -3499,43 +3681,104 @@ } }, "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", + "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.2.0" }, "dependencies": { - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - } - } - }, - "chownr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", - "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==" - }, - "chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "requires": { - "tslib": "^1.9.0" - } + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "optional": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "readdirp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", + "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", + "requires": { + "picomatch": "^2.0.4" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "chownr": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", + "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==" + }, + "chrome-trace-event": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", + "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", + "requires": { + "tslib": "^1.9.0" + } }, "ci-info": { "version": "2.0.0", @@ -3587,6 +3830,11 @@ } } }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" + }, "cli-boxes": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", @@ -3614,31 +3862,87 @@ "colors": "^1.1.2", "object-assign": "^4.1.0", "string-width": "^2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } } }, "cli-truncate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", - "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "optional": true, "requires": { - "slice-ansi": "^1.0.0", - "string-width": "^2.0.0" + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" }, "dependencies": { - "is-fullwidth-code-point": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "astral-regex": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "optional": true + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "optional": true }, "slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "optional": true, "requires": { - "is-fullwidth-code-point": "^2.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" } } } @@ -3660,21 +3964,21 @@ } }, "clipboardy": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz", - "integrity": "sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.1.0.tgz", + "integrity": "sha512-2pzOUxWcLlXWtn+Jd6js3o12TysNOOVes/aQfg+MT/35vrxWzedHlLwyoJpXjsFKWm95BTNEcMGD9+a7mKzZkQ==", "requires": { - "arch": "^2.1.0", - "execa": "^0.8.0" + "arch": "^2.1.1", + "execa": "^1.0.0" }, "dependencies": { "execa": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", - "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", @@ -3685,23 +3989,33 @@ } }, "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" }, "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } } } @@ -3775,9 +4089,9 @@ } }, "colors": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", - "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", "optional": true }, "combined-stream": { @@ -3799,9 +4113,9 @@ "integrity": "sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==" }, "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "common-tags": { "version": "1.8.0", @@ -3829,11 +4143,11 @@ "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=" }, "compressible": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz", - "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "requires": { - "mime-db": ">= 1.40.0 < 2" + "mime-db": ">= 1.43.0 < 2" } }, "compression": { @@ -3919,9 +4233,9 @@ } }, "confusing-browser-globals": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz", - "integrity": "sha512-lI7asCibVJ6Qd3FGU7mu4sfG4try4LX3+GVS+Gv8UlrEf2AeW57piecapnog2UHZSbcX/P/1UDWVaTsblowlZg==" + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz", + "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==" }, "connect-history-api-fallback": { "version": "1.6.0", @@ -3929,12 +4243,9 @@ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" }, "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "requires": { - "date-now": "^0.1.4" - } + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" }, "console-control-strings": { "version": "1.1.0", @@ -3970,14 +4281,14 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "convert-hrtime": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-hrtime/-/convert-hrtime-2.0.0.tgz", - "integrity": "sha1-Gb+yyRYvnhHC8Ewsed4rfoCVxic=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/convert-hrtime/-/convert-hrtime-3.0.0.tgz", + "integrity": "sha512-7V+KqSvMiHp8yWDuwfww06XleMWVVB9b9tURBx+G7UTADuo5hYPuowKloz4OzOqbPezxgo+fdQ1522WzPG4OeA==" }, "convert-source-map": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "requires": { "safe-buffer": "~5.1.1" } @@ -4011,49 +4322,54 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copyfiles": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-1.2.0.tgz", - "integrity": "sha1-qNo6xBqiIgrim9PFi2mEKU8sWTw=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.1.1.tgz", + "integrity": "sha512-y6DZHve80whydXzBal7r70TBgKMPKesVRR1Sn/raUu7Jh/i7iSLSyGvYaq0eMJ/3Y/CKghwzjY32q1WzEnpp3Q==", "requires": { "glob": "^7.0.5", - "ltcdr": "^2.2.1", "minimatch": "^3.0.3", "mkdirp": "^0.5.1", "noms": "0.0.0", - "through2": "^2.0.1" + "through2": "^2.0.1", + "yargs": "^13.2.4" } }, "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, "core-js-compat": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz", - "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.2.tgz", + "integrity": "sha512-+G28dzfYGtAM+XGvB1C5AS1ZPKfQ47HLhcdeIQdZgQnJVdp7/D0m+W/TErwhgsX6CujRUk/LebB6dCrKrtJrvQ==", "requires": { - "browserslist": "^4.6.6", - "semver": "^6.3.0" + "browserslist": "^4.8.3", + "semver": "7.0.0" }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" } } }, + "core-js-pure": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.2.tgz", + "integrity": "sha512-PRasaCPjjCB65au2dMBPtxuIR6LM8MVNdbIbN57KxcDV1FAYQWlF0pqje/HC2sM6nm/s9KqSTkMTU75pozaghA==" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -4069,25 +4385,15 @@ } }, "cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", + "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - }, - "dependencies": { - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - } + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.7.2" } }, "create-ecdh": { @@ -4099,14 +4405,6 @@ "elliptic": "^6.0.0" } }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", - "requires": { - "capture-stack-trace": "^1.0.0" - } - }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -4139,27 +4437,6 @@ "requires": { "fbjs": "^0.8.0", "gud": "^1.0.0" - }, - "dependencies": { - "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" - }, - "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", - "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" - } - } } }, "cross-fetch": { @@ -4184,13 +4461,22 @@ } }, "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "requires": { - "lru-cache": "^4.0.1", + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "crypt": { @@ -4360,12 +4646,19 @@ } }, "css-tree": { - "version": "1.0.0-alpha.33", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz", - "integrity": "sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==", + "version": "1.0.0-alpha.37", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", + "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", "requires": { "mdn-data": "2.0.4", - "source-map": "^0.5.3" + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } } }, "css-unit-converter": { @@ -4392,6 +4685,42 @@ "cssnano-preset-default": "^4.0.7", "is-resolvable": "^1.0.0", "postcss": "^7.0.0" + }, + "dependencies": { + "cosmiconfig": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", + "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", + "requires": { + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" + } + }, + "import-fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", + "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "requires": { + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + } } }, "cssnano-preset-default": { @@ -4455,33 +4784,17 @@ "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==" }, "csso": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz", - "integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz", + "integrity": "sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==", "requires": { - "css-tree": "1.0.0-alpha.29" - }, - "dependencies": { - "css-tree": { - "version": "1.0.0-alpha.29", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz", - "integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==", - "requires": { - "mdn-data": "~1.1.0", - "source-map": "^0.5.3" - } - }, - "mdn-data": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz", - "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==" - } + "css-tree": "1.0.0-alpha.37" } }, "csstype": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.6.tgz", - "integrity": "sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==" + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.8.tgz", + "integrity": "sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==" }, "currently-unhandled": { "version": "0.4.1", @@ -4502,9 +4815,9 @@ } }, "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", + "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, "damerau-levenshtein": { "version": "1.0.5", @@ -4519,15 +4832,10 @@ "assert-plus": "^1.0.0" } }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=" - }, "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { "ms": "^2.1.1" } @@ -4571,6 +4879,11 @@ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" } } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } }, @@ -4592,10 +4905,33 @@ "tar-stream": "^1.5.2" }, "dependencies": { + "bl": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", + "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, "file-type": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + }, + "tar-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", + "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", + "requires": { + "bl": "^1.0.0", + "buffer-alloc": "^1.2.0", + "end-of-stream": "^1.0.0", + "fs-constants": "^1.0.0", + "readable-stream": "^2.3.0", + "to-buffer": "^1.1.1", + "xtend": "^4.0.0" + } } } }, @@ -4659,13 +4995,26 @@ "object-assign": "^4.0.1", "pinkie-promise": "^2.0.0" } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } }, "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } }, "deep-extend": { "version": "0.6.0", @@ -4678,9 +5027,9 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "deepmerge": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz", - "integrity": "sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" }, "default-gateway": { "version": "4.2.0", @@ -4691,18 +5040,6 @@ "ip-regex": "^2.1.0" }, "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", @@ -4716,17 +5053,14 @@ "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } } } }, + "defer-to-connect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.1.tgz", + "integrity": "sha512-J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ==" + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -4773,22 +5107,27 @@ } }, "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "requires": { - "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz", + "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==", + "requires": { + "globby": "^10.0.1", + "graceful-fs": "^4.2.2", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.1", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "slash": "^3.0.0" }, "dependencies": { - "pify": { + "rimraf": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", + "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", + "requires": { + "glob": "^7.1.3" + } } } }, @@ -4814,9 +5153,9 @@ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", + "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "requires": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" @@ -4836,9 +5175,9 @@ } }, "detect-indent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", - "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=" + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", + "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==" }, "detect-libc": { "version": "1.0.3", @@ -4897,6 +5236,21 @@ "tslib": "^1.6.0" }, "dependencies": { + "@types/glob": { + "version": "5.0.36", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.36.tgz", + "integrity": "sha512-KEzSKuP2+3oOjYYjujue6Z3Yqis5HKA1BsIC+jZ1v3lrRNdsqyNNtX0rQf6LSuI4DJJ2z5UV//zBZCcvM0xikg==", + "requires": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "@types/node": { + "version": "7.10.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.10.9.tgz", + "integrity": "sha512-usSpgoUsRtO5xNV5YEPU8PPnHisFx8u0rokj1BPVn/hDF7zwUDzVLiuKZM38B7z8V2111Fj6kd4rGtQFUZpNOw==" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -4909,6 +5263,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "tmp": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", + "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "requires": { + "os-tmpdir": "~1.0.1" + } } } }, @@ -4923,27 +5285,11 @@ } }, "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" - }, - "dependencies": { - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } + "path-type": "^4.0.0" } }, "dns-equal": { @@ -4993,9 +5339,9 @@ } }, "dom-serializer": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz", - "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "requires": { "domelementtype": "^2.0.1", "entities": "^2.0.0" @@ -5049,53 +5395,33 @@ } }, "dotenv": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz", - "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=" + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, "download": { - "version": "6.2.5", - "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz", - "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz", + "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==", "requires": { - "caw": "^2.0.0", + "archive-type": "^4.0.0", + "caw": "^2.0.1", "content-disposition": "^0.5.2", - "decompress": "^4.0.0", + "decompress": "^4.2.0", "ext-name": "^5.0.0", - "file-type": "5.2.0", + "file-type": "^8.1.0", "filenamify": "^2.0.0", "get-stream": "^3.0.0", - "got": "^7.0.0", - "make-dir": "^1.0.0", - "p-event": "^1.0.0", + "got": "^8.3.1", + "make-dir": "^1.2.0", + "p-event": "^2.1.0", "pify": "^3.0.0" }, "dependencies": { - "file-type": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", - "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" - }, - "got": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", - "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", - "requires": { - "decompress-response": "^3.2.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-plain-obj": "^1.1.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^1.1.1", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "url-parse-lax": "^1.0.0", - "url-to-options": "^1.0.1" - } + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "make-dir": { "version": "1.3.0", @@ -5148,14 +5474,14 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.237", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.237.tgz", - "integrity": "sha512-SPAFjDr/7iiVK2kgTluwxela6eaWjjFkS9rO/iYpB/KGXgccUom5YC7OIf19c8m8GGptWxLU0Em8xM64A/N7Fg==" + "version": "1.3.327", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.327.tgz", + "integrity": "sha512-DNMd91VtKt44LIkFtpICxAWu/GSGFLUMDM/kFINJ3Oe47OimSnbMvO3ChkUCdUyit+pRdhdCcM3+i5bpli5gqg==" }, "elliptic": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", - "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", + "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", "requires": { "bn.js": "^4.4.0", "brorand": "^1.0.1", @@ -5190,55 +5516,42 @@ } }, "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "requires": { "once": "^1.4.0" } }, "engine.io": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.3.2.tgz", - "integrity": "sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz", + "integrity": "sha512-XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==", "requires": { "accepts": "~1.3.4", - "base64id": "1.0.0", + "base64id": "2.0.0", "cookie": "0.3.1", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.0", - "ws": "~6.1.0" + "debug": "~4.1.0", + "engine.io-parser": "~2.2.0", + "ws": "^7.1.2" }, "dependencies": { "cookie": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, "engine.io-client": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.2.tgz", - "integrity": "sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz", + "integrity": "sha512-a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==", "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", + "debug": "~4.1.0", + "engine.io-parser": "~2.2.0", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", @@ -5253,25 +5566,20 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "ws": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", + "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", "requires": { - "ms": "2.0.0" + "async-limiter": "~1.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, "engine.io-parser": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", - "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz", + "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==", "requires": { "after": "0.8.2", "arraybuffer.slice": "~0.0.7", @@ -5281,13 +5589,24 @@ } }, "enhanced-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", - "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", + "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", "requires": { "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", + "memory-fs": "^0.5.0", "tapable": "^1.0.0" + }, + "dependencies": { + "memory-fs": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", + "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", + "requires": { + "errno": "^0.1.3", + "readable-stream": "^2.0.1" + } + } } }, "entities": { @@ -5296,9 +5615,9 @@ "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==" }, "envinfo": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-5.12.1.tgz", - "integrity": "sha512-pwdo0/G3CIkQ0y6PCXq4RdkvId2elvtPCJMG0konqlrfkWQbf1DWeH9K2b/cvu2YgGvPPTOnonZxXM1gikFu1w==" + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz", + "integrity": "sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==" }, "eol": { "version": "0.8.1", @@ -5322,30 +5641,35 @@ } }, "error-stack-parser": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.3.tgz", - "integrity": "sha512-vRC4rKv87twMZy92X4+TmUdv3iYMsmePbpG/YguHsfzmZ8bYJZYYep7yrXH09yFUaCEPKgNK5X79+Yq7hwLVOA==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz", + "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==", "requires": { - "stackframe": "^1.0.4" + "stackframe": "^1.1.1" } }, "es-abstract": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", - "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", + "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", "requires": { - "es-to-primitive": "^1.2.0", + "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-keys": "^1.0.12" + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" } }, "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "requires": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -5353,9 +5677,9 @@ } }, "es6-promisify": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.1.tgz", - "integrity": "sha512-J3ZkwbEnnO+fGAKrjVpeUAnZshAdfZvbhQpqfIH9kSAspReRC4nJnu8ewm55b4y9ElyeuhCTzJD0XiH8Tsbhlw==" + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz", + "integrity": "sha512-eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==" }, "escape-html": { "version": "1.0.3", @@ -5368,9 +5692,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.3.0.tgz", - "integrity": "sha512-ZvZTKaqDue+N8Y9g0kp6UPZtS4FSY3qARxBs7p4f0H0iof381XHduqVerFWtK8DPtKmemqbqCFENWSQgPR/Gow==", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", + "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", "requires": { "@babel/code-frame": "^7.0.0", "ajv": "^6.10.0", @@ -5379,19 +5703,19 @@ "debug": "^4.0.1", "doctrine": "^3.0.0", "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.2", + "eslint-utils": "^1.4.3", "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.1", + "espree": "^6.1.2", "esquery": "^1.0.1", "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^5.0.0", - "globals": "^11.7.0", + "globals": "^12.1.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.4.1", + "inquirer": "^7.0.0", "is-glob": "^4.0.0", "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", @@ -5400,7 +5724,7 @@ "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "optionator": "^0.8.2", + "optionator": "^0.8.3", "progress": "^2.0.0", "regexpp": "^2.0.1", "semver": "^6.1.2", @@ -5409,102 +5733,14 @@ "table": "^5.2.3", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "eslint-scope": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", - "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "glob-parent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", - "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "import-fresh": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", - "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==" - }, - "v8-compile-cache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", - "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==" - } } }, "eslint-config-react-app": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-3.0.8.tgz", - "integrity": "sha512-Ovi6Bva67OjXrom9Y/SLJRkrGqKhMAL0XCH8BizPhjEVEhYczl2ZKiNZI2CuqO5/CJwAfMwRXAVGY0KToWr1aA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.1.0.tgz", + "integrity": "sha512-hBaxisHC6HXRVvxX+/t1n8mOdmCVIKgkXsf2WoUkJi7upHJTwYTsdCmx01QPOjKNT34QMQQ9sL0tVBlbiMFjxA==", "requires": { - "confusing-browser-globals": "^1.0.6" + "confusing-browser-globals": "^1.0.9" } }, "eslint-import-resolver-node": { @@ -5544,11 +5780,11 @@ } }, "eslint-module-utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz", - "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz", + "integrity": "sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw==", "requires": { - "debug": "^2.6.8", + "debug": "^2.6.9", "pkg-dir": "^2.0.0" }, "dependencies": { @@ -5560,11 +5796,49 @@ "ms": "2.0.0" } }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + }, "pkg-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", @@ -5575,39 +5849,45 @@ } } }, + "eslint-plugin-eslint-plugin": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz", + "integrity": "sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==" + }, "eslint-plugin-flowtype": { - "version": "2.50.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.3.tgz", - "integrity": "sha512-X+AoKVOr7Re0ko/yEXyM5SSZ0tazc6ffdIOocp2fFUlWoDt7DV0Bz99mngOkAFLOAWjqRA5jPwqUCbrx13XoxQ==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz", + "integrity": "sha512-bhewp36P+t7cEV0b6OdmoRWJCBYRiHFlqPZAG1oS3SF+Y0LQkeDvFSM4oxoxvczD1OdONCXMlJfQFiWLcV9urw==", "requires": { - "lodash": "^4.17.10" + "lodash": "^4.17.15" } }, "eslint-plugin-graphql": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-graphql/-/eslint-plugin-graphql-3.0.3.tgz", - "integrity": "sha512-hHwLyxSkC5rkakJ/SNTWwOswPdVhvfyMCnEOloevrLQIOHUNVIQBg1ljCaRe9C40HdzgcGUFUdG5BHLCKm8tuw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-graphql/-/eslint-plugin-graphql-3.1.1.tgz", + "integrity": "sha512-VNu2AipS8P1BAnE/tcJ2EmBWjFlCnG+1jKdUlFNDQjocWZlFiPpMu9xYNXePoEXK+q+jG51M/6PdhOjEgJZEaQ==", "requires": { "graphql-config": "^2.0.1", "lodash": "^4.11.1" } }, "eslint-plugin-import": { - "version": "2.18.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz", - "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==", + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz", + "integrity": "sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw==", "requires": { "array-includes": "^3.0.3", + "array.prototype.flat": "^1.2.1", "contains-path": "^0.1.0", "debug": "^2.6.9", "doctrine": "1.5.0", "eslint-import-resolver-node": "^0.3.2", - "eslint-module-utils": "^2.4.0", + "eslint-module-utils": "^2.4.1", "has": "^1.0.3", "minimatch": "^3.0.4", "object.values": "^1.1.0", "read-pkg-up": "^2.0.0", - "resolve": "^1.11.0" + "resolve": "^1.12.0" }, "dependencies": { "debug": { @@ -5658,19 +5938,20 @@ } }, "eslint-plugin-react": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz", - "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==", + "version": "7.17.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz", + "integrity": "sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==", "requires": { "array-includes": "^3.0.3", "doctrine": "^2.1.0", + "eslint-plugin-eslint-plugin": "^2.1.0", "has": "^1.0.3", - "jsx-ast-utils": "^2.1.0", + "jsx-ast-utils": "^2.2.3", "object.entries": "^1.1.0", - "object.fromentries": "^2.0.0", + "object.fromentries": "^2.0.1", "object.values": "^1.1.0", "prop-types": "^15.7.2", - "resolve": "^1.10.1" + "resolve": "^1.13.1" }, "dependencies": { "doctrine": { @@ -5683,21 +5964,26 @@ } } }, + "eslint-plugin-react-hooks": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz", + "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA==" + }, "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", "requires": { "esrecurse": "^4.1.0", "estraverse": "^4.1.1" } }, "eslint-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", - "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", "requires": { - "eslint-visitor-keys": "^1.0.0" + "eslint-visitor-keys": "^1.1.0" } }, "eslint-visitor-keys": { @@ -5706,12 +5992,12 @@ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==" }, "espree": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz", - "integrity": "sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", + "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", "requires": { - "acorn": "^7.0.0", - "acorn-jsx": "^5.0.2", + "acorn": "^7.1.0", + "acorn-jsx": "^5.1.0", "eslint-visitor-keys": "^1.1.0" } }, @@ -5752,14 +6038,14 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "event-source-polyfill": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.8.tgz", - "integrity": "sha512-wC9j5vjH9Xu9s8XhumgBoypdFJswraU1HXykqCCD/b7q+EH4P/avf5fM1e8IiHyHNZOeOiWwrki2775XFTYyeg==" + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.11.tgz", + "integrity": "sha512-fbo96OutP0Bb+gIYTTy8LGhNWySdetsFElCn/vhOzQL3cXWsS70TP/aRUe32U7F+PuOZH/tvb40tZgoJV8/Ilw==" }, "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" }, "events": { "version": "3.0.0", @@ -5795,6 +6081,44 @@ "tempfile": "^2.0.0" }, "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -5803,17 +6127,84 @@ } }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", + "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "p-finally": "^2.0.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "p-finally": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", + "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + } } }, "executable": { @@ -5822,13 +6213,15 @@ "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", "requires": { "pify": "^2.2.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } } }, - "exenv": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", - "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=" - }, "exif-parser": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz", @@ -5945,14 +6338,44 @@ } }, "express-graphql": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/express-graphql/-/express-graphql-0.7.1.tgz", - "integrity": "sha512-YpheAqTbSKpb5h57rV2yu2dPNUBi4FvZDspZ5iEV3ov34PBRgnM4lEBkv60+vZRJ6SweYL14N8AGYdov7g6ooQ==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/express-graphql/-/express-graphql-0.9.0.tgz", + "integrity": "sha512-wccd9Lb6oeJ8yHpUs/8LcnGjFUUQYmOG9A5BNLybRdCzGw0PeUrtBxsIR8bfiur6uSW4OvPkVDoYH06z6/N9+w==", "requires": { - "accepts": "^1.3.5", + "accepts": "^1.3.7", "content-type": "^1.0.4", - "http-errors": "^1.7.1", - "raw-body": "^2.3.3" + "http-errors": "^1.7.3", + "raw-body": "^2.4.1" + }, + "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "http-errors": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, + "raw-body": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", + "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==", + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.3", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + } } }, "ext-list": { @@ -6004,16 +6427,6 @@ "chardet": "^0.7.0", "iconv-lite": "^0.4.24", "tmp": "^0.0.33" - }, - "dependencies": { - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } - } } }, "extglob": { @@ -6086,22 +6499,61 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-glob": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", - "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", - "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.1.2", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.3", - "micromatch": "^3.1.10" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz", + "integrity": "sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==", + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2" + }, + "dependencies": { + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + } } }, "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "fast-levenshtein": { "version": "2.0.6", @@ -6113,6 +6565,14 @@ "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==" }, + "fastq": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz", + "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==", + "requires": { + "reusify": "^1.0.0" + } + }, "faye-websocket": { "version": "0.11.3", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", @@ -6121,34 +6581,27 @@ "websocket-driver": ">=0.5.1" } }, - "fb-watchman": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz", - "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=", - "requires": { - "bser": "^2.0.0" - } - }, "fbjs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", - "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", + "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", "requires": { - "core-js": "^2.4.1", - "fbjs-css-vars": "^1.0.0", + "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", "loose-envify": "^1.0.0", "object-assign": "^4.1.0", "promise": "^7.1.1", "setimmediate": "^1.0.5", "ua-parser-js": "^0.7.18" + }, + "dependencies": { + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + } } }, - "fbjs-css-vars": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", - "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==" - }, "fd-slicer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", @@ -6163,9 +6616,9 @@ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==" }, "figures": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz", - "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", + "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", "requires": { "escape-string-regexp": "^1.0.5" } @@ -6188,9 +6641,15 @@ } }, "file-type": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz", - "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==" + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz", + "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==" + }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true }, "filename-reserved-regex": { "version": "2.0.0", @@ -6278,27 +6737,19 @@ "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "requires": { - "locate-path": "^2.0.0" + "locate-path": "^3.0.0" } }, "find-versions": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.1.0.tgz", - "integrity": "sha512-NCTfNiVzeE/xL+roNDffGuRbrWI6atI18lTJ22vKp7rs2OhYzMK3W1dIdO2TUndH/QMcacM4d1uWwgcZcHK69Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz", + "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==", "requires": { - "array-uniq": "^2.1.0", "semver-regex": "^2.0.0" - }, - "dependencies": { - "array-uniq": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-2.1.0.tgz", - "integrity": "sha512-bdHxtev7FN6+MXI1YFW0Q8mQ8dTJc2S8AMfju+ZR77pbg2yAdVyDlwkaUI7Har0LyOMRFPHrJ9lYdyjZZswdlQ==" - } } }, "flat": { @@ -6307,13 +6758,6 @@ "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", "requires": { "is-buffer": "~2.0.3" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" - } } }, "flat-cache": { @@ -6324,16 +6768,6 @@ "flatted": "^2.0.0", "rimraf": "2.6.3", "write": "1.0.3" - }, - "dependencies": { - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "requires": { - "glob": "^7.1.3" - } - } } }, "flatted": { @@ -6373,14 +6807,6 @@ } } }, - "for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "requires": { - "is-callable": "^1.1.3" - } - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -6433,32 +6859,27 @@ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, - "fs-copy-file-sync": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fs-copy-file-sync/-/fs-copy-file-sync-1.1.1.tgz", - "integrity": "sha512-2QY5eeqVv4m2PfyMiEuy9adxNP+ajf+8AR05cEi+OAzPcOj90hvFImeZhTmKLBgSd9EvG33jsD7ZRxsx9dThkQ==" - }, "fs-exists-cached": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-exists-cached/-/fs-exists-cached-1.0.0.tgz", "integrity": "sha1-zyVVTKBQ3EmuZla0HeQiWJidy84=" }, "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } }, "fs-minipass": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", - "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.0.0.tgz", + "integrity": "sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A==", "requires": { - "minipass": "^2.2.1" + "minipass": "^3.0.0" } }, "fs-write-stream-atomic": { @@ -6478,13 +6899,14 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", "optional": true, "requires": { + "bindings": "^1.5.0", "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" + "node-pre-gyp": "*" }, "dependencies": { "abbrev": { @@ -6526,7 +6948,7 @@ } }, "chownr": { - "version": "1.1.1", + "version": "1.1.3", "bundled": true, "optional": true }, @@ -6551,7 +6973,7 @@ "optional": true }, "debug": { - "version": "4.1.1", + "version": "3.2.6", "bundled": true, "optional": true, "requires": { @@ -6574,11 +6996,11 @@ "optional": true }, "fs-minipass": { - "version": "1.2.5", + "version": "1.2.7", "bundled": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.6.0" } }, "fs.realpath": { @@ -6602,7 +7024,7 @@ } }, "glob": { - "version": "7.1.3", + "version": "7.1.6", "bundled": true, "optional": true, "requires": { @@ -6628,7 +7050,7 @@ } }, "ignore-walk": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "optional": true, "requires": { @@ -6645,7 +7067,7 @@ } }, "inherits": { - "version": "2.0.3", + "version": "2.0.4", "bundled": true, "optional": true }, @@ -6681,7 +7103,7 @@ "optional": true }, "minipass": { - "version": "2.3.5", + "version": "2.9.0", "bundled": true, "optional": true, "requires": { @@ -6690,11 +7112,11 @@ } }, "minizlib": { - "version": "1.2.1", + "version": "1.3.3", "bundled": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.9.0" } }, "mkdirp": { @@ -6706,22 +7128,22 @@ } }, "ms": { - "version": "2.1.1", + "version": "2.1.2", "bundled": true, "optional": true }, "needle": { - "version": "2.3.0", + "version": "2.4.0", "bundled": true, "optional": true, "requires": { - "debug": "^4.1.0", + "debug": "^3.2.6", "iconv-lite": "^0.4.4", "sax": "^1.2.4" } }, "node-pre-gyp": { - "version": "0.12.0", + "version": "0.14.0", "bundled": true, "optional": true, "requires": { @@ -6734,7 +7156,7 @@ "rc": "^1.2.7", "rimraf": "^2.6.1", "semver": "^5.3.0", - "tar": "^4" + "tar": "^4.4.2" } }, "nopt": { @@ -6747,12 +7169,20 @@ } }, "npm-bundled": { - "version": "1.0.6", + "version": "1.1.1", + "bundled": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", "bundled": true, "optional": true }, "npm-packlist": { - "version": "1.4.1", + "version": "1.4.7", "bundled": true, "optional": true, "requires": { @@ -6814,7 +7244,7 @@ "optional": true }, "process-nextick-args": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true, "optional": true }, @@ -6851,7 +7281,7 @@ } }, "rimraf": { - "version": "2.6.3", + "version": "2.7.1", "bundled": true, "optional": true, "requires": { @@ -6874,7 +7304,7 @@ "optional": true }, "semver": { - "version": "5.7.0", + "version": "5.7.1", "bundled": true, "optional": true }, @@ -6920,17 +7350,17 @@ "optional": true }, "tar": { - "version": "4.4.8", + "version": "4.4.13", "bundled": true, "optional": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "yallist": "^3.0.3" } }, "util-deprecate": { @@ -6952,7 +7382,7 @@ "optional": true }, "yallist": { - "version": "3.0.3", + "version": "3.1.1", "bundled": true, "optional": true } @@ -6969,153 +7399,146 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" }, "gatsby": { - "version": "2.13.73", - "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.13.73.tgz", - "integrity": "sha512-5zehGv6BGwOGpa/cX+QST/IH1jN3ebygcXMvb26S0ZoJGxIZyTY9jwGVYQtraoGP7XdQaAh24DF7htuqpjcGhA==", + "version": "2.18.18", + "resolved": "https://registry.npmjs.org/gatsby/-/gatsby-2.18.18.tgz", + "integrity": "sha512-+XH0eLlGfe2+ziIMnDSklf2628zjR2Emej3CdOoW1gHQ/fhpbrZLcuNpPrekW0fE+tQyTS8vDPHsIE0FDSsVRw==", "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/core": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/polyfill": "^7.0.0", - "@babel/runtime": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@gatsbyjs/relay-compiler": "2.0.0-printer-fix.2", + "@babel/code-frame": "^7.5.5", + "@babel/core": "^7.7.5", + "@babel/parser": "^7.7.5", + "@babel/polyfill": "^7.7.0", + "@babel/runtime": "^7.7.6", + "@babel/traverse": "^7.7.4", "@hapi/joi": "^15.1.1", "@mikaelkristiansson/domready": "^1.0.9", "@pieh/friendly-errors-webpack-plugin": "1.7.0-chalk-2", "@reach/router": "^1.2.1", - "address": "1.1.0", - "autoprefixer": "^9.6.1", + "@typescript-eslint/eslint-plugin": "^2.11.0", + "@typescript-eslint/parser": "^2.11.0", + "address": "1.1.2", + "autoprefixer": "^9.7.3", "axios": "^0.19.0", "babel-core": "7.0.0-bridge.0", - "babel-eslint": "^9.0.0", - "babel-loader": "^8.0.0", + "babel-eslint": "^10.0.3", + "babel-loader": "^8.0.6", "babel-plugin-add-module-exports": "^0.3.3", - "babel-plugin-dynamic-import-node": "^1.2.0", - "babel-plugin-remove-graphql-queries": "^2.7.3", - "babel-preset-gatsby": "^0.2.10", - "better-opn": "0.1.4", + "babel-plugin-dynamic-import-node": "^2.3.0", + "babel-plugin-remove-graphql-queries": "^2.7.19", + "babel-preset-gatsby": "^0.2.26", + "better-opn": "1.0.0", "better-queue": "^3.8.10", - "bluebird": "^3.5.0", + "bluebird": "^3.7.2", "browserslist": "3.2.8", - "cache-manager": "^2.9.0", + "cache-manager": "^2.10.1", "cache-manager-fs-hash": "^0.0.7", - "chalk": "^2.3.2", - "chokidar": "2.1.6", - "common-tags": "^1.4.0", + "chalk": "^2.4.2", + "chokidar": "3.3.0", + "common-tags": "^1.8.0", "compression": "^1.7.4", - "convert-hrtime": "^2.0.0", - "copyfiles": "^1.2.0", - "core-js": "^2.5.0", + "convert-hrtime": "^3.0.0", + "copyfiles": "^2.1.1", + "core-js": "^2.6.11", "cors": "^2.8.5", - "css-loader": "^1.0.0", - "debug": "^3.1.0", - "del": "^3.0.0", - "detect-port": "^1.2.1", + "css-loader": "^1.0.1", + "debug": "^3.2.6", + "del": "^5.1.0", + "detect-port": "^1.3.0", "devcert-san": "^0.3.3", - "dotenv": "^4.0.0", - "eslint": "^5.6.0", - "eslint-config-react-app": "^3.0.0", - "eslint-loader": "^2.1.0", - "eslint-plugin-flowtype": "^2.46.1", - "eslint-plugin-graphql": "^3.0.3", - "eslint-plugin-import": "^2.9.0", - "eslint-plugin-jsx-a11y": "^6.0.3", - "eslint-plugin-react": "^7.8.2", - "event-source-polyfill": "^1.0.5", - "express": "^4.16.3", - "express-graphql": "^0.7.1", + "dotenv": "^8.2.0", + "eslint": "^6.7.2", + "eslint-config-react-app": "^5.1.0", + "eslint-loader": "^2.2.1", + "eslint-plugin-flowtype": "^3.13.0", + "eslint-plugin-graphql": "^3.1.0", + "eslint-plugin-import": "^2.19.1", + "eslint-plugin-jsx-a11y": "^6.2.3", + "eslint-plugin-react": "^7.17.0", + "eslint-plugin-react-hooks": "^1.7.0", + "event-source-polyfill": "^1.0.11", + "express": "^4.17.1", + "express-graphql": "^0.9.0", "fast-levenshtein": "^2.0.6", "file-loader": "^1.1.11", - "flat": "^4.0.0", + "flat": "^4.1.0", "fs-exists-cached": "1.0.0", - "fs-extra": "^5.0.0", - "gatsby-cli": "^2.7.34", - "gatsby-core-utils": "^1.0.5", - "gatsby-graphiql-explorer": "^0.2.4", - "gatsby-link": "^2.2.6", - "gatsby-plugin-page-creator": "^2.1.7", - "gatsby-react-router-scroll": "^2.1.4", - "gatsby-telemetry": "^1.1.15", - "glob": "^7.1.1", - "got": "8.0.0", - "graphql": "^14.4.2", - "graphql-compose": "^6.3.2", - "graphql-playground-middleware-express": "^1.7.10", + "fs-extra": "^8.1.0", + "gatsby-cli": "^2.8.23", + "gatsby-core-utils": "^1.0.25", + "gatsby-graphiql-explorer": "^0.2.31", + "gatsby-link": "^2.2.27", + "gatsby-plugin-page-creator": "^2.1.37", + "gatsby-react-router-scroll": "^2.1.19", + "gatsby-telemetry": "^1.1.46", + "glob": "^7.1.6", + "got": "8.3.2", + "graphql": "^14.5.8", + "graphql-compose": "^6.3.7", + "graphql-playground-middleware-express": "^1.7.12", "invariant": "^2.2.4", "is-relative": "^1.0.0", - "is-relative-url": "^2.0.0", - "is-wsl": "^1.1.0", - "jest-worker": "^23.2.0", + "is-relative-url": "^3.0.0", + "is-wsl": "^2.1.1", + "jest-worker": "^24.9.0", "json-loader": "^0.5.7", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.14", - "lokijs": "^1.5.7", + "lodash": "^4.17.15", + "lokijs": "^1.5.8", "md5": "^2.2.1", - "md5-file": "^3.1.1", + "md5-file": "^3.2.3", "micromatch": "^3.1.10", - "mime": "^2.2.0", - "mini-css-extract-plugin": "^0.4.0", - "mitt": "^1.1.2", + "mime": "^2.4.4", + "mini-css-extract-plugin": "^0.8.0", + "mitt": "^1.2.0", "mkdirp": "^0.5.1", - "moment": "^2.21.0", + "moment": "^2.24.0", "name-all-modules-plugin": "^1.0.1", "normalize-path": "^2.1.1", "null-loader": "^0.1.1", - "opentracing": "^0.14.3", - "optimize-css-assets-webpack-plugin": "^5.0.1", - "parseurl": "^1.3.2", + "opentracing": "^0.14.4", + "optimize-css-assets-webpack-plugin": "^5.0.3", + "parseurl": "^1.3.3", "physical-cpu-count": "^2.0.0", - "pnp-webpack-plugin": "^1.4.1", - "postcss-flexbugs-fixes": "^3.0.0", - "postcss-loader": "^2.1.3", - "prop-types": "^15.6.1", + "pnp-webpack-plugin": "^1.5.0", + "postcss-flexbugs-fixes": "^3.3.1", + "postcss-loader": "^2.1.6", + "prompts": "^2.3.0", + "prop-types": "^15.7.2", "raw-loader": "^0.5.1", "react-dev-utils": "^4.2.3", "react-error-overlay": "^3.0.0", - "react-hot-loader": "^4.12.11", - "redux": "^4.0.0", + "react-hot-loader": "^4.12.18", + "redux": "^4.0.4", "redux-thunk": "^2.3.0", - "semver": "^5.6.0", + "semver": "^5.7.1", "shallow-compare": "^1.2.2", "sift": "^5.1.0", "signal-exit": "^3.0.2", - "slash": "^1.0.0", - "socket.io": "^2.0.3", + "slugify": "^1.3.6", + "socket.io": "^2.3.0", "stack-trace": "^0.0.10", - "string-similarity": "^1.2.0", - "style-loader": "^0.21.0", - "terser-webpack-plugin": "1.2.4", + "string-similarity": "^1.2.2", + "style-loader": "^0.23.1", + "terser-webpack-plugin": "^1.4.2", "true-case-path": "^2.2.1", "type-of": "^2.0.1", - "url-loader": "^1.0.1", + "url-loader": "^1.1.2", "util.promisify": "^1.0.0", - "uuid": "^3.1.0", - "v8-compile-cache": "^1.1.0", - "webpack": "~4.28.4", - "webpack-dev-middleware": "^3.0.1", - "webpack-dev-server": "^3.1.14", - "webpack-hot-middleware": "^2.21.0", - "webpack-merge": "^4.1.0", - "webpack-stats-plugin": "^0.1.5", - "xstate": "^4.3.2", + "uuid": "^3.3.3", + "v8-compile-cache": "^1.1.2", + "webpack": "~4.41.2", + "webpack-dev-middleware": "^3.7.2", + "webpack-dev-server": "^3.9.0", + "webpack-hot-middleware": "^2.25.0", + "webpack-merge": "^4.2.2", + "webpack-stats-plugin": "^0.3.0", + "xstate": "^4.7.2", "yaml-loader": "^0.5.0" }, "dependencies": { - "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==" - }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, "cliui": { "version": "4.1.0", @@ -7127,11 +7550,6 @@ "wrap-ansi": "^2.0.0" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -7143,348 +7561,254 @@ } }, "configstore": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", - "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.0.tgz", + "integrity": "sha512-eE/hvMs7qw7DlcB5JPRnthmrITuHMmACUJAp89v6PT6iOqzoLS7HRWhBtuHMlhNHo2AhUSA/3Dh1bKNJHcublQ==", "requires": { - "dot-prop": "^4.1.0", + "dot-prop": "^5.1.0", "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, - "eslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", - "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", - "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.9.1", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^4.0.3", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^5.0.1", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^6.2.2", - "js-yaml": "^3.13.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.11", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" } }, - "espree": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", - "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", - "requires": { - "acorn": "^6.0.7", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" - } + "crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" }, - "execa": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", - "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "ms": "^2.1.1" } }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dot-prop": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", + "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "requires": { - "locate-path": "^3.0.0" + "is-obj": "^2.0.0" } }, "gatsby-cli": { - "version": "2.7.34", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.7.34.tgz", - "integrity": "sha512-kc7+ne7cGC74KOv7dBmLC19m2nwYBsLoPZdX3qj9YLDjWsXR/GGGGU48eyADYY1gVpJacaMqk0Lu3dNbsfZBwQ==", + "version": "2.8.23", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.8.23.tgz", + "integrity": "sha512-e/ImmpW8dzZcmjeTqHaOhvr9gxNXPUE6MCLnl34yWlQwm2iMOWp86qhRvba5GfG6NJ2AX070JPYnkbO6RP5i5A==", "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/runtime": "^7.0.0", + "@babel/code-frame": "^7.5.5", + "@babel/runtime": "^7.7.6", "@hapi/joi": "^15.1.1", - "better-opn": "^0.1.4", - "bluebird": "^3.5.0", + "better-opn": "^1.0.0", + "bluebird": "^3.7.2", "chalk": "^2.4.2", - "ci-info": "^2.0.0", - "clipboardy": "^1.2.3", - "common-tags": "^1.4.0", - "configstore": "^4.0.0", - "convert-hrtime": "^2.0.0", - "core-js": "^2.5.0", - "envinfo": "^5.8.1", - "execa": "^0.8.0", + "clipboardy": "^2.1.0", + "common-tags": "^1.8.0", + "configstore": "^5.0.0", + "convert-hrtime": "^3.0.0", + "core-js": "^2.6.11", + "envinfo": "^7.5.0", + "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", - "fs-extra": "^4.0.1", - "gatsby-telemetry": "^1.1.15", - "hosted-git-info": "^2.6.0", - "ink": "^2.3.0", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.0.25", + "gatsby-telemetry": "^1.1.46", + "hosted-git-info": "^3.0.2", + "ink": "^2.6.0", "ink-spinner": "^3.0.1", "is-valid-path": "^0.1.1", - "lodash": "^4.17.14", + "lodash": "^4.17.15", "meant": "^1.0.1", "node-fetch": "^2.6.0", "object.entries": "^1.1.0", - "opentracing": "^0.14.3", + "opentracing": "^0.14.4", "pretty-error": "^2.1.1", "progress": "^2.0.3", - "prompts": "^2.1.0", - "react": "^16.8.4", + "prompts": "^2.3.0", + "react": "^16.12.0", + "redux": "^4.0.4", "resolve-cwd": "^2.0.0", "semver": "^6.3.0", - "source-map": "0.5.7", + "signal-exit": "^3.0.2", + "source-map": "0.7.3", "stack-trace": "^0.0.10", "strip-ansi": "^5.2.0", - "update-notifier": "^2.3.0", - "uuid": "3.3.2", + "update-notifier": "^3.0.1", + "uuid": "3.3.3", "yargs": "^12.0.5", - "yurnalist": "^1.0.5" + "yurnalist": "^1.1.1" }, "dependencies": { - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" } } }, - "import-fresh": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", - "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "hosted-git-info": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.2.tgz", + "integrity": "sha512-ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw==", "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" + "lru-cache": "^5.1.1" } }, - "invert-kv": { + "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, - "lcid": { + "is-obj": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "requires": { - "invert-kv": "^2.0.0" - } + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "yallist": "^3.0.2" } }, "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "requires": { - "pify": "^3.0.0" - } - }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", + "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "ansi-regex": "^3.0.0" } + } + } + }, + "unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "requires": { + "crypto-random-string": "^2.0.0" + } + }, + "v8-compile-cache": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz", + "integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA==" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, - "execa": { + "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "number-is-nan": "^1.0.0" } }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "pump": "^3.0.0" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" } } } }, - "p-limit": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", - "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "write-file-atomic": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz", + "integrity": "sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==", "requires": { - "p-limit": "^2.0.0" + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" } }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "resolve-from": { + "xdg-basedir": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, "yargs": { "version": "12.0.5", @@ -7517,70 +7841,64 @@ } }, "gatsby-core-utils": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.5.tgz", - "integrity": "sha512-XRyZMduCP3yvV8AEKI4sAVWT+M1roW20SWhQwOKtZrYIkMCzlOe9nMOjNOZcJb2vCJsaUBxh2fxLT+OZg8+25A==" + "version": "1.0.25", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.25.tgz", + "integrity": "sha512-Pz5xueweH9qv5TIW7wwlTxI/CbyzkiE5xvgLicbHbU+InH+lCNt4VuvGP1gQcIRuHMCIbuVKSiVCC7jnxEbtrA==", + "requires": { + "ci-info": "2.0.0", + "node-object-hash": "^2.0.0" + } }, "gatsby-graphiql-explorer": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.2.4.tgz", - "integrity": "sha512-2e1HnBuC06L9LInA5mNKyiuaiUEnnRfpedGuuvNFR3nu8+7Q9OwVXuE3EcbWihtjiINyZH7HHD7Za0WRZV6SkQ==", + "version": "0.2.31", + "resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.2.31.tgz", + "integrity": "sha512-pAK/HG/Ryw2ZDWb/5rnSBmPf8KsnFGlO/zS9m2IdLjnQS0kA0b9UbfZ5bjkg7pwPPLhWilEX+uON0l51N4gnmg==", "requires": { - "@babel/runtime": "^7.0.0" + "@babel/runtime": "^7.7.6" } }, "gatsby-image": { - "version": "2.2.10", - "resolved": "https://registry.npmjs.org/gatsby-image/-/gatsby-image-2.2.10.tgz", - "integrity": "sha512-wvbxqYWxg7te7ui6RjCgohcVTvcI1b0PBZNor548Flg/0h+oSGnUXVDkz9HO8uS/vWlIbMpXonRxvnZCGu1Y8A==", + "version": "2.2.37", + "resolved": "https://registry.npmjs.org/gatsby-image/-/gatsby-image-2.2.37.tgz", + "integrity": "sha512-nm1PgitbK4ZR9YQ3mTlAXDXXNM/7JT2LYDFqTlWe1y78nhA6RfIfm+4bsNH5HCEUaYhZiedpkqguJiIYWYPsLg==", "requires": { - "@babel/runtime": "^7.0.0", + "@babel/runtime": "^7.7.6", "object-fit-images": "^3.2.4", - "prop-types": "^15.6.1" + "prop-types": "^15.7.2" } }, "gatsby-link": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.2.6.tgz", - "integrity": "sha512-FnQ4Z+a5KDmAIoipfGqtELZ/WPB0W67I/jo4ekOPwEu14t6N/VWdTS0mOdJoNCeElNvnJ7cNqlNnEopdU4vbKw==", + "version": "2.2.27", + "resolved": "https://registry.npmjs.org/gatsby-link/-/gatsby-link-2.2.27.tgz", + "integrity": "sha512-Jiz6ShReB25plqTKsTAVpfFvN1K/JziNhr1z8Q6p+dPzQaNWfEC61kpRKE69J1WWycvRdxCSZEkOgY/0nlAifg==", "requires": { - "@babel/runtime": "^7.0.0", - "@types/reach__router": "^1.2.4", - "prop-types": "^15.6.1" + "@babel/runtime": "^7.7.6", + "@types/reach__router": "^1.2.6", + "prop-types": "^15.7.2" } }, "gatsby-page-utils": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.7.tgz", - "integrity": "sha512-WhZj+VvxWCWU/JRiVFg0SJCXSAnsMz3ABpMJxQv2ByUB0gUUFG90my4oYNEZKuY+mRMKyRiVoexQVuQcnAnoGA==", + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/gatsby-page-utils/-/gatsby-page-utils-0.0.36.tgz", + "integrity": "sha512-W+9+PdEWKCxO5cEr8D3F0vyN2sDLeoSwROwiuO+J791HHUj+HgnDzRAt97WjBwcD4ghT+ONs5Ao2WyR+bVrIzw==", "requires": { - "@babel/runtime": "^7.0.0", - "bluebird": "^3.5.0", - "chokidar": "2.1.6", + "@babel/runtime": "^7.7.6", + "bluebird": "^3.7.2", + "chokidar": "3.3.0", "fs-exists-cached": "^1.0.0", - "glob": "^7.1.1", - "lodash": "^4.17.14", - "micromatch": "^3.1.10", - "slash": "^1.0.0" + "gatsby-core-utils": "^1.0.25", + "glob": "^7.1.6", + "lodash": "^4.17.15", + "micromatch": "^3.1.10" } }, "gatsby-plugin-catch-links": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/gatsby-plugin-catch-links/-/gatsby-plugin-catch-links-2.1.9.tgz", - "integrity": "sha512-UWOty2yuV2tINSv5ToKJfFXUYtaSKtP4zRVeZ3dx+m2v7WO61ap/o3JEMWUAG1n+VaN+TIq2T5Qc9Ln0emDloQ==", + "version": "2.1.21", + "resolved": "https://registry.npmjs.org/gatsby-plugin-catch-links/-/gatsby-plugin-catch-links-2.1.21.tgz", + "integrity": "sha512-AHsSVbb4PgdFlbVk4ZmwcJ9UETzYcGqh9Otzk1XeGRFra7msUoB4sCZIUTqSow+sThaHiO/hYgkcGfOlLIrD5g==", "requires": { - "@babel/runtime": "^7.6.0", + "@babel/runtime": "^7.7.6", "escape-string-regexp": "^1.0.5" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz", - "integrity": "sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==", - "requires": { - "regenerator-runtime": "^0.13.2" - } - } } }, "gatsby-plugin-ipfs": { @@ -7593,6 +7911,65 @@ "p-map": "^2.0.0" }, "dependencies": { + "@nodelib/fs.stat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", + "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "^1.0.1" + } + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + }, + "dir-glob": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "requires": { + "arrify": "^1.0.1", + "path-type": "^3.0.0" + } + }, + "fast-glob": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", + "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", + "requires": { + "@mrmlnc/readdir-enhanced": "^2.2.1", + "@nodelib/fs.stat": "^1.1.2", + "glob-parent": "^3.1.0", + "is-glob": "^4.0.0", + "merge2": "^1.2.3", + "micromatch": "^3.1.10" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, "globby": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", @@ -7617,22 +7994,42 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" }, + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "requires": { + "pify": "^3.0.0" + } + }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, + "slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" } } }, "gatsby-plugin-manifest": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/gatsby-plugin-manifest/-/gatsby-plugin-manifest-2.2.6.tgz", - "integrity": "sha512-QjOKUOrtwbmiXBAcFi0uvzQEGJa5PELXriJjXNuDmn++72sCybgoluOrY4Ajed+WUf82865RIXq58isK3Dmmgw==", - "requires": { - "@babel/runtime": "^7.0.0", - "gatsby-core-utils": "^1.0.5", - "semver": "^5.6.0", - "sharp": "^0.22.1" + "version": "2.2.34", + "resolved": "https://registry.npmjs.org/gatsby-plugin-manifest/-/gatsby-plugin-manifest-2.2.34.tgz", + "integrity": "sha512-Jo6fXZpJ/QSejrSj9BTfRNikVDjx9FuuKzT4w7il8I6qKtnM4z/lYOIMxRWkAdlK7dj+fpUlbTeClWjhlKRWAQ==", + "requires": { + "@babel/runtime": "^7.7.6", + "gatsby-core-utils": "^1.0.25", + "semver": "^5.7.1", + "sharp": "^0.23.4" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "gatsby-plugin-no-sourcemaps": { @@ -7641,36 +8038,30 @@ "integrity": "sha512-IaRscMdXD8AFr922HlgftxN09gqmjsA1/RHuLgtJcv+bYhoGGs83XvSOrOq8Szs+5rLEixj3qdNJb59G0LnO8w==" }, "gatsby-plugin-offline": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/gatsby-plugin-offline/-/gatsby-plugin-offline-2.2.7.tgz", - "integrity": "sha512-AbX4kAEy8j+8P/kBITdzv/8JR1R+Lt5pAE49ICIzwb7tZDQB7fJisOSc1PGihhQTLuy+ppj9XJDgNhh205lETQ==", - "requires": { - "@babel/runtime": "^7.0.0", - "cheerio": "^1.0.0-rc.2", - "idb-keyval": "^3.1.0", - "lodash": "^4.17.14", - "slash": "^3.0.0", - "workbox-build": "^3.6.3" - }, - "dependencies": { - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" - } + "version": "3.0.30", + "resolved": "https://registry.npmjs.org/gatsby-plugin-offline/-/gatsby-plugin-offline-3.0.30.tgz", + "integrity": "sha512-aqv70nWayyjD88kre8mtDJ/AURQJYw8TScsqx9t+G64RgRtp/HTx5qVWdB9ab5NjJUjIFK474Lvjh9bpBPwTvg==", + "requires": { + "@babel/runtime": "^7.7.6", + "cheerio": "^1.0.0-rc.3", + "gatsby-core-utils": "^1.0.25", + "glob": "^7.1.6", + "idb-keyval": "^3.2.0", + "lodash": "^4.17.15", + "workbox-build": "^4.3.1" } }, "gatsby-plugin-page-creator": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.7.tgz", - "integrity": "sha512-2iRy0kLuAPcVev1VIv9eI05UKe3riiaVd5GMosAaGNI4oUJ9+LiPfXks3kWBSIqwRWv9CyCA6/GhOaVFjrzLLQ==", + "version": "2.1.37", + "resolved": "https://registry.npmjs.org/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.1.37.tgz", + "integrity": "sha512-EsHDgT4hQx9Zxqf6zUIP9qQh+0Wk1tPyiJtPRADY1jkzwu2dAidJkaUtH4XR8BExhjZ9xYB5uDliSNrGkZg7fw==", "requires": { - "@babel/runtime": "^7.0.0", - "bluebird": "^3.5.0", + "@babel/runtime": "^7.7.6", + "bluebird": "^3.7.2", "fs-exists-cached": "^1.0.0", - "gatsby-page-utils": "^0.0.7", - "glob": "^7.1.1", - "lodash": "^4.17.14", + "gatsby-page-utils": "^0.0.36", + "glob": "^7.1.6", + "lodash": "^4.17.15", "micromatch": "^3.1.10" } }, @@ -7689,29 +8080,45 @@ "object-hash": "^1.3.0" }, "dependencies": { - "download": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz", - "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==", + "@nodelib/fs.stat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", + "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "archive-type": "^4.0.0", - "caw": "^2.0.1", - "content-disposition": "^0.5.2", - "decompress": "^4.2.0", - "ext-name": "^5.0.0", - "file-type": "^8.1.0", - "filenamify": "^2.0.0", - "get-stream": "^3.0.0", - "got": "^8.3.1", - "make-dir": "^1.2.0", - "p-event": "^2.1.0", - "pify": "^3.0.0" + "array-uniq": "^1.0.1" } }, - "file-type": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz", - "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==" + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + }, + "dir-glob": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "requires": { + "arrify": "^1.0.1", + "path-type": "^3.0.0" + } + }, + "fast-glob": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", + "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", + "requires": { + "@mrmlnc/readdir-enhanced": "^2.2.1", + "@nodelib/fs.stat": "^1.1.2", + "glob-parent": "^3.1.0", + "is-glob": "^4.0.0", + "merge2": "^1.2.3", + "micromatch": "^3.1.10" + } }, "fs-extra": { "version": "7.0.1", @@ -7723,6 +8130,25 @@ "universalify": "^0.1.0" } }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, "globby": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", @@ -7737,175 +8163,17 @@ "slash": "^1.0.0" } }, - "got": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", - "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==", - "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.4.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", - "url-to-options": "^1.0.1" - } - }, "ignore": { "version": "3.3.10", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" }, - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "requires": { - "pify": "^3.0.0" - } - }, - "p-cancelable": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", - "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==" - }, - "p-event": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz", - "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==", - "requires": { - "p-timeout": "^2.0.1" - } - }, - "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", - "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", - "requires": { - "p-finally": "^1.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" - }, - "url-parse-lax": { + "path-type": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "requires": { - "prepend-http": "^2.0.0" - } - } - } - }, - "gatsby-plugin-react-helmet": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.4.tgz", - "integrity": "sha512-L+nP4cv6zdxjKXN9eJJdni7JpPCCSN1V+KWBgID0FELKawFGegkI6zdvKhtBZHz5F+WHh+ak/qfOAYIuLO0eHA==", - "requires": { - "@babel/runtime": "^7.0.0" - } - }, - "gatsby-plugin-root-import": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/gatsby-plugin-root-import/-/gatsby-plugin-root-import-2.0.5.tgz", - "integrity": "sha512-/yA6rFjfjiFb8D6nCjfFrrGqYQMkOt4J3u2o6s7VYEF/zpA5dw2C9ENJ5fDKkJSCbbwLiEIGVMMee3vMEip2zA==" - }, - "gatsby-plugin-sharp": { - "version": "2.2.13", - "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-2.2.13.tgz", - "integrity": "sha512-Wzvwty3ho0T3FSFLDHGAf5D87hvqTsRvphnSP38HGFw0tHAbNtbJSrqr/HA1P5x7Cah4j5duQg4TNH6qtlkAZg==", - "requires": { - "@babel/runtime": "^7.0.0", - "async": "^2.6.3", - "bluebird": "^3.5.0", - "fs-extra": "^7.0.0", - "gatsby-core-utils": "^1.0.5", - "got": "^8.3.2", - "imagemin": "^6.0.0", - "imagemin-mozjpeg": "^8.0.0", - "imagemin-pngquant": "^6.0.0", - "imagemin-webp": "^5.0.0", - "lodash": "^4.17.14", - "mini-svg-data-uri": "^1.0.0", - "potrace": "^2.1.1", - "probe-image-size": "^4.0.0", - "progress": "^2.0.3", - "semver": "^5.6.0", - "sharp": "^0.22.1", - "svgo": "^1.2.0" - }, - "dependencies": { - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "requires": { - "lodash": "^4.17.14" - } - }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "got": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", - "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==", - "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.4.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", - "url-to-options": "^1.0.1" - } - }, - "p-cancelable": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", - "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==" - }, - "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", - "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "p-finally": "^1.0.0" + "pify": "^3.0.0" } }, "pify": { @@ -7913,191 +8181,144 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "requires": { - "prepend-http": "^2.0.0" - } + "slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" } } }, - "gatsby-plugin-styled-components": { - "version": "3.1.11", - "resolved": "https://registry.npmjs.org/gatsby-plugin-styled-components/-/gatsby-plugin-styled-components-3.1.11.tgz", - "integrity": "sha512-10RgU3FcXNctDfFHpiAKQOmYBZlbeZSOfG1mqjWjz/BmYqkLoIaQfTwEMmBpH40DGf72pG2PUOGoDVDrikPKOA==", + "gatsby-plugin-react-helmet": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-3.1.18.tgz", + "integrity": "sha512-wwKH6Z5NK0Gl2hDfMnWNGE41GjWpZGq0eKczPydTJc/1SbPykBFCBrjYgrAPB2ZrRnA8AV06cRwPddJC0mY7sw==", "requires": { - "@babel/runtime": "^7.6.3" + "@babel/runtime": "^7.7.6" + } + }, + "gatsby-plugin-root-import": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/gatsby-plugin-root-import/-/gatsby-plugin-root-import-2.0.5.tgz", + "integrity": "sha512-/yA6rFjfjiFb8D6nCjfFrrGqYQMkOt4J3u2o6s7VYEF/zpA5dw2C9ENJ5fDKkJSCbbwLiEIGVMMee3vMEip2zA==" + }, + "gatsby-plugin-sharp": { + "version": "2.3.10", + "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-2.3.10.tgz", + "integrity": "sha512-uoVLdSnnrnpWxeI+ZNdQ7nuvx60LI8+nqsuUu0KfyAmEhNgcuuExTDYlM4WDn1BCIifCylTwBBTP0xZU4YvPeA==", + "requires": { + "@babel/runtime": "^7.7.6", + "async": "^2.6.3", + "bluebird": "^3.7.2", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.0.25", + "got": "^8.3.2", + "imagemin": "^6.1.0", + "imagemin-mozjpeg": "^8.0.0", + "imagemin-pngquant": "^6.0.1", + "imagemin-webp": "^5.1.0", + "lodash": "^4.17.15", + "mini-svg-data-uri": "^1.1.3", + "p-defer": "^3.0.0", + "potrace": "^2.1.2", + "probe-image-size": "^4.1.1", + "progress": "^2.0.3", + "semver": "^5.7.1", + "sharp": "^0.23.4", + "svgo": "1.3.2", + "uuid": "^3.3.3" }, "dependencies": { - "@babel/runtime": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz", - "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==", + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "requires": { - "regenerator-runtime": "^0.13.2" + "lodash": "^4.17.14" } + }, + "p-defer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz", + "integrity": "sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, + "gatsby-plugin-styled-components": { + "version": "3.1.16", + "resolved": "https://registry.npmjs.org/gatsby-plugin-styled-components/-/gatsby-plugin-styled-components-3.1.16.tgz", + "integrity": "sha512-ixvMwMCYm70iC23+zkMBmQPNX0UmmumzK+1TtK3LSYicdaXXz7dychaBdiljKD4WMNraXYx49JuZS01yjOZiOw==", + "requires": { + "@babel/runtime": "^7.7.6" + } + }, "gatsby-react-router-scroll": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.4.tgz", - "integrity": "sha512-p9HQ2GrIVmKL3UAk7jqKzOXaigj6tu1xQPAGguO+5+i5ZfD245TQq1UAj1bZr0dJ1DJqRLbTooxPiL7+K05pVg==", + "version": "2.1.19", + "resolved": "https://registry.npmjs.org/gatsby-react-router-scroll/-/gatsby-react-router-scroll-2.1.19.tgz", + "integrity": "sha512-qK6kE48Efzf8zOsmRw6UiZH7VXuv4ti6taGu5je1D9IGDgMpETKXRA0jmKB1up50XQ4WXvyyLASOqWK3UdDNYw==", "requires": { - "@babel/runtime": "^7.0.0", - "scroll-behavior": "^0.9.9", + "@babel/runtime": "^7.7.6", + "scroll-behavior": "^0.9.10", "warning": "^3.0.0" } }, "gatsby-remark-autolink-headers": { - "version": "2.1.10", - "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.1.10.tgz", - "integrity": "sha512-MXQuxgTurOXMYi3Rpywz2kMe4Px/H3B2OBy5ZphL9WwOFfaiRK10GkRNMNlHSDNA0K5151PnuSd5mKxLOCxbYw==", + "version": "2.1.22", + "resolved": "https://registry.npmjs.org/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-2.1.22.tgz", + "integrity": "sha512-YkqgbLv4CovkqDMG7Mq/RYjkZud6O79pG131TLmaLZmQkcESwZuzzpNxuaD9snIkth+UwUx1RAso207vN0yRVg==", "requires": { - "@babel/runtime": "^7.6.0", + "@babel/runtime": "^7.7.6", "github-slugger": "^1.2.1", "lodash": "^4.17.15", - "mdast-util-to-string": "^1.0.6", + "mdast-util-to-string": "^1.0.7", "unist-util-visit": "^1.4.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz", - "integrity": "sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==", - "requires": { - "regenerator-runtime": "^0.13.2" - } - } } }, "gatsby-remark-prismjs": { - "version": "3.3.13", - "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.13.tgz", - "integrity": "sha512-m5EIH2D1PE6kpqaPbas8cd85rIdXoux5Q3FUo5gkKkiBefdTt3Kk1kA2eW/qzEs8hovHWmRigFzA/HsvK8A1/A==", + "version": "3.3.29", + "resolved": "https://registry.npmjs.org/gatsby-remark-prismjs/-/gatsby-remark-prismjs-3.3.29.tgz", + "integrity": "sha512-aF7gu+hfW1075nZNDTLo/88GiELaeeLiWLRKHghGql2FBaOszP/HuTBZCV0KaxRb5rGq8Pwdo1KO+wbkL9qYtw==", "requires": { - "@babel/runtime": "^7.6.0", + "@babel/runtime": "^7.7.6", "parse-numeric-range": "^0.0.2", "unist-util-visit": "^1.4.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz", - "integrity": "sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==", - "requires": { - "regenerator-runtime": "^0.13.2" - } - } } }, "gatsby-source-filesystem": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.21.tgz", - "integrity": "sha512-CYkj95vp6kNcO/UFYCYmJ78djJZAX1zO2hQyptFNRhto4J5SWB7Zy8Jc0r7sCitMeakfvNOT72y3r7LjcA0dNw==", + "version": "2.1.43", + "resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-2.1.43.tgz", + "integrity": "sha512-lmq64xMgHE6cXwLgddogcx2THPsMCia/HivWRGK6DCJhCOXDbkWSiNYthpMIgZXkfsGaYFiVjxRZSSn1QVOU9g==", "requires": { - "@babel/runtime": "^7.5.5", + "@babel/runtime": "^7.7.6", "better-queue": "^3.8.10", - "bluebird": "^3.5.5", - "chokidar": "3.0.2", - "file-type": "^12.3.0", + "bluebird": "^3.7.2", + "chokidar": "3.3.0", + "file-type": "^12.4.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.0.7", + "gatsby-core-utils": "^1.0.25", "got": "^7.1.0", "md5-file": "^3.2.3", "mime": "^2.4.4", - "pretty-bytes": "^4.0.2", + "pretty-bytes": "^5.3.0", "progress": "^2.0.3", "read-chunk": "^3.2.0", "valid-url": "^1.0.9", - "xstate": "^4.6.7" + "xstate": "^4.7.2" }, "dependencies": { - "anymatch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz", - "integrity": "sha512-Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz", - "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==", - "requires": { - "anymatch": "^3.0.1", - "braces": "^3.0.2", - "fsevents": "^2.0.6", - "glob-parent": "^5.0.0", - "is-binary-path": "^2.1.0", - "is-glob": "^4.0.1", - "normalize-path": "^3.0.0", - "readdirp": "^3.1.1" - } - }, "file-type": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.3.0.tgz", - "integrity": "sha512-4E4Esq9KLwjYCY32E7qSmd0h7LefcniZHX+XcdJ4Wfx1uGJX7QCigiqw/U0yT7WOslm28yhxl87DJ0wHYv0RAA==" - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } + "version": "12.4.2", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz", + "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==" }, - "fsevents": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz", - "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==", - "optional": true - }, - "gatsby-core-utils": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.7.tgz", - "integrity": "sha512-G4C/n8tzZVUgs+nLs8Gho7OfgcOWsoKij6az25vCATC9daqrCh1R0ouInqCtIBk7pBim/jt7UAtlClXpp6HyqQ==" - }, - "glob-parent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", - "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", - "requires": { - "is-glob": "^4.0.1" - } + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, "got": { "version": "7.1.0", @@ -8120,155 +8341,159 @@ "url-to-options": "^1.0.1" } }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "p-cancelable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" }, - "readdirp": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz", - "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==", + "p-timeout": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", + "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", "requires": { - "picomatch": "^2.0.4" + "p-finally": "^1.0.0" } }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "requires": { - "is-number": "^7.0.0" + "prepend-http": "^1.0.1" } } } }, "gatsby-telemetry": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.15.tgz", - "integrity": "sha512-EnKKEiIvqME9hlQRJZXp1V7xOQtgqGLRWHxcIYtRAYS5NJse6rPNnYXIRD3eZn8jXnuBB4kuUeatJLiTHxGbwQ==", + "version": "1.1.46", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.1.46.tgz", + "integrity": "sha512-HFrrZc/mZtzt2DsMc34HZiIEHpaXt1kKcFZC6s3Q3KqkgUweCZMwE7N52jkhGA+c3aFOZU/D+CtyP9dWcrsM/Q==", "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/runtime": "^7.0.0", - "bluebird": "^3.5.0", - "boxen": "^3.2.0", - "ci-info": "2.0.0", - "configstore": "^4.0.0", - "envinfo": "^5.8.1", - "fs-extra": "^7.0.1", + "@babel/code-frame": "^7.5.5", + "@babel/runtime": "^7.7.6", + "bluebird": "^3.7.2", + "boxen": "^4.2.0", + "configstore": "^5.0.0", + "envinfo": "^7.5.0", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.0.25", "git-up": "4.0.1", - "is-docker": "1.1.0", - "lodash": "^4.17.14", - "node-fetch": "2.3.0", + "is-docker": "2.0.0", + "lodash": "^4.17.15", + "node-fetch": "2.6.0", "resolve-cwd": "^2.0.0", - "source-map": "^0.5.7", + "source-map": "^0.7.3", "stack-trace": "^0.0.10", "stack-utils": "1.0.2", - "uuid": "3.3.2" + "uuid": "3.3.3" }, "dependencies": { "configstore": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", - "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.0.tgz", + "integrity": "sha512-eE/hvMs7qw7DlcB5JPRnthmrITuHMmACUJAp89v6PT6iOqzoLS7HRWhBtuHMlhNHo2AhUSA/3Dh1bKNJHcublQ==", "requires": { - "dot-prop": "^4.1.0", + "dot-prop": "^5.1.0", "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" + "make-dir": "^3.0.0", + "unique-string": "^2.0.0", + "write-file-atomic": "^3.0.0", + "xdg-basedir": "^4.0.0" } }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" + }, + "dot-prop": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", + "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "is-obj": "^2.0.0" } }, + "is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + }, "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", + "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", "requires": { - "pify": "^3.0.0" + "semver": "^6.0.0" } }, "node-fetch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", - "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + }, + "unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "requires": { + "crypto-random-string": "^2.0.0" + } + }, + "write-file-atomic": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz", + "integrity": "sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==", + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + "xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" } } }, "gatsby-transformer-remark": { - "version": "2.6.22", - "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.6.22.tgz", - "integrity": "sha512-WONmnxXJ86Ko9y7YgQRN+mVoHgv9nTd+IjgLyiuNDuMFKCAUrKSBpTVyqfv8AEYoovGFuaCx1gCp6aT6MKmyzQ==", + "version": "2.6.45", + "resolved": "https://registry.npmjs.org/gatsby-transformer-remark/-/gatsby-transformer-remark-2.6.45.tgz", + "integrity": "sha512-3oICZvZmQyecK+vGBpcLOuDMpJio2OsJEGnmEXlQuS0KOWALGvZCfu3sNu4ROHemEgwY8q5z7OANjqZVxIaloQ==", "requires": { - "@babel/runtime": "^7.6.0", - "bluebird": "^3.5.5", - "gatsby-core-utils": "^1.0.8", + "@babel/runtime": "^7.7.6", + "bluebird": "^3.7.2", + "gatsby-core-utils": "^1.0.25", "gray-matter": "^4.0.2", "hast-util-raw": "^4.0.0", "hast-util-to-html": "^4.0.1", "lodash": "^4.17.15", "mdast-util-to-hast": "^3.0.4", - "mdast-util-to-string": "^1.0.6", - "mdast-util-toc": "^2.1.0", + "mdast-util-to-string": "^1.0.7", + "mdast-util-toc": "^5.0", "remark": "^10.0.1", "remark-parse": "^6.0.3", "remark-retext": "^3.1.3", "remark-stringify": "^5.0.0", - "retext-english": "^3.0.3", + "retext-english": "^3.0.4", "sanitize-html": "^1.20.1", "underscore.string": "^3.3.5", "unified": "^6.2.0", - "unist-util-remove-position": "^1.1.3", + "unist-util-remove-position": "^1.1.4", "unist-util-select": "^1.5.0", "unist-util-visit": "^1.4.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz", - "integrity": "sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==", - "requires": { - "regenerator-runtime": "^0.13.2" - } - }, - "gatsby-core-utils": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.0.8.tgz", - "integrity": "sha512-080Jl8NamTbCGliKxXpMjEO1XUYU5FAow+VPR/j6hJk+Kl/gFmpE1mqa5QnHRGLZQhBP/h2T0mUwnSJn9m/Jsw==" - } } }, "gauge": { @@ -8286,6 +8511,19 @@ "wide-align": "^1.1.0" }, "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -8295,18 +8533,26 @@ "is-fullwidth-code-point": "^1.0.0", "strip-ansi": "^3.0.0" } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } } } }, "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-own-enumerable-property-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", - "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", + "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==" }, "get-port": { "version": "3.2.0", @@ -8327,9 +8573,12 @@ "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" }, "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } }, "get-urls": { "version": "8.0.0", @@ -8383,9 +8632,9 @@ } }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -8396,22 +8645,11 @@ } }, "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } + "is-glob": "^4.0.1" } }, "glob-to-regexp": { @@ -8459,20 +8697,33 @@ } }, "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", + "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", + "requires": { + "type-fest": "^0.8.1" + } }, "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "requires": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + }, + "dependencies": { + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" + } } }, "good-listener": { @@ -8504,32 +8755,26 @@ "follow-redirects": "1.5.10", "is-buffer": "^2.0.2" } - }, - "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" } } }, "got": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/got/-/got-8.0.0.tgz", - "integrity": "sha512-lqVA9ORcSGfJPHfMXh1RW451aYMP1NyXivpGqGggnfDqNz3QVfMl7MkuEz+dr70gK2X8dhLiS5YzHhCV3/3yOQ==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", + "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==", "requires": { + "@sindresorhus/is": "^0.7.0", "cacheable-request": "^2.1.1", "decompress-response": "^3.3.0", "duplexer3": "^0.1.4", "get-stream": "^3.0.0", "into-stream": "^3.1.0", - "is-plain-obj": "^1.1.0", "is-retry-allowed": "^1.1.0", - "is-stream": "^1.1.0", "isurl": "^1.0.0-alpha5", "lowercase-keys": "^1.0.0", "mimic-response": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^1.2.0", + "p-cancelable": "^0.4.0", + "p-timeout": "^2.0.1", "pify": "^3.0.0", "safe-buffer": "^5.1.1", "timed-out": "^4.0.1", @@ -8537,30 +8782,76 @@ "url-to-options": "^1.0.1" }, "dependencies": { - "pify": { + "@sindresorhus/is": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", + "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==" + }, + "cacheable-request": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", + "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", + "requires": { + "clone-response": "1.0.2", + "get-stream": "3.0.0", + "http-cache-semantics": "3.8.1", + "keyv": "3.0.0", + "lowercase-keys": "1.0.0", + "normalize-url": "2.0.1", + "responselike": "1.0.2" + }, + "dependencies": { + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=" + } + } + }, + "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" + "http-cache-semantics": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", + "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==" }, - "url-parse-lax": { + "keyv": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", + "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", + "requires": { + "json-buffer": "3.0.0" + } + }, + "normalize-url": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", + "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "requires": { - "prepend-http": "^2.0.0" + "prepend-http": "^2.0.0", + "query-string": "^5.0.1", + "sort-keys": "^2.0.0" } + }, + "p-cancelable": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", + "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==" + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" } } }, "graceful-fs": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", - "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, "graceful-readlink": { "version": "1.0.1", @@ -8568,17 +8859,17 @@ "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" }, "graphql": { - "version": "14.4.2", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.4.2.tgz", - "integrity": "sha512-6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ==", + "version": "14.5.8", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.5.8.tgz", + "integrity": "sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==", "requires": { "iterall": "^1.2.2" } }, "graphql-compose": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/graphql-compose/-/graphql-compose-6.3.5.tgz", - "integrity": "sha512-XUpp7JqbaQ+vK/Nw4Jw0CQKs3UU8YFz3wpbBz+6WvPhrMkexco0bIbK4iGW9okQT7+/toAphEdVO4HFqM7lk2w==", + "version": "6.3.8", + "resolved": "https://registry.npmjs.org/graphql-compose/-/graphql-compose-6.3.8.tgz", + "integrity": "sha512-o0/jzQEMIpSjryLKwmD1vGrCubiPxD0LxlGTgWDSu38TBepu2GhugC9gYgTEbtiCZAHPtvkZ90SzzABOWZyQLA==", "requires": { "graphql-type-json": "^0.2.4", "object-path": "^0.11.4" @@ -8603,13 +8894,6 @@ "requires": { "lodash": "^4.17.4", "resolve-from": "^4.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - } } }, "graphql-playground-html": { @@ -8695,6 +8979,13 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { "ansi-regex": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + } } }, "has-binary2": { @@ -8728,9 +9019,9 @@ "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" }, "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" }, "has-to-string-tag-x": { "version": "1.4.1", @@ -8764,6 +9055,11 @@ "kind-of": "^4.0.0" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", @@ -8774,6 +9070,11 @@ } } }, + "has-yarn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", + "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" + }, "hash-base": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", @@ -8803,6 +9104,13 @@ "style-to-object": "^0.2.1", "unist-util-is": "^2.0.0", "web-namespaces": "^1.1.2" + }, + "dependencies": { + "unist-util-is": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz", + "integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==" + } } }, "hast-util-from-parse5": { @@ -8823,9 +9131,9 @@ "integrity": "sha512-C62CVn7jbjp89yOhhy7vrkSaB7Vk906Gtcw/Ihd+Iufnq+2pwOZjdPmpzpKLWJXPJBMDX3wXg4FqmdOayPcewA==" }, "hast-util-parse-selector": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.2.tgz", - "integrity": "sha512-jIMtnzrLTjzqgVEQqPEmwEZV+ea4zHRFTP8Z2Utw0I5HuBOXHzUPPQWr6ouJdJqDKLbFU/OEiYwZ79LalZkmmw==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.3.tgz", + "integrity": "sha512-nxbeqjQNxsvo/uYYAw9kij6td05YVUlf1qti09rVfbWSLT5H6wo3c+USIwX6nzXWk5kFZzXnEqO82856r0aM2Q==" }, "hast-util-raw": { "version": "4.0.0", @@ -8843,9 +9151,9 @@ }, "dependencies": { "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" } } }, @@ -8864,6 +9172,13 @@ "stringify-entities": "^1.0.1", "unist-util-is": "^2.0.0", "xtend": "^4.0.1" + }, + "dependencies": { + "unist-util-is": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz", + "integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==" + } } }, "hast-util-to-parse5": { @@ -8909,15 +9224,10 @@ "minimalistic-crypto-utils": "^1.0.1" } }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" - }, "hoist-non-react-statics": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz", - "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==", "requires": { "react-is": "^16.7.0" } @@ -8931,9 +9241,9 @@ } }, "hosted-git-info": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz", - "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==" + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==" }, "hpack.js": { "version": "2.1.6", @@ -9002,9 +9312,9 @@ } }, "http-cache-semantics": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", - "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz", + "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==" }, "http-deceiver": { "version": "1.2.7", @@ -9036,11 +9346,11 @@ "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=" }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", + "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", "requires": { - "eventemitter3": "^3.0.0", + "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" } @@ -9071,6 +9381,11 @@ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -9142,6 +9457,70 @@ "replace-ext": "^1.0.0" }, "dependencies": { + "@nodelib/fs.stat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", + "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "^1.0.1" + } + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + }, + "dir-glob": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "requires": { + "arrify": "^1.0.1", + "path-type": "^3.0.0" + } + }, + "fast-glob": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", + "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", + "requires": { + "@mrmlnc/readdir-enhanced": "^2.2.1", + "@nodelib/fs.stat": "^1.1.2", + "glob-parent": "^3.1.0", + "is-glob": "^4.0.0", + "merge2": "^1.2.3", + "micromatch": "^3.1.10" + } + }, + "file-type": { + "version": "10.11.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz", + "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==" + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, "globby": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", @@ -9183,10 +9562,25 @@ } } }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "requires": { + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" } } }, @@ -9200,18 +9594,6 @@ "mozjpeg": "^6.0.0" }, "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", @@ -9225,14 +9607,6 @@ "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } } } }, @@ -9247,18 +9621,6 @@ "pngquant-bin": "^5.0.0" }, "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, "execa": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", @@ -9272,6 +9634,11 @@ "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" } } }, @@ -9285,11 +9652,6 @@ "is-cwebp-readable": "^2.0.1" } }, - "immutable": { - "version": "3.7.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", - "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" - }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -9299,12 +9661,12 @@ } }, "import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" } }, "import-from": { @@ -9313,6 +9675,13 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "requires": { "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + } } }, "import-lazy": { @@ -9335,12 +9704,9 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "requires": { - "repeating": "^2.0.0" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" }, "indexes-of": { "version": "1.0.1", @@ -9352,6 +9718,11 @@ "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" }, + "infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -9372,115 +9743,116 @@ "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, "ink": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/ink/-/ink-2.3.0.tgz", - "integrity": "sha512-931rgXHAS3hM++8ygWPOBeHOFwTzHh3pDAVZtiBVOUH6tVvJijym43ODUy22ySo2NwYUFeR/Zj3xuWzBEKMiHw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/ink/-/ink-2.6.0.tgz", + "integrity": "sha512-nD/wlSuB6WnFsFB0nUcOJdy28YvvDer3eo+gezjvZqojGA4Rx5sQpacvN//Aai83DRgwrRTyKBl5aciOcfP3zQ==", "optional": true, "requires": { - "@types/react": "^16.8.6", - "arrify": "^1.0.1", - "auto-bind": "^2.0.0", - "chalk": "^2.4.1", - "cli-cursor": "^2.1.0", - "cli-truncate": "^1.1.0", + "ansi-escapes": "^4.2.1", + "arrify": "^2.0.1", + "auto-bind": "^3.0.0", + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-truncate": "^2.0.0", "is-ci": "^2.0.0", "lodash.throttle": "^4.1.1", "log-update": "^3.0.0", "prop-types": "^15.6.2", - "react-reconciler": "^0.20.0", - "scheduler": "^0.13.2", + "react-reconciler": "^0.24.0", + "scheduler": "^0.18.0", "signal-exit": "^3.0.2", - "slice-ansi": "^1.0.0", - "string-length": "^2.0.0", - "widest-line": "^2.0.0", - "wrap-ansi": "^5.0.0", + "slice-ansi": "^3.0.0", + "string-length": "^3.1.0", + "widest-line": "^3.1.0", + "wrap-ansi": "^6.2.0", "yoga-layout-prebuilt": "^1.9.3" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "optional": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "optional": true, "requires": { - "restore-cursor": "^2.0.0" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "optional": true - }, - "is-fullwidth-code-point": { + "astral-regex": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "optional": true }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "optional": true, "requires": { - "mimic-fn": "^1.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "optional": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "color-name": "~1.1.4" } }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "optional": true + }, "slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "optional": true, "requires": { - "is-fullwidth-code-point": "^2.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" } }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "optional": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "ansi-regex": "^5.0.0" } }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", "optional": true, "requires": { - "ansi-regex": "^4.1.0" + "has-flag": "^4.0.0" } }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "optional": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } } } @@ -9501,9 +9873,9 @@ "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==" }, "inquirer": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz", - "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.2.tgz", + "integrity": "sha512-cZGvHaHwcR9E3xK9EGO5pHKELU+yaeJO7l2qGKIbqk4bCuDuAn15LCoUTS2nSkfv9JybFlnAGrOcVpCDZZOLhw==", "requires": { "ansi-escapes": "^4.2.1", "chalk": "^2.4.2", @@ -9514,40 +9886,10 @@ "lodash": "^4.17.15", "mute-stream": "0.0.8", "run-async": "^2.2.0", - "rxjs": "^6.4.0", + "rxjs": "^6.5.3", "string-width": "^4.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", - "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^5.2.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - } } }, "internal-ip": { @@ -9584,9 +9926,9 @@ } }, "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" }, "ip": { "version": "1.1.5", @@ -9604,9 +9946,9 @@ "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" }, "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", + "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==" }, "is-accessor-descriptor": { "version": "0.1.6", @@ -9616,6 +9958,11 @@ "kind-of": "^3.0.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -9645,6 +9992,11 @@ "is-decimal": "^1.0.0" } }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -9659,9 +10011,9 @@ } }, "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" }, "is-builtin-module": { "version": "3.0.0", @@ -9672,9 +10024,9 @@ } }, "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" }, "is-ci": { "version": "2.0.0", @@ -9720,6 +10072,11 @@ "kind-of": "^3.0.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -9731,9 +10088,9 @@ } }, "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" }, "is-decimal": { "version": "1.0.3", @@ -9763,9 +10120,9 @@ "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" }, "is-docker": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz", - "integrity": "sha1-8EN01O7lMQ6ajhE78UlUEeRhdqE=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", + "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==" }, "is-extendable": { "version": "0.1.1", @@ -9786,12 +10143,9 @@ } }, "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-function": { "version": "1.0.1", @@ -9818,6 +10172,16 @@ "requires": { "global-dirs": "^0.1.0", "is-path-inside": "^1.0.0" + }, + "dependencies": { + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "requires": { + "path-is-inside": "^1.0.1" + } + } } }, "is-invalid-path": { @@ -9854,9 +10218,9 @@ "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" }, "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz", + "integrity": "sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==" }, "is-number": { "version": "3.0.0", @@ -9866,6 +10230,11 @@ "kind-of": "^3.0.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -9887,25 +10256,32 @@ "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=" }, "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==" }, "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", + "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "^2.1.0" + }, + "dependencies": { + "is-path-inside": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", + "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", + "requires": { + "path-is-inside": "^1.0.2" + } + } } }, "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "requires": { - "path-is-inside": "^1.0.1" - } + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", + "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==" }, "is-plain-obj": { "version": "1.1.0", @@ -9930,17 +10306,12 @@ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" - }, "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", "requires": { - "has": "^1.0.1" + "has": "^1.0.3" } }, "is-regexp": { @@ -9957,11 +10328,11 @@ } }, "is-relative-url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-2.0.0.tgz", - "integrity": "sha1-cpAtf+BLPUeS59sV+duEtyBMnO8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-3.0.0.tgz", + "integrity": "sha512-U1iSYRlY2GIMGuZx7gezlB5dp1Kheaym7zKzO1PV06mOihiWTXejLwm4poEJysPyXF+HtK/BEd0DVlcCh30pEA==", "requires": { - "is-absolute-url": "^2.0.0" + "is-absolute-url": "^3.0.0" } }, "is-resolvable": { @@ -9970,9 +10341,9 @@ "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==" }, "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" }, "is-root": { "version": "1.0.0", @@ -9992,6 +10363,11 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==" + }, "is-svg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", @@ -10001,11 +10377,11 @@ } }, "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "requires": { - "has-symbols": "^1.0.0" + "has-symbols": "^1.0.1" } }, "is-text-path": { @@ -10043,9 +10419,9 @@ } }, "is-what": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.3.1.tgz", - "integrity": "sha512-seFn10yAXy+yJlTRO+8VfiafC+0QJanGLMPTBWLrJm/QPauuchy0UXh8B6H5o9VA8BAzk0iYievt6mNp6gfaqA==" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.5.0.tgz", + "integrity": "sha512-00pwt/Jf7IaRh5m2Dp93Iw8LG2cd3OpDj3NrD1XPNUpAWVxPvBP296p4IiGmIU4Ur0f3f56IoIM+fS2pFYF+tQ==" }, "is-whitespace-character": { "version": "1.0.3", @@ -10063,23 +10439,20 @@ "integrity": "sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A==" }, "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz", + "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==" + }, + "is-yarn-global": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", + "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==" }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, - "isemail": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz", - "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==", - "requires": { - "punycode": "2.x.x" - } - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -10114,38 +10487,39 @@ } }, "iterall": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", - "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz", + "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==" }, "jest-worker": { - "version": "23.2.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.2.0.tgz", - "integrity": "sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", + "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", "requires": { - "merge-stream": "^1.0.1" + "merge-stream": "^2.0.0", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "requires": { + "has-flag": "^3.0.0" + } + } } }, "jimp": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.6.4.tgz", - "integrity": "sha512-WQVMoNhkcq/fgthZOWeMdIguCVPg+t4PDFfSxvbNcrECwl8eq3/Ou2whcFWWjyW45m43yAJEY2UT7acDKl6uSQ==", - "requires": { - "@babel/polyfill": "^7.0.0", - "@jimp/custom": "^0.6.4", - "@jimp/plugins": "^0.6.4", - "@jimp/types": "^0.6.4", - "core-js": "^2.5.7" - } - }, - "joi": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-11.4.0.tgz", - "integrity": "sha512-O7Uw+w/zEWgbL6OcHbyACKSj0PkQeUgmehdoXVSxt92QFCq4+1390Rwh5moI2K/OgC7D8RHRZqHZxT2husMJHA==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.6.8.tgz", + "integrity": "sha512-F7emeG7Hp61IM8VFbNvWENLTuHe0ghizWPuP4JS9ujx2r5mCVYEd/zdaz6M2M42ZdN41blxPajLWl9FXo7Mr2Q==", "requires": { - "hoek": "4.x.x", - "isemail": "3.x.x", - "topo": "2.x.x" + "@jimp/custom": "^0.6.8", + "@jimp/plugins": "^0.6.8", + "@jimp/types": "^0.6.8", + "core-js": "^2.5.7", + "regenerator-runtime": "^0.13.3" } }, "jpeg-js": { @@ -10223,11 +10597,18 @@ "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==" }, "json5": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", - "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz", + "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==", "requires": { "minimist": "^1.2.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + } } }, "jsonfile": { @@ -10255,18 +10636,18 @@ } }, "jsx-ast-utils": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz", - "integrity": "sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz", + "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==", "requires": { "array-includes": "^3.0.3", "object.assign": "^4.1.0" } }, "keyv": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", - "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", + "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", "requires": { "json-buffer": "3.0.0" } @@ -10296,25 +10677,25 @@ } }, "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", + "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", "requires": { - "package-json": "^4.0.0" + "package-json": "^6.3.0" } }, "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "^2.0.0" } }, "leven": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", - "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" }, "levn": { "version": "0.3.0", @@ -10325,6 +10706,11 @@ "type-check": "~0.3.2" } }, + "lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" + }, "load-bmfont": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.0.tgz", @@ -10356,6 +10742,21 @@ "parse-json": "^2.2.0", "pify": "^2.0.0", "strip-bom": "^3.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "^1.2.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } } }, "loader-fs-cache": { @@ -10426,15 +10827,20 @@ "requires": { "minimist": "^1.2.0" } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "requires": { - "p-locate": "^2.0.0", + "p-locate": "^3.0.0", "path-exists": "^3.0.0" } }, @@ -10539,15 +10945,20 @@ "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=" }, + "lodash.unescape": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", + "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=" + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, "log-update": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-3.2.0.tgz", - "integrity": "sha512-KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-3.3.0.tgz", + "integrity": "sha512-YSKm5n+YjZoGZT5lfmOqasVH1fIH9xQA9A81Y48nZ99PxAP62vdCCtua+Gcu6oTn0nqtZd/LwRV+Vflo53ZDWA==", "optional": true, "requires": { "ansi-escapes": "^3.2.0", @@ -10561,12 +10972,6 @@ "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "optional": true }, - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "optional": true - }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -10576,16 +10981,10 @@ "restore-cursor": "^2.0.0" } }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "optional": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "optional": true }, "onetime": { @@ -10606,37 +11005,6 @@ "onetime": "^2.0.0", "signal-exit": "^3.0.2" } - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "optional": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "optional": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "optional": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } } } }, @@ -10661,14 +11029,14 @@ } }, "loglevel": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz", - "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==" + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz", + "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==" }, "lokijs": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/lokijs/-/lokijs-1.5.7.tgz", - "integrity": "sha512-2SqUV6JH4f15Z5/7LVsyadSUwHhZppxhujgy/VhVqiRYMGt5oaocb7fV/3JGjHJ6rTuEIajnpTLGRz9cJW/c3g==" + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/lokijs/-/lokijs-1.5.8.tgz", + "integrity": "sha512-D8E3TBrY35o1ELnonp2MF8b3wKu2tVNl2TqRjvS+95oPMMe7OoIAxNY1qr+5BEZwnWn2V4ErAjVt000DonM+FA==" }, "longest": { "version": "1.0.1", @@ -10689,12 +11057,12 @@ } }, "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz", + "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==", "requires": { "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "signal-exit": "^3.0.2" } }, "lowercase-keys": { @@ -10711,22 +11079,27 @@ "indent-string": "^2.1.0", "longest": "^1.0.0", "meow": "^3.3.0" + }, + "dependencies": { + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "^2.0.0" + } + } } }, "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz", + "integrity": "sha1-tcvwFVbBaWb+vlTO7A+03JDfbCg=", "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "^1.0.1", + "yallist": "^2.0.0" } }, - "ltcdr": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ltcdr/-/ltcdr-2.2.1.tgz", - "integrity": "sha1-Wrh60dTB2rjowIu/A37gwZAih88=" - }, "make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -10736,13 +11109,18 @@ "semver": "^5.6.0" }, "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, + "mamacro": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", + "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==" + }, "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -10787,6 +11165,13 @@ "charenc": "~0.0.1", "crypt": "~0.0.1", "is-buffer": "~1.1.1" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + } } }, "md5-file": { @@ -10808,17 +11193,17 @@ } }, "mdast-util-compact": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz", - "integrity": "sha512-nRiU5GpNy62rZppDKbLwhhtw5DXoFMqw9UNZFmlPsNaQCZ//WLjGKUwWMdJrUH+Se7UvtO2gXtAMe0g/N+eI5w==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz", + "integrity": "sha512-3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==", "requires": { "unist-util-visit": "^1.1.0" } }, "mdast-util-definitions": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz", - "integrity": "sha512-HfUArPog1j4Z78Xlzy9Q4aHLnrF/7fb57cooTHypyGoe2XFNbcx/kWZDoOz+ra8CkUzvg3+VHV434yqEd1DRmA==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-1.2.5.tgz", + "integrity": "sha512-CJXEdoLfiISCDc2JB6QLb79pYfI6+GcIH+W2ox9nMc7od0Pz+bovcHsiq29xAQY6ayqe/9CsK2VzkSJdg1pFYA==", "requires": { "unist-util-visit": "^1.0.0" } @@ -10853,18 +11238,48 @@ } }, "mdast-util-to-string": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz", - "integrity": "sha512-868pp48gUPmZIhfKrLbaDneuzGiw3OTDjHc5M1kAepR2CWBJ+HpEsm252K4aXdiP5coVZaJPOqGtVU6Po8xnXg==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.7.tgz", + "integrity": "sha512-P+gdtssCoHOX+eJUrrC30Sixqao86ZPlVjR5NEAoy0U79Pfxb1Y0Gntei0+GrnQD4T04X9xA8tcugp90cSmNow==" }, "mdast-util-toc": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-2.1.0.tgz", - "integrity": "sha512-ove/QQWSrYOrf9G3xn2MTAjy7PKCtCmm261wpQwecoPAsUtkihkMVczxFqil7VihxgSz4ID9c8bBTsyXR30gQg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-5.0.0.tgz", + "integrity": "sha512-1ExJKC+85/+Q2LfuASOjdGTB7n/ikQperjiv+7OEVCpRbabr/DGZzEXEZfsZr/k4Pd3g/Gim9DV44/rPjczMAw==", "requires": { - "github-slugger": "^1.1.1", - "mdast-util-to-string": "^1.0.2", - "unist-util-visit": "^1.1.0" + "@types/mdast": "^3.0.3", + "@types/unist": "^2.0.3", + "extend": "^3.0.2", + "github-slugger": "^1.2.1", + "mdast-util-to-string": "^1.0.5", + "unist-util-is": "^4.0.0", + "unist-util-visit": "^2.0.0" + }, + "dependencies": { + "unist-util-is": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.1.tgz", + "integrity": "sha512-7NYjErP4LJtkEptPR22wO5RsCPnHZZrop7t2SoQzjvpFedCFer4WW8ujj9GI5DkUX7yVcffXLjoURf6h2QUv6Q==" + }, + "unist-util-visit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.1.tgz", + "integrity": "sha512-bEDa5S/O8WRDeI1mLaMoKuFFi89AjF+UAoMNxO+bbVdo06q+53Vhq4iiv1PenL6Rx1ZxIpXIzqZoc5HD2I1oMA==", + "requires": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0", + "unist-util-visit-parents": "^3.0.0" + } + }, + "unist-util-visit-parents": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.0.1.tgz", + "integrity": "sha512-umEOTkm6/y1gIqPrqet55mYqlvGXCia/v1FSc5AveLAI7jFmOAIbqiwcHcviLcusAkEQt1bq2hixCKO9ltMb2Q==", + "requires": { + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0" + } + } } }, "mdn-data": { @@ -10888,11 +11303,13 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "requires": { - "mimic-fn": "^1.0.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" } }, "memoize-one": { @@ -10947,6 +11364,28 @@ "strip-bom": "^2.0.0" } }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "requires": { + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "^1.2.0" + } + }, "path-exists": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", @@ -10965,6 +11404,11 @@ "pinkie-promise": "^2.0.0" } }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -10995,9 +11439,9 @@ } }, "merge-anything": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.1.tgz", - "integrity": "sha512-dYOIAl9GFCJNctSIHWOj9OJtarCjsD16P8ObCl6oxrujAG+kOvlwJuOD9/O9iYZ9aTi1RGpGTG9q9etIvuUikQ==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.4.tgz", + "integrity": "sha512-l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ==", "requires": { "is-what": "^3.3.1" } @@ -11008,17 +11452,14 @@ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, "merge-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", - "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", - "requires": { - "readable-stream": "^2.0.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" }, "merge2": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz", - "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz", + "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==" }, "methods": { "version": "1.1.2", @@ -11060,22 +11501,22 @@ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" }, "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" }, "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", "requires": { - "mime-db": "1.40.0" + "mime-db": "1.43.0" } }, "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "mimic-response": { "version": "1.0.1", @@ -11091,15 +11532,41 @@ } }, "mini-css-extract-plugin": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz", - "integrity": "sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz", + "integrity": "sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==", "requires": { "loader-utils": "^1.1.0", + "normalize-url": "1.9.1", "schema-utils": "^1.0.0", "webpack-sources": "^1.1.0" }, "dependencies": { + "normalize-url": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", + "requires": { + "object-assign": "^4.0.1", + "prepend-http": "^1.0.0", + "query-string": "^4.1.0", + "sort-keys": "^1.0.0" + } + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + }, + "query-string": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "requires": { + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" + } + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -11109,6 +11576,14 @@ "ajv-errors": "^1.0.0", "ajv-keywords": "^3.1.0" } + }, + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "requires": { + "is-plain-obj": "^1.0.0" + } } } }, @@ -11136,32 +11611,39 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, "minipass": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", + "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "yallist": "^4.0.0" }, "dependencies": { "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } }, "minizlib": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz", + "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==", "requires": { - "minipass": "^2.2.1" + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "dependencies": { + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } } }, "mississippi": { @@ -11182,9 +11664,9 @@ } }, "mitt": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.1.3.tgz", - "integrity": "sha512-mUDCnVNsAi+eD6qA0HkRkwYczbLHJ49z17BGe2PYRhZL4wpZUFZGJHU7/5tmvohoma+Hdn0Vh/oJTiPEmgSruA==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz", + "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==" }, "mixin-deep": { "version": "1.3.2", @@ -11208,16 +11690,9 @@ "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - } + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "0.0.8" } }, "moment": { @@ -11341,11 +11816,18 @@ "integrity": "sha512-OY2QhGdf6jpYfHqS4vJwqF7aIBZkaMjMUkcHcskMPitvXLuYNGdQvgVWI/5yKwkmIdmhft3ounSJv+Re2yydng==" }, "node-abi": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz", - "integrity": "sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.13.0.tgz", + "integrity": "sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==", "requires": { "semver": "^5.4.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "node-emoji": { @@ -11371,14 +11853,9 @@ } }, "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==" - }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=" + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", + "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==" }, "node-libs-browser": { "version": "2.2.1", @@ -11417,12 +11894,17 @@ } } }, + "node-object-hash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.0.0.tgz", + "integrity": "sha512-VZR0zroAusy1ETZMZiGeLkdu50LGjG5U1KHZqTruqtTyQ2wfWhHG2Ow4nsUbfTFGlaREgNHcCWoM/OzEm6p+NQ==" + }, "node-releases": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.27.tgz", - "integrity": "sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==", + "version": "1.1.44", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.44.tgz", + "integrity": "sha512-NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw==", "requires": { - "semver": "^5.3.0" + "semver": "^6.3.0" } }, "noms": { @@ -11471,6 +11953,13 @@ "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "normalize-path": { @@ -11539,11 +12028,6 @@ "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-0.1.1.tgz", "integrity": "sha1-F76av80/8OFRL2/Er8sfUDk3j64=" }, - "nullthrows": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz", - "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==" - }, "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", @@ -11587,6 +12071,11 @@ "is-descriptor": "^0.1.0" } }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -11607,6 +12096,16 @@ "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==" }, + "object-inspect": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" + }, + "object-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", + "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==" + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -11637,34 +12136,34 @@ } }, "object.entries": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz", - "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz", + "integrity": "sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==", "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.12.0", + "es-abstract": "^1.17.0-next.1", "function-bind": "^1.1.1", "has": "^1.0.3" } }, "object.fromentries": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz", - "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz", + "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==", "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.11.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", "function-bind": "^1.1.1", - "has": "^1.0.1" + "has": "^1.0.3" } }, "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" } }, "object.pick": { @@ -11676,12 +12175,12 @@ } }, "object.values": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", - "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.12.0", + "es-abstract": "^1.17.0-next.1", "function-bind": "^1.1.1", "has": "^1.0.3" } @@ -11723,12 +12222,20 @@ "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", "requires": { "mimic-fn": "^2.1.0" + } + }, + "open": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", + "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", + "requires": { + "is-wsl": "^1.1.0" }, "dependencies": { - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" } } }, @@ -11738,11 +12245,18 @@ "integrity": "sha512-nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA==" }, "opn": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", - "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", + "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==", "requires": { "is-wsl": "^1.1.0" + }, + "dependencies": { + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + } } }, "optimize-css-assets-webpack-plugin": { @@ -11755,16 +12269,16 @@ } }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "requires": { "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", + "fast-levenshtein": "~2.0.6", "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "word-wrap": "~1.2.3" } }, "original": { @@ -11788,19 +12302,30 @@ "arch": "^2.1.0" } }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + }, + "dependencies": { + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + } } }, "os-tmpdir": { @@ -11809,9 +12334,9 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" }, "p-defer": { "version": "1.0.0", @@ -11819,11 +12344,11 @@ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" }, "p-event": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz", - "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz", + "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==", "requires": { - "p-timeout": "^1.1.1" + "p-timeout": "^2.0.1" } }, "p-finally": { @@ -11837,25 +12362,28 @@ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", + "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", "requires": { - "p-try": "^1.0.0" + "p-try": "^2.0.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "requires": { - "p-limit": "^1.1.0" + "p-limit": "^2.0.0" } }, "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "requires": { + "aggregate-error": "^3.0.0" + } }, "p-map-series": { "version": "1.0.0", @@ -11884,45 +12412,45 @@ } }, "p-timeout": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", - "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", + "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", "requires": { "p-finally": "^1.0.0" } }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", + "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" + "got": "^9.6.0", + "registry-auth-token": "^4.0.0", + "registry-url": "^5.0.0", + "semver": "^6.2.0" }, "dependencies": { "got": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", - "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", "requires": { - "create-error-class": "^3.0.0", + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" } } } @@ -11933,11 +12461,11 @@ "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==" }, "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "requires": { - "cyclist": "~0.2.2", + "cyclist": "^1.0.1", "inherits": "^2.0.3", "readable-stream": "^2.1.5" } @@ -11948,19 +12476,12 @@ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "requires": { "callsites": "^3.0.0" - }, - "dependencies": { - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" - } } }, "parse-asn1": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", - "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", + "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", "requires": { "asn1.js": "^4.0.0", "browserify-aes": "^1.0.0", @@ -12014,20 +12535,19 @@ } }, "parse-headers": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.2.tgz", - "integrity": "sha512-/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg==", - "requires": { - "for-each": "^0.3.3", - "string.prototype.trim": "^1.1.2" - } + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz", + "integrity": "sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==" }, "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", "requires": { - "error-ex": "^1.2.0" + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" } }, "parse-latin": { @@ -12169,12 +12689,9 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "requires": { - "pify": "^2.0.0" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, "pbkdf2": { "version": "3.0.17", @@ -12209,14 +12726,14 @@ "integrity": "sha1-GN4vl+S/epVRrXURlCtUlverpmA=" }, "picomatch": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", + "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==" }, "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" }, "pinkie": { "version": "2.0.4", @@ -12245,46 +12762,6 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "requires": { "find-up": "^3.0.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", - "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - } } }, "pngjs": { @@ -12303,18 +12780,6 @@ "logalot": "^2.0.0" }, "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, "execa": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", @@ -12328,6 +12793,11 @@ "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" } } }, @@ -12340,27 +12810,30 @@ } }, "portfinder": { - "version": "1.0.23", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz", - "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==", + "version": "1.0.25", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", + "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", "requires": { - "async": "^1.5.2", - "debug": "^2.2.0", - "mkdirp": "0.5.x" + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.1" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "requires": { - "ms": "2.0.0" + "lodash": "^4.17.14" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } } } }, @@ -12370,9 +12843,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", - "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", + "version": "7.0.26", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz", + "integrity": "sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -12425,13 +12898,13 @@ }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } }, "postcss-value-parser": { @@ -12521,6 +12994,42 @@ "requires": { "cosmiconfig": "^5.0.0", "import-cwd": "^2.0.0" + }, + "dependencies": { + "cosmiconfig": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", + "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", + "requires": { + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" + } + }, + "import-fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", + "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "requires": { + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + } } }, "postcss-loader": { @@ -12583,13 +13092,13 @@ }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } }, "postcss-selector-parser": { @@ -12652,13 +13161,13 @@ }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } }, "postcss-value-parser": { @@ -12900,13 +13409,13 @@ }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } }, "postcss-value-parser": { @@ -12927,6 +13436,11 @@ "postcss-value-parser": "^3.0.0" }, "dependencies": { + "is-absolute-url": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=" + }, "postcss-value-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", @@ -12979,13 +13493,13 @@ }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } } } @@ -13067,9 +13581,9 @@ } }, "prebuild-install": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz", - "integrity": "sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz", + "integrity": "sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", @@ -13080,33 +13594,18 @@ "node-abi": "^2.7.0", "noop-logger": "^0.1.1", "npmlog": "^4.0.1", - "os-homedir": "^1.0.1", - "pump": "^2.0.1", + "pump": "^3.0.0", "rc": "^1.2.7", - "simple-get": "^2.7.0", - "tar-fs": "^1.13.0", + "simple-get": "^3.0.3", + "tar-fs": "^2.0.0", "tunnel-agent": "^0.6.0", "which-pm-runs": "^1.0.0" }, "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "simple-get": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz", - "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==", - "requires": { - "decompress-response": "^3.3.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } }, @@ -13116,14 +13615,14 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, "pretty-bytes": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz", - "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=" + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", + "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==" }, "pretty-error": { "version": "2.1.1", @@ -13135,9 +13634,9 @@ } }, "prismjs": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz", - "integrity": "sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.18.0.tgz", + "integrity": "sha512-N0r3i/Cto516V8+GKKamhsPVZSFcO0TMUBtIDW6uq6BVqoC3FNtZVZ+cmH16N2XtGQlgRN+sFUTjOdCsEP51qw==", "requires": { "clipboard": "^2.0.0" } @@ -13189,9 +13688,9 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" }, "prompts": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz", - "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz", + "integrity": "sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==", "requires": { "kleur": "^3.0.3", "sisteransi": "^1.0.3" @@ -13245,9 +13744,9 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "psl": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", - "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz", + "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==" }, "public-encrypt": { "version": "4.0.3", @@ -13386,12 +13885,24 @@ "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + } } }, "react": { - "version": "16.9.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz", - "integrity": "sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==", + "version": "16.12.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz", + "integrity": "sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -13434,9 +13945,9 @@ "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" }, "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "2.2.1", @@ -13468,6 +13979,16 @@ "restore-cursor": "^2.0.0" } }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -13524,6 +14045,11 @@ "through": "^2.3.6" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -13560,6 +14086,25 @@ } } }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -13578,14 +14123,6 @@ "mimic-fn": "^1.0.0" } }, - "opn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz", - "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==", - "requires": { - "is-wsl": "^1.1.0" - } - }, "restore-cursor": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", @@ -13595,41 +14132,54 @@ "signal-exit": "^3.0.2" } }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } } } }, "react-dom": { - "version": "16.9.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.9.0.tgz", - "integrity": "sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==", + "version": "16.12.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz", + "integrity": "sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.15.0" - }, - "dependencies": { - "scheduler": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz", - "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - } + "scheduler": "^0.18.0" } }, "react-error-overlay": { @@ -13654,9 +14204,9 @@ } }, "react-hot-loader": { - "version": "4.12.11", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.11.tgz", - "integrity": "sha512-ySsg1hPwr/5dkZCJVp1nZRbwbpbEQ+3e2+bn/D681Wvr9+o+5bLKkTGq0TXskj8HgCS3ScysXddOng9Cg+JKzw==", + "version": "4.12.18", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.18.tgz", + "integrity": "sha512-qYD0Qi9lIbg9jLyfmodfqvAQqCBsoPKxAhca8Nxvy2/2pO5Q9r2kM28jN0bbbSnhwK8dJ7FjsfVtXKOxMW+bqw==", "requires": { "fast-levenshtein": "^2.0.6", "global": "^4.3.0", @@ -13676,9 +14226,9 @@ } }, "react-is": { - "version": "16.8.3", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz", - "integrity": "sha512-Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA==" + "version": "16.12.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", + "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" }, "react-lifecycles-compat": { "version": "3.0.4", @@ -13686,23 +14236,22 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-reconciler": { - "version": "0.20.4", - "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.20.4.tgz", - "integrity": "sha512-kxERc4H32zV2lXMg/iMiwQHOtyqf15qojvkcZ5Ja2CPkjVohHw9k70pdDBwrnQhLVetUJBSYyqU3yqrlVTOajA==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.24.0.tgz", + "integrity": "sha512-gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw==", "optional": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.13.6" + "scheduler": "^0.18.0" } }, "react-side-effect": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz", - "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", + "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", "requires": { - "exenv": "^1.2.1", "shallowequal": "^1.0.1" } }, @@ -13721,13 +14270,6 @@ "requires": { "pify": "^4.0.1", "with-open-file": "^0.1.6" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } } }, "read-pkg": { @@ -13738,6 +14280,21 @@ "load-json-file": "^2.0.0", "normalize-package-data": "^2.3.2", "path-type": "^2.0.0" + }, + "dependencies": { + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "requires": { + "pify": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } } }, "read-pkg-up": { @@ -13747,12 +14304,52 @@ "requires": { "find-up": "^2.0.0", "read-pkg": "^2.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=" + } } }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -13774,11 +14371,11 @@ } }, "rebass": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/rebass/-/rebass-4.0.5.tgz", - "integrity": "sha512-8MZngk/AmbC8u8pGmI1WelbsKYjmN9Z91C11G4ESB9QZnoppWsI+OAqio1/4/l6dxHmwZ/hR8Q4UApF+IVEprA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/rebass/-/rebass-4.0.7.tgz", + "integrity": "sha512-GJot6j6Qcr7jk1QIgf9qBoud75CGRpN8pGcEo98TSp4KNSWV01ZLvGwFKGI35oEBuNs+lpEd3+pnwkQUTSFytg==", "requires": { - "reflexbox": "^4.0.5" + "reflexbox": "^4.0.6" } }, "recursive-readdir": { @@ -13806,12 +14403,22 @@ "requires": { "indent-string": "^2.1.0", "strip-indent": "^1.0.1" + }, + "dependencies": { + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "^2.0.0" + } + } } }, "redux": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.4.tgz", - "integrity": "sha512-vKv4WdiJxOWKxK0yRoaK3Y4pxxB0ilzVx6dszU2W8wLxlb2yikRph4iV/ymtdJ6ZxpBLFbyrxklnT5yBbQSl3Q==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz", + "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==", "requires": { "loose-envify": "^1.4.0", "symbol-observable": "^1.2.0" @@ -13823,15 +14430,14 @@ "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" }, "reflexbox": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/reflexbox/-/reflexbox-4.0.5.tgz", - "integrity": "sha512-SFWlrlKusgQVqjEimlLGNls3khjMlaTLrrF1H7YY7FfXv/mKK5mREDOW4l95D6Qa1kGoyM3hF+H5RLb3N6bCCA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/reflexbox/-/reflexbox-4.0.6.tgz", + "integrity": "sha512-UNUL4YoJEXAPjRKHuty1tuOk+LV1nDJ2KYViDcH7lYm5yU3AQ+EKNXxPU3E14bQNK/pE09b1hYl+ZKdA94tWLQ==", "requires": { "@emotion/core": "^10.0.0", "@emotion/styled": "^10.0.0", "@styled-system/css": "^5.0.0", "@styled-system/should-forward-prop": "^5.0.0", - "react": "^16.8.6", "styled-system": "^5.0.0" } }, @@ -13870,10 +14476,14 @@ "safe-regex": "^1.1.0" } }, - "regexp-tree": { - "version": "0.1.11", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz", - "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==" + "regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } }, "regexpp": { "version": "2.0.1", @@ -13881,9 +14491,9 @@ "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==" }, "regexpu-core": { - "version": "4.5.5", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.5.tgz", - "integrity": "sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz", + "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==", "requires": { "regenerate": "^1.4.0", "regenerate-unicode-properties": "^8.1.0", @@ -13894,31 +14504,31 @@ } }, "registry-auth-token": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", - "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz", + "integrity": "sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==", "requires": { - "rc": "^1.1.6", + "rc": "^1.2.8", "safe-buffer": "^5.0.1" } }, "registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", + "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", "requires": { - "rc": "^1.0.1" + "rc": "^1.2.8" } }, "regjsgen": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz", - "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==" + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz", + "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==" }, "regjsparser": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz", - "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz", + "integrity": "sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q==", "requires": { "jsesc": "~0.5.0" }, @@ -13930,15 +14540,6 @@ } } }, - "relay-runtime": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-2.0.0.tgz", - "integrity": "sha512-o/LPFHTI6+3FLJXM3Ec4N6hzkKYILVHYRJThNX0UQlMnqjTVPR6NO4qFE2QzzEiUS+lys+qfnvBzSmNbSh1zWQ==", - "requires": { - "@babel/runtime": "^7.0.0", - "fbjs": "^1.0.0" - } - }, "remark": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz", @@ -14053,6 +14654,21 @@ "htmlparser2": "^3.3.0", "strip-ansi": "^3.0.0", "utila": "^0.4.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } } }, "repeat-element": { @@ -14118,9 +14734,9 @@ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, "requires-port": { "version": "1.0.0", @@ -14128,9 +14744,9 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz", + "integrity": "sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==", "requires": { "path-parse": "^1.0.6" } @@ -14141,6 +14757,13 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "requires": { "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + } } }, "resolve-dir": { @@ -14153,9 +14776,9 @@ } }, "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "resolve-url": { "version": "0.2.1", @@ -14185,9 +14808,9 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, "retext-english": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/retext-english/-/retext-english-3.0.3.tgz", - "integrity": "sha512-qltUsSjHMvCvpAm90qRvzK1DEBOnhSK3tUQk5aHFCBtiMHccp6FhlCH0mQ9vFcBf5BsG7GEBdPysTlY3g9Lchg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/retext-english/-/retext-english-3.0.4.tgz", + "integrity": "sha512-yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw==", "requires": { "parse-english": "^4.0.0", "unherit": "^1.0.4" @@ -14198,6 +14821,11 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + }, "rgb-regex": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", @@ -14209,9 +14837,9 @@ "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" }, "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "requires": { "glob": "^7.1.3" } @@ -14233,6 +14861,11 @@ "is-promise": "^2.1.0" } }, + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==" + }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -14255,9 +14888,9 @@ } }, "rxjs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", - "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", + "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", "requires": { "tslib": "^1.9.0" } @@ -14303,10 +14936,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "scheduler": { - "version": "0.13.6", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz", - "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==", - "optional": true, + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz", + "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -14322,12 +14954,12 @@ } }, "scroll-behavior": { - "version": "0.9.10", - "resolved": "https://registry.npmjs.org/scroll-behavior/-/scroll-behavior-0.9.10.tgz", - "integrity": "sha512-JVJQkBkqMLEM4ATtbHTKare97zhz/qlla9mNttFYY/bcpyOb4BuBGEQ/N9AQWXvshzf6zo9jP60TlphnJ4YPoQ==", + "version": "0.9.11", + "resolved": "https://registry.npmjs.org/scroll-behavior/-/scroll-behavior-0.9.11.tgz", + "integrity": "sha512-Eo32cg2uFiQwEiJXHHoTfXLybTlyA1O3ZOIiTz8EqRWie+ExL+7l8PcejhKT+5QmRtykXSlsTRVDC3BVB3S/bg==", "requires": { - "dom-helpers": "^3.2.1", - "invariant": "^2.2.2" + "dom-helpers": "^3.4.0", + "invariant": "^2.2.4" } }, "section-matter": { @@ -14379,17 +15011,17 @@ "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, "selfsigned": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", - "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==", + "version": "1.10.7", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", + "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", "requires": { - "node-forge": "0.7.5" + "node-forge": "0.9.0" } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "semver-diff": { "version": "2.1.0", @@ -14397,6 +15029,13 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "requires": { "semver": "^5.0.3" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "semver-regex": { @@ -14410,6 +15049,13 @@ "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=", "requires": { "semver": "^5.3.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, "send": { @@ -14460,9 +15106,9 @@ } }, "serialize-javascript": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.8.0.tgz", - "integrity": "sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", + "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==" }, "serve-index": { "version": "1.9.1", @@ -14581,27 +15227,19 @@ "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, "sharp": { - "version": "0.22.1", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.22.1.tgz", - "integrity": "sha512-lXzSk/FL5b/MpWrT1pQZneKe25stVjEbl6uhhJcTULm7PhmJgKKRbTDM/vtjyUuC/RLqL2PRyC4rpKwbv3soEw==", + "version": "0.23.4", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.23.4.tgz", + "integrity": "sha512-fJMagt6cT0UDy9XCsgyLi0eiwWWhQRxbwGmqQT6sY8Av4s0SVsT/deg8fobBQCTDU5iXRgz0rAeXoE2LBZ8g+Q==", "requires": { - "color": "^3.1.1", + "color": "^3.1.2", "detect-libc": "^1.0.3", - "fs-copy-file-sync": "^1.1.1", - "nan": "^2.13.2", + "nan": "^2.14.0", "npmlog": "^4.1.2", - "prebuild-install": "^5.3.0", - "semver": "^6.0.0", - "simple-get": "^3.0.3", - "tar": "^4.4.8", + "prebuild-install": "^5.3.3", + "semver": "^6.3.0", + "simple-get": "^3.1.0", + "tar": "^5.0.5", "tunnel-agent": "^0.6.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } } }, "shebang-command": { @@ -14638,24 +15276,34 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, - "signedsource": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/signedsource/-/signedsource-1.0.0.tgz", - "integrity": "sha1-HdrOSYF5j5O9gzlzgD2A1S6TrWo=" - }, "simple-concat": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" }, "simple-get": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz", - "integrity": "sha512-Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", + "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", "requires": { - "decompress-response": "^3.3.0", + "decompress-response": "^4.2.0", "once": "^1.3.1", "simple-concat": "^1.0.0" + }, + "dependencies": { + "decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", + "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "requires": { + "mimic-response": "^2.0.0" + } + }, + "mimic-response": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz", + "integrity": "sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==" + } } }, "simple-swizzle": { @@ -14674,14 +15322,14 @@ } }, "sisteransi": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz", - "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz", + "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==" }, "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "slice-ansi": { "version": "2.1.0", @@ -14700,6 +15348,11 @@ } } }, + "slugify": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.6.tgz", + "integrity": "sha512-wA9XS475ZmGNlEnYYLPReSfuz/c3VQsEMoU43mi6OnKMCdbnFXd4/Yg7J0lBv8jkPolacMpOrWEaoYxuE1+hoQ==" + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -14800,6 +15453,11 @@ "kind-of": "^3.2.0" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -14811,44 +15469,34 @@ } }, "socket.io": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz", - "integrity": "sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz", + "integrity": "sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==", "requires": { "debug": "~4.1.0", - "engine.io": "~3.3.1", + "engine.io": "~3.4.0", "has-binary2": "~1.0.2", "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.2.0", - "socket.io-parser": "~3.3.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } + "socket.io-client": "2.3.0", + "socket.io-parser": "~3.4.0" } }, "socket.io-adapter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz", - "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", + "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==" }, "socket.io-client": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.2.0.tgz", - "integrity": "sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz", + "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==", "requires": { "backo2": "1.0.2", "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.3.1", + "debug": "~4.1.0", + "engine.io-client": "~3.4.0", "has-binary2": "~1.0.2", "has-cors": "1.1.0", "indexof": "0.0.1", @@ -14864,28 +15512,45 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } + "isarray": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "socket.io-parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz", + "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", + "requires": { + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "isarray": "2.0.1" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + } + } } } }, "socket.io-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz", - "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz", + "integrity": "sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==", "requires": { "component-emitter": "1.2.1", - "debug": "~3.1.0", + "debug": "~4.1.0", "isarray": "2.0.1" }, "dependencies": { @@ -14894,23 +15559,10 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, "isarray": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -14998,11 +15650,11 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "requires": { - "atob": "^2.1.1", + "atob": "^2.1.2", "decode-uri-component": "^0.2.0", "resolve-url": "^0.2.1", "source-map-url": "^0.4.0", @@ -15010,9 +15662,9 @@ } }, "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz", + "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -15073,16 +15725,6 @@ "http-deceiver": "^1.2.7", "select-hose": "^2.0.0", "spdy-transport": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } } }, "spdy-transport": { @@ -15096,16 +15738,8 @@ "obuf": "^1.1.2", "readable-stream": "^3.0.6", "wbuf": "^1.7.3" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, + }, + "dependencies": { "readable-stream": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", @@ -15141,6 +15775,11 @@ "lpad-align": "^1.0.1" }, "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", @@ -15158,6 +15797,14 @@ "supports-color": "^2.0.0" } }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -15214,9 +15861,9 @@ "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==" }, "stackframe": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz", - "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.1.tgz", + "integrity": "sha512-0PlYhdKh6AfFxRyK/v+6/k+/mMfyiEBbTM5L94D0ZytQnJ166wuwoTYLHFWGbs2dpA8Rgq763KGWmN1EQEYHRQ==" }, "state-toggle": { "version": "1.0.2", @@ -15301,9 +15948,9 @@ } }, "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" }, "strict-uri-encode": { "version": "1.1.0", @@ -15311,30 +15958,13 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, "string-length": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", - "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz", + "integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==", "optional": true, "requires": { "astral-regex": "^1.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "optional": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "optional": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } + "strip-ansi": "^5.2.0" } }, "string-similarity": { @@ -15350,41 +15980,40 @@ } }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^5.0.0" } } } }, - "string.prototype.trim": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz", - "integrity": "sha512-9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==", + "string.prototype.trimleft": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", + "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string.prototype.trimright": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", + "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.13.0", "function-bind": "^1.1.1" } }, @@ -15418,11 +16047,18 @@ } }, "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + } } }, "strip-bom": { @@ -15457,6 +16093,11 @@ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + }, "strip-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", @@ -15466,9 +16107,9 @@ } }, "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==" }, "strip-outer": { "version": "1.0.1", @@ -15479,12 +16120,24 @@ } }, "style-loader": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz", - "integrity": "sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==", + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", + "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", "requires": { "loader-utils": "^1.1.0", - "schema-utils": "^0.4.5" + "schema-utils": "^1.0.0" + }, + "dependencies": { + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + } } }, "style-to-object": { @@ -15496,9 +16149,9 @@ } }, "styled-components": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.4.0.tgz", - "integrity": "sha512-xQ6vTI/0zNjZ1BBDRxyjvBddrxhQ3DxjeCdaLM1lSn5FDnkTOQgRkmWvcUiTajqc5nJqKVl+7sUioMqktD0+Zw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.4.1.tgz", + "integrity": "sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g==", "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/traverse": "^7.0.0", @@ -15516,22 +16169,22 @@ } }, "styled-system": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/styled-system/-/styled-system-5.1.1.tgz", - "integrity": "sha512-jTFstSW5valWSkCsJhgh0fqUFLi1hL+S7Zj6Q6Dj1VTkR77l8B3/mgtSROjjiIwRG9SLW1BsJWjLn8mTNiwqgg==", - "requires": { - "@styled-system/background": "^5.1.1", - "@styled-system/border": "^5.1.1", - "@styled-system/color": "^5.1.1", - "@styled-system/core": "^5.1.1", - "@styled-system/flexbox": "^5.1.1", - "@styled-system/grid": "^5.1.1", - "@styled-system/layout": "^5.1.1", - "@styled-system/position": "^5.1.1", - "@styled-system/shadow": "^5.1.1", - "@styled-system/space": "^5.1.1", - "@styled-system/typography": "^5.1.1", - "@styled-system/variant": "^5.1.1", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/styled-system/-/styled-system-5.1.4.tgz", + "integrity": "sha512-b1EdfZ41NDcR6vnvZauylhpFvSjsFl1yyQEUA+v3rLjcKdM//EIFY195Nh3YLwgj+hWIWsG0Tk1Kl0tq1xLw8Q==", + "requires": { + "@styled-system/background": "^5.1.2", + "@styled-system/border": "^5.1.2", + "@styled-system/color": "^5.1.2", + "@styled-system/core": "^5.1.2", + "@styled-system/flexbox": "^5.1.2", + "@styled-system/grid": "^5.1.2", + "@styled-system/layout": "^5.1.2", + "@styled-system/position": "^5.1.2", + "@styled-system/shadow": "^5.1.2", + "@styled-system/space": "^5.1.2", + "@styled-system/typography": "^5.1.2", + "@styled-system/variant": "^5.1.4", "object-assign": "^4.1.1" } }, @@ -15546,13 +16199,13 @@ }, "dependencies": { "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" } }, "postcss-selector-parser": { @@ -15586,16 +16239,16 @@ } }, "svgo": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz", - "integrity": "sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", + "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", "requires": { "chalk": "^2.4.1", "coa": "^2.0.2", "css-select": "^2.0.0", "css-select-base-adapter": "^0.1.1", - "css-tree": "1.0.0-alpha.33", - "csso": "^3.5.1", + "css-tree": "1.0.0-alpha.37", + "csso": "^4.0.2", "js-yaml": "^3.13.1", "mkdirp": "~0.5.1", "object.values": "^1.1.0", @@ -15606,16 +16259,21 @@ }, "dependencies": { "css-select": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz", - "integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", + "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", "requires": { "boolbase": "^1.0.0", - "css-what": "^2.1.2", + "css-what": "^3.2.1", "domutils": "^1.7.0", "nth-check": "^1.0.2" } }, + "css-what": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz", + "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==" + }, "domutils": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", @@ -15643,11 +16301,6 @@ "string-width": "^3.0.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -15667,14 +16320,6 @@ "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^5.1.0" } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } } } }, @@ -15684,60 +16329,58 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, "tar": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", - "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.5", - "minizlib": "^1.2.1", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/tar/-/tar-5.0.5.tgz", + "integrity": "sha512-MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ==", + "requires": { + "chownr": "^1.1.3", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.0", "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" + "yallist": "^4.0.0" }, "dependencies": { "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } }, "tar-fs": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz", - "integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", + "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", "requires": { - "chownr": "^1.0.1", + "chownr": "^1.1.1", "mkdirp": "^0.5.1", - "pump": "^1.0.0", - "tar-stream": "^1.1.2" - }, - "dependencies": { - "pump": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", - "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } + "pump": "^3.0.0", + "tar-stream": "^2.0.0" } }, "tar-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", - "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", + "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", "requires": { - "bl": "^1.0.0", - "buffer-alloc": "^1.2.0", - "end-of-stream": "^1.0.0", + "bl": "^3.0.0", + "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", - "readable-stream": "^2.3.0", - "to-buffer": "^1.1.1", - "xtend": "^4.0.0" + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } } }, "temp-dir": { @@ -15755,21 +16398,18 @@ } }, "term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "requires": { - "execa": "^0.7.0" - } + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.1.1.tgz", + "integrity": "sha512-UqvQSch04R+69g4RDhrslmGvGL3ucDRX/U+snYW0Mab4uCAyKSndUksaoqlJ81QKSpRnIsuOYQCbC2ZWx2896A==" }, "terser": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", - "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.1.tgz", + "integrity": "sha512-w0f2OWFD7ka3zwetgVAhNMeyzEbj39ht2Tb0qKflw9PmW9Qbo5tjTh01QJLkhO9t9RDDQYvk+WXqpECI2C6i2A==", "requires": { - "commander": "^2.19.0", + "commander": "^2.20.0", "source-map": "~0.6.1", - "source-map-support": "~0.5.10" + "source-map-support": "~0.5.12" }, "dependencies": { "source-map": { @@ -15780,21 +16420,26 @@ } }, "terser-webpack-plugin": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.4.tgz", - "integrity": "sha512-64IiILNQlACWZLzFlpzNaG0bpQ4ytaB7fwOsbpsdIV70AfLUmIGGeuKL0YV2WmtcrURjE2aOvHD4/lrFV3Rg+Q==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz", + "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==", "requires": { - "cacache": "^11.3.2", - "find-cache-dir": "^2.0.0", + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", + "serialize-javascript": "^2.1.2", "source-map": "^0.6.1", - "terser": "^3.17.0", - "webpack-sources": "^1.3.0", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", "worker-farm": "^1.7.0" }, "dependencies": { + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -15837,9 +16482,9 @@ } }, "thunky": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz", - "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" }, "timed-out": { "version": "4.0.1", @@ -15876,16 +16521,16 @@ "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" }, "tlds": { - "version": "1.203.1", - "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.203.1.tgz", - "integrity": "sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==" + "version": "1.207.0", + "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.207.0.tgz", + "integrity": "sha512-k7d7Q1LqjtAvhtEOs3yN14EabsNO8ZCoY6RESSJDB9lst3bTx3as/m1UuAeCKzYxiyhR1qq72ZPhpSf+qlqiwg==" }, "tmp": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "requires": { - "os-tmpdir": "~1.0.1" + "os-tmpdir": "~1.0.2" } }, "to-array": { @@ -15916,6 +16561,11 @@ "kind-of": "^3.0.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -15926,6 +16576,11 @@ } } }, + "to-readable-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + }, "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", @@ -15951,14 +16606,6 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, - "topo": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", - "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", - "requires": { - "hoek": "4.x.x" - } - }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -15998,11 +16645,6 @@ "escape-string-regexp": "^1.0.2" } }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" - }, "trim-trailing-lines": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz", @@ -16019,15 +16661,23 @@ "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==" }, "ts-pnp": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.2.tgz", - "integrity": "sha512-f5Knjh7XCyRIzoC/z1Su1yLLRrPrFCgtUAh/9fCSP6NKbATwpOL1+idQVXQokK9GRFURn/jYPGPfegIctwunoA==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.5.tgz", + "integrity": "sha512-ti7OGMOUOzo66wLF3liskw6YQIaSsBgc4GOAlWRnIEj8htCxJUxskanMUoJOD6MDCRAXo36goXJZch+nOS0VMA==" }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" }, + "tsutils": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "requires": { + "tslib": "^1.8.1" + } + }, "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", @@ -16055,9 +16705,9 @@ } }, "type-fest": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", - "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" }, "type-is": { "version": "1.6.18", @@ -16078,10 +16728,18 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "requires": { + "is-typedarray": "^1.0.0" + } + }, "ua-parser-js": { - "version": "0.7.20", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz", - "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==" + "version": "0.7.21", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", + "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==" }, "unbzip2-stream": { "version": "1.3.3", @@ -16093,9 +16751,9 @@ }, "dependencies": { "buffer": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.0.tgz", - "integrity": "sha512-Xpgy0IwHK2N01ncykXTy6FpCWuM+CJSHoPVBLyNqyrWxsedpLvwsYUhf0ME3WRFNUhos0dMamz9cOS/xRDtU5g==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz", + "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==", "requires": { "base64-js": "^1.0.2", "ieee754": "^1.1.4" @@ -16163,6 +16821,16 @@ "x-is-string": "^0.1.0" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "unist-util-stringify-position": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz", + "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==" + }, "vfile": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz", @@ -16173,6 +16841,14 @@ "unist-util-stringify-position": "^1.0.0", "vfile-message": "^1.0.0" } + }, + "vfile-message": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz", + "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==", + "requires": { + "unist-util-stringify-position": "^1.1.1" + } } } }, @@ -16230,32 +16906,32 @@ } }, "unist-util-generated": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.4.tgz", - "integrity": "sha512-SA7Sys3h3X4AlVnxHdvN/qYdr4R38HzihoEVY2Q2BZu8NHWDnw5OGcC/tXWjQfd4iG+M6qRFNIRGqJmp2ez4Ww==" + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.5.tgz", + "integrity": "sha512-1TC+NxQa4N9pNdayCYA1EGUOCAO0Le3fVp7Jzns6lnua/mYgwHo0tz5WUAfrdpNch1RZLHc61VZ1SDgrtNXLSw==" }, "unist-util-is": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz", - "integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz", + "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==" }, "unist-util-modify-children": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.4.tgz", - "integrity": "sha512-8iey9wkoB62C7Vi/8zcRUmi4b1f5AYKTwMkyEgLduo2D8+OY65RoSvbn6k9tVNri6qumXxAwXDVlXWQi0sENTw==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.5.tgz", + "integrity": "sha512-XeL5qqyoS3TEueCKEzHusWXE9JBDJPE4rl6LmcLOwlzv0RIZrcMNqKx02GSK3Ms4v45ldu+ltPxG42FBMVdPZw==", "requires": { "array-iterate": "^1.0.0" } }, "unist-util-position": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.3.tgz", - "integrity": "sha512-28EpCBYFvnMeq9y/4w6pbnFmCUfzlsc41NJui5c51hOFjBA1fejcwc+5W4z2+0ECVbScG3dURS3JTVqwenzqZw==" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.4.tgz", + "integrity": "sha512-tWvIbV8goayTjobxDIr4zVTyG+Q7ragMSMeKC3xnPl9xzIc0+she8mxXLM3JVNDDsfARPbCd3XdzkyLdo7fF3g==" }, "unist-util-remove-position": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz", - "integrity": "sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", + "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", "requires": { "unist-util-visit": "^1.1.0" } @@ -16286,9 +16962,12 @@ } }, "unist-util-stringify-position": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz", - "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.2.tgz", + "integrity": "sha512-nK5n8OGhZ7ZgUwoUbL8uiVRwAbZyzBsB/Ddrlbu6jwwubFza4oe15KlyEaLNMXQW1svOQq4xesUeqA85YrIUQA==", + "requires": { + "@types/unist": "^2.0.2" + } }, "unist-util-visit": { "version": "1.4.1", @@ -16309,13 +16988,6 @@ "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==", "requires": { "unist-util-is": "^3.0.0" - }, - "dependencies": { - "unist-util-is": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz", - "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==" - } } }, "universalify": { @@ -16362,78 +17034,179 @@ } } }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - } - } - }, - "unzip-response": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", - "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=" - }, - "upath": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==" - }, - "update-notifier": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", - "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" - }, - "dependencies": { - "ansi-align": { + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + } + } + }, + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" + }, + "update-notifier": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-3.0.1.tgz", + "integrity": "sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==", + "requires": { + "boxen": "^3.0.0", + "chalk": "^2.0.1", + "configstore": "^4.0.0", + "has-yarn": "^2.1.0", + "import-lazy": "^2.1.0", + "is-ci": "^2.0.0", + "is-installed-globally": "^0.1.0", + "is-npm": "^3.0.0", + "is-yarn-global": "^0.3.0", + "latest-version": "^5.0.0", + "semver-diff": "^2.0.0", + "xdg-basedir": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "boxen": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz", + "integrity": "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==", + "requires": { + "ansi-align": "^3.0.0", + "camelcase": "^5.3.1", + "chalk": "^2.4.2", + "cli-boxes": "^2.2.0", + "string-width": "^3.0.0", + "term-size": "^1.2.0", + "type-fest": "^0.3.0", + "widest-line": "^2.0.0" + } + }, + "configstore": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", + "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==", + "requires": { + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "requires": { - "string-width": "^2.0.0" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, - "boxen": { + "make-dir": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" + "pify": "^3.0.0" } }, - "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==" + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=" + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } }, - "is-ci": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", - "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", + "term-size": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", + "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", + "requires": { + "execa": "^0.7.0" + } + }, + "type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==" + }, + "widest-line": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", + "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", "requires": { - "ci-info": "^1.5.0" + "string-width": "^2.1.1" + }, + "dependencies": { + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } } } } @@ -16499,11 +17272,11 @@ } }, "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "requires": { - "prepend-http": "^1.0.1" + "prepend-http": "^2.0.0" } }, "url-regex": { @@ -16585,9 +17358,9 @@ "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" }, "v8-compile-cache": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz", - "integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", + "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==" }, "valid-url": { "version": "1.0.9", @@ -16634,30 +17407,39 @@ "vfile-message": "^1.0.0" }, "dependencies": { - "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + "unist-util-stringify-position": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz", + "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==" + }, + "vfile-message": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz", + "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==", + "requires": { + "unist-util-stringify-position": "^1.1.1" + } } } }, "vfile-location": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.5.tgz", - "integrity": "sha512-Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ==" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz", + "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" }, "vfile-message": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz", - "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.2.tgz", + "integrity": "sha512-gNV2Y2fDvDOOqq8bEe7cF3DXU6QgV4uA9zMR2P8tix11l1r7zju3zry3wZ8sx+BEfuO6WQ7z2QzfWTvqHQiwsA==", "requires": { - "unist-util-stringify-position": "^1.1.1" + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" } }, "vm-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", - "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" }, "warning": { "version": "3.0.0", @@ -16675,6 +17457,51 @@ "chokidar": "^2.0.2", "graceful-fs": "^4.1.2", "neo-async": "^2.5.0" + }, + "dependencies": { + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + } } }, "wbuf": { @@ -16691,40 +17518,39 @@ "integrity": "sha512-r8sAtNmgR0WKOKOxzuSgk09JsHlpKlB+uHi937qypOu3PZ17UxPrierFKDye/uNHjNTTEshu5PId8rojIPj/tA==" }, "webpack": { - "version": "4.28.4", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.28.4.tgz", - "integrity": "sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==", - "requires": { - "@webassemblyjs/ast": "1.7.11", - "@webassemblyjs/helper-module-context": "1.7.11", - "@webassemblyjs/wasm-edit": "1.7.11", - "@webassemblyjs/wasm-parser": "1.7.11", - "acorn": "^5.6.2", - "acorn-dynamic-import": "^3.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", + "version": "4.41.5", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz", + "integrity": "sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/wasm-edit": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "acorn": "^6.2.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", + "eslint-scope": "^4.0.3", "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", - "schema-utils": "^0.4.4", - "tapable": "^1.1.0", - "terser-webpack-plugin": "^1.1.0", - "watchpack": "^1.5.0", - "webpack-sources": "^1.3.0" + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.1", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.3", + "watchpack": "^1.6.0", + "webpack-sources": "^1.4.1" }, "dependencies": { "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==" }, "eslint-scope": { "version": "4.0.3", @@ -16734,79 +17560,102 @@ "esrecurse": "^4.1.0", "estraverse": "^4.1.1" } + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } } } }, "webpack-dev-middleware": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz", - "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz", + "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", "requires": { "memory-fs": "^0.4.1", - "mime": "^2.4.2", + "mime": "^2.4.4", + "mkdirp": "^0.5.1", "range-parser": "^1.2.1", "webpack-log": "^2.0.0" } }, "webpack-dev-server": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.0.tgz", - "integrity": "sha512-Hs8K9yI6pyMvGkaPTeTonhD6JXVsigXDApYk9JLW4M7viVBspQvb1WdAcWxqtmttxNW4zf2UFLsLNe0y87pIGQ==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.1.tgz", + "integrity": "sha512-AGG4+XrrXn4rbZUueyNrQgO4KGnol+0wm3MPdqGLmmA+NofZl3blZQKxZ9BND6RDNuvAK9OMYClhjOSnxpWRoA==", "requires": { "ansi-html": "0.0.7", "bonjour": "^3.5.0", - "chokidar": "^2.1.6", + "chokidar": "^2.1.8", "compression": "^1.7.4", "connect-history-api-fallback": "^1.6.0", "debug": "^4.1.1", "del": "^4.1.1", "express": "^4.17.1", "html-entities": "^1.2.1", - "http-proxy-middleware": "^0.19.1", + "http-proxy-middleware": "0.19.1", "import-local": "^2.0.0", "internal-ip": "^4.3.0", "ip": "^1.1.5", - "is-absolute-url": "^3.0.0", + "is-absolute-url": "^3.0.3", "killable": "^1.0.1", - "loglevel": "^1.6.3", + "loglevel": "^1.6.6", "opn": "^5.5.0", "p-retry": "^3.0.1", - "portfinder": "^1.0.21", + "portfinder": "^1.0.25", "schema-utils": "^1.0.0", - "selfsigned": "^1.10.4", + "selfsigned": "^1.10.7", "semver": "^6.3.0", "serve-index": "^1.9.1", "sockjs": "0.3.19", - "sockjs-client": "1.3.0", + "sockjs-client": "1.4.0", "spdy": "^4.0.1", "strip-ansi": "^3.0.1", "supports-color": "^6.1.0", "url": "^0.11.0", - "webpack-dev-middleware": "^3.7.0", + "webpack-dev-middleware": "^3.7.2", "webpack-log": "^2.0.0", "ws": "^6.2.1", "yargs": "12.0.5" }, "dependencies": { - "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" + "array-uniq": "^1.0.1" } }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } }, "cliui": { "version": "4.1.0", @@ -16818,6 +17667,11 @@ "wrap-ansi": "^2.0.0" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -16828,172 +17682,92 @@ } } }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - }, "del": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - } - }, - "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "requires": { - "original": "^1.0.0" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==" - }, - "is-absolute-url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.1.tgz", - "integrity": "sha512-c2QjUwuMxLsld90sj3xYzpFYWJtuxkIn1f5ua9RTEYJt/vV2IsM+Py00/6qjV7qExgifUvt7qfyBGBBKm+2iBg==" - }, - "is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==" - }, - "is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "requires": { - "is-path-inside": "^2.1.0" - } - }, - "is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "requires": { - "path-is-inside": "^1.0.2" - } - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "requires": { - "invert-kv": "^2.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" } }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", + "eventsource": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", + "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" + "original": "^1.0.0" } }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, - "os-locale": { + "glob-parent": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "^2.1.0" + } + } } }, - "p-limit": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", - "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "requires": { - "p-try": "^2.0.0" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } } }, - "p-locate": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" + }, + "normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "opn": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", + "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", "requires": { - "p-limit": "^2.0.0" + "is-wsl": "^1.1.0" } }, "p-map": { @@ -17001,15 +17775,10 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, "schema-utils": { "version": "1.0.0", @@ -17021,15 +17790,10 @@ "ajv-keywords": "^3.1.0" } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - }, "sockjs-client": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", - "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", + "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "requires": { "debug": "^3.2.5", "eventsource": "^1.0.7", @@ -17049,6 +17813,38 @@ } } }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", @@ -17057,6 +17853,35 @@ "has-flag": "^3.0.0" } }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + } + } + }, "ws": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", @@ -17104,6 +17929,21 @@ "html-entities": "^1.2.0", "querystring": "^0.2.0", "strip-ansi": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } } }, "webpack-log": { @@ -17116,11 +17956,11 @@ } }, "webpack-merge": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", - "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", + "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "requires": { - "lodash": "^4.17.5" + "lodash": "^4.17.15" } }, "webpack-sources": { @@ -17140,9 +17980,9 @@ } }, "webpack-stats-plugin": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/webpack-stats-plugin/-/webpack-stats-plugin-0.1.5.tgz", - "integrity": "sha1-KeXxLr/VMVjTHWVqETrB97hhedk=" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/webpack-stats-plugin/-/webpack-stats-plugin-0.3.1.tgz", + "integrity": "sha512-pxqzFE055NlNTlNyfDG3xlB2QwT1EWdm/CF5dCJI/e+rRHVxrWhWg1rf1lfsWhI1/EePv8gi/A36YxO/+u0FgQ==" }, "websocket-driver": { "version": "0.7.3", @@ -17188,86 +18028,104 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "requires": { "string-width": "^1.0.2 || 2" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + } } }, "widest-line": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", - "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", "requires": { - "string-width": "^2.1.1" + "string-width": "^4.0.0" } }, "with-open-file": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.6.tgz", - "integrity": "sha512-SQS05JekbtwQSgCYlBsZn/+m2gpn4zWsqpCYIrCHva0+ojXcnmUEPsBN6Ipoz3vmY/81k5PvYEWSxER2g4BTqA==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz", + "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==", "requires": { "p-finally": "^1.0.0", "p-try": "^2.1.0", "pify": "^4.0.1" - }, - "dependencies": { - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } } }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" }, "workbox-background-sync": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-3.6.3.tgz", - "integrity": "sha512-ypLo0B6dces4gSpaslmDg5wuoUWrHHVJfFWwl1udvSylLdXvnrfhFfriCS42SNEe5lsZtcNZF27W/SMzBlva7Q==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz", + "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, - "workbox-broadcast-cache-update": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.6.3.tgz", - "integrity": "sha512-pJl4lbClQcvp0SyTiEw0zLSsVYE1RDlCPtpKnpMjxFtu8lCFTAEuVyzxp9w7GF4/b3P4h5nyQ+q7V9mIR7YzGg==", + "workbox-broadcast-update": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz", + "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-build": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-3.6.3.tgz", - "integrity": "sha512-w0clZ/pVjL8VXy6GfthefxpEXs0T8uiRuopZSFVQ8ovfbH6c6kUpEh6DcYwm/Y6dyWPiCucdyAZotgjz+nRz8g==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz", + "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==", "requires": { - "babel-runtime": "^6.26.0", - "common-tags": "^1.4.0", + "@babel/runtime": "^7.3.4", + "@hapi/joi": "^15.0.0", + "common-tags": "^1.8.0", "fs-extra": "^4.0.2", - "glob": "^7.1.2", - "joi": "^11.1.1", + "glob": "^7.1.3", "lodash.template": "^4.4.0", - "pretty-bytes": "^4.0.2", - "stringify-object": "^3.2.2", + "pretty-bytes": "^5.1.0", + "stringify-object": "^3.3.0", "strip-comments": "^1.0.2", - "workbox-background-sync": "^3.6.3", - "workbox-broadcast-cache-update": "^3.6.3", - "workbox-cache-expiration": "^3.6.3", - "workbox-cacheable-response": "^3.6.3", - "workbox-core": "^3.6.3", - "workbox-google-analytics": "^3.6.3", - "workbox-navigation-preload": "^3.6.3", - "workbox-precaching": "^3.6.3", - "workbox-range-requests": "^3.6.3", - "workbox-routing": "^3.6.3", - "workbox-strategies": "^3.6.3", - "workbox-streams": "^3.6.3", - "workbox-sw": "^3.6.3" + "workbox-background-sync": "^4.3.1", + "workbox-broadcast-update": "^4.3.1", + "workbox-cacheable-response": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-expiration": "^4.3.1", + "workbox-google-analytics": "^4.3.1", + "workbox-navigation-preload": "^4.3.1", + "workbox-precaching": "^4.3.1", + "workbox-range-requests": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1", + "workbox-streams": "^4.3.1", + "workbox-sw": "^4.3.1", + "workbox-window": "^4.3.1" }, "dependencies": { "fs-extra": { @@ -17282,90 +18140,98 @@ } } }, - "workbox-cache-expiration": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-cache-expiration/-/workbox-cache-expiration-3.6.3.tgz", - "integrity": "sha512-+ECNph/6doYx89oopO/UolYdDmQtGUgo8KCgluwBF/RieyA1ZOFKfrSiNjztxOrGJoyBB7raTIOlEEwZ1LaHoA==", - "requires": { - "workbox-core": "^3.6.3" - } - }, "workbox-cacheable-response": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-3.6.3.tgz", - "integrity": "sha512-QpmbGA9SLcA7fklBLm06C4zFg577Dt8u3QgLM0eMnnbaVv3rhm4vbmDpBkyTqvgK/Ly8MBDQzlXDtUCswQwqqg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz", + "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-core": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-3.6.3.tgz", - "integrity": "sha512-cx9cx0nscPkIWs8Pt98HGrS9/aORuUcSkWjG25GqNWdvD/pSe7/5Oh3BKs0fC+rUshCiyLbxW54q0hA+GqZeSQ==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz", + "integrity": "sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg==" + }, + "workbox-expiration": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz", + "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==", + "requires": { + "workbox-core": "^4.3.1" + } }, "workbox-google-analytics": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-3.6.3.tgz", - "integrity": "sha512-RQBUo/6SXtIaQTRFj4RQZ9e1gAl7D8oS5S+Hi173Kk70/BgJjzPwXpC5A249Jv5YfkCOLMQCeF9A27BiD0b0ig==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz", + "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==", "requires": { - "workbox-background-sync": "^3.6.3", - "workbox-core": "^3.6.3", - "workbox-routing": "^3.6.3", - "workbox-strategies": "^3.6.3" + "workbox-background-sync": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1" } }, "workbox-navigation-preload": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-3.6.3.tgz", - "integrity": "sha512-dd26xTX16DUu0i+MhqZK/jQXgfIitu0yATM4jhRXEmpMqQ4MxEeNvl2CgjDMOHBnCVMax+CFZQWwxMx/X/PqCw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz", + "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-precaching": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-3.6.3.tgz", - "integrity": "sha512-aBqT66BuMFviPTW6IpccZZHzpA8xzvZU2OM1AdhmSlYDXOJyb1+Z6blVD7z2Q8VNtV1UVwQIdImIX+hH3C3PIw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz", + "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-range-requests": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-3.6.3.tgz", - "integrity": "sha512-R+yLWQy7D9aRF9yJ3QzwYnGFnGDhMUij4jVBUVtkl67oaVoP1ymZ81AfCmfZro2kpPRI+vmNMfxxW531cqdx8A==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz", + "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-routing": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-3.6.3.tgz", - "integrity": "sha512-bX20i95OKXXQovXhFOViOK63HYmXvsIwZXKWbSpVeKToxMrp0G/6LZXnhg82ijj/S5yhKNRf9LeGDzaqxzAwMQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz", + "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-strategies": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-3.6.3.tgz", - "integrity": "sha512-Pg5eulqeKet2y8j73Yw6xTgLdElktcWExGkzDVCGqfV9JCvnGuEpz5eVsCIK70+k4oJcBCin9qEg3g3CwEIH3g==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz", + "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-streams": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-3.6.3.tgz", - "integrity": "sha512-rqDuS4duj+3aZUYI1LsrD2t9hHOjwPqnUIfrXSOxSVjVn83W2MisDF2Bj+dFUZv4GalL9xqErcFW++9gH+Z27w==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz", + "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==", "requires": { - "workbox-core": "^3.6.3" + "workbox-core": "^4.3.1" } }, "workbox-sw": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-3.6.3.tgz", - "integrity": "sha512-IQOUi+RLhvYCiv80RP23KBW/NTtIvzvjex28B8NW1jOm+iV4VIu3VXKXTA6er5/wjjuhmtB28qEAUqADLAyOSg==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz", + "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==" + }, + "workbox-window": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz", + "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==", + "requires": { + "workbox-core": "^4.3.1" + } }, "worker-farm": { "version": "1.7.0", @@ -17376,22 +18242,33 @@ } }, "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" }, "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } } } @@ -17420,12 +18297,9 @@ } }, "ws": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", - "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", - "requires": { - "async-limiter": "~1.0.0" - } + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz", + "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==" }, "x-is-string": { "version": "0.1.0", @@ -17470,18 +18344,18 @@ "integrity": "sha1-qQKekp09vN7RafPG4oI42VpdWig=" }, "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", + "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", "requires": { "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" + "xmlbuilder": "~11.0.0" } }, "xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" }, "xmlhttprequest-ssl": { "version": "1.5.5", @@ -17489,9 +18363,9 @@ "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" }, "xstate": { - "version": "4.6.7", - "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.6.7.tgz", - "integrity": "sha512-mqgtH6BXOgjOHVDxZPyW/h6QUC5kfEggh5IN8uOitjzrdCScE/a/cwcRvgcH8CGAXYReDNvasOKD0aFBWAZ1fg==" + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/xstate/-/xstate-4.7.5.tgz", + "integrity": "sha512-1QbwTUviBCHSnT3ct+GZZspzbNsftMEzP1lXmeR/zJphA1BHeLh/JV+woCmRdTBHyuGcJ2I7u7pp/+Y9e4qq9A==" }, "xtend": { "version": "4.0.2", @@ -17499,15 +18373,23 @@ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, + "yaml": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.7.2.tgz", + "integrity": "sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw==", + "requires": { + "@babel/runtime": "^7.6.3" + } + }, "yaml-loader": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.5.0.tgz", @@ -17517,31 +18399,51 @@ } }, "yargs": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz", - "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", - "requires": { - "camelcase": "^4.1.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "read-pkg-up": "^2.0.0", + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", + "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^2.0.0", + "string-width": "^3.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^7.0.0" + "y18n": "^4.0.0", + "yargs-parser": "^13.1.1" + }, + "dependencies": { + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } } }, "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", "requires": { - "camelcase": "^4.1.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } }, "yauzl": { @@ -17565,51 +18467,43 @@ "optional": true }, "yurnalist": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/yurnalist/-/yurnalist-1.0.5.tgz", - "integrity": "sha512-EuLjqX3Q15iVM0UtZa5Ju536uRmklKd2kKhdE5D5fIh8RZmh+pJ8c6wj2oGo0TA+T/Ii2o79cIHCTMfciW8jlA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/yurnalist/-/yurnalist-1.1.1.tgz", + "integrity": "sha512-WMk8SL262zU/3Cr8twpfx/kdhPDAkhWN9HukNeb1U1xVrwU9iIAsCgYI8J5QMZTz+5N3Et/ZKzvOzVCjd/dAWA==", "requires": { "babel-runtime": "^6.26.0", - "chalk": "^2.1.0", + "chalk": "^2.4.2", "cli-table3": "^0.5.1", - "debug": "^4.1.0", - "deep-equal": "^1.0.1", - "detect-indent": "^5.0.0", - "inquirer": "^6.2.0", + "debug": "^4.1.1", + "deep-equal": "^1.1.0", + "detect-indent": "^6.0.0", + "inquirer": "^7.0.0", "invariant": "^2.2.0", "is-builtin-module": "^3.0.0", "is-ci": "^2.0.0", - "leven": "^2.0.0", - "loud-rejection": "^1.2.0", - "node-emoji": "^1.6.1", + "leven": "^3.1.0", + "loud-rejection": "^2.2.0", + "node-emoji": "^1.10.0", "object-path": "^0.11.2", "read": "^1.0.7", - "rimraf": "^2.5.0", - "semver": "^5.1.0", - "strip-ansi": "^5.0.0", - "strip-bom": "^3.0.0" + "rimraf": "^3.0.0", + "semver": "^6.3.0", + "strip-ansi": "^5.2.0", + "strip-bom": "^4.0.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "rimraf": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", + "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", "requires": { - "ms": "^2.1.1" + "glob": "^7.1.3" } }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" } } }, diff --git a/deps/npm/docs/package.json b/deps/npm/docs/package.json index cc009c53b8a3ee..708dc1009c2d39 100644 --- a/deps/npm/docs/package.json +++ b/deps/npm/docs/package.json @@ -11,22 +11,22 @@ "dependencies": { "babel-plugin-styled-components": "^1.10.6", "eslint": "^6.3.0", - "gatsby": "^2.13.73", - "gatsby-image": "^2.2.10", - "gatsby-plugin-catch-links": "^2.1.9", + "gatsby": "^2.18.17", + "gatsby-image": "^2.2.37", + "gatsby-plugin-catch-links": "^2.1.21", "gatsby-plugin-ipfs": "^2.0.2", - "gatsby-plugin-manifest": "^2.2.6", + "gatsby-plugin-manifest": "^2.2.34", "gatsby-plugin-no-sourcemaps": "^2.1.1", - "gatsby-plugin-offline": "^2.2.7", + "gatsby-plugin-offline": "^3.0.30", "gatsby-plugin-prefetch-google-fonts": "^1.4.3", - "gatsby-plugin-react-helmet": "^3.1.4", + "gatsby-plugin-react-helmet": "^3.1.18", "gatsby-plugin-root-import": "^2.0.5", - "gatsby-plugin-sharp": "^2.2.13", - "gatsby-plugin-styled-components": "^3.1.11", - "gatsby-remark-autolink-headers": "^2.1.10", - "gatsby-remark-prismjs": "^3.3.13", - "gatsby-source-filesystem": "^2.1.21", - "gatsby-transformer-remark": "^2.6.22", + "gatsby-plugin-sharp": "^2.3.10", + "gatsby-plugin-styled-components": "^3.1.16", + "gatsby-remark-autolink-headers": "^2.1.21", + "gatsby-remark-prismjs": "^3.3.28", + "gatsby-source-filesystem": "^2.1.43", + "gatsby-transformer-remark": "^2.6.45", "prismjs": "^1.17.1", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/deps/npm/docs/public/cli-commands/npm-access/index.html b/deps/npm/docs/public/cli-commands/npm-access/index.html index 7a4103aaaedf44..f3853e530b6b3a 100644 --- a/deps/npm/docs/public/cli-commands/npm-access/index.html +++ b/deps/npm/docs/public/cli-commands/npm-access/index.html @@ -1,4 +1,4 @@ -

    npm access

    -

    Set access level on published packages

    -

    Synopsis

    +

    npm access

    +

    Set access level on published packages

    +

    Synopsis

    -

    Description

    +

    Description

    Used to set access controls on private packages.

    For all of the subcommands, npm access will perform actions on the packages in the current working directory if no package name is passed to the @@ -108,7 +114,7 @@

    edit: Set the access privileges for a package at once using $EDITOR.

  • -

    Details

    +

    Details

    npm access always operates directly on the current registry, configurable from the command line using --registry=<registry url>.

    Unscoped packages are always public.

    @@ -128,12 +134,12 @@

    --access=public.

    Management of teams and team memberships is done with the npm team command.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file + \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-adduser/index.html b/deps/npm/docs/public/cli-commands/npm-adduser/index.html index 9c6a0432096eda..7b96fcce677001 100644 --- a/deps/npm/docs/public/cli-commands/npm-adduser/index.html +++ b/deps/npm/docs/public/cli-commands/npm-adduser/index.html @@ -1,4 +1,4 @@ -

    +

    section: cli-commands title: npm-adduser description: Set access level on published packages


    -

    npm adduser

    -

    Add a registry user account

    -

    Synopsis

    +

    npm adduser

    +

    Add a registry user account

    +

    Synopsis

    npm adduser [--registry=url] [--scope=@orgname] [--always-auth] [--auth-type=legacy]
     
     aliases: login, add-user
    -

    Description

    +

    Description

    Create or verify a user named <username> in the specified registry, and save the credentials to the .npmrc file. If no registry is specified, the default registry will be used (see config).

    @@ -91,13 +97,13 @@

    npm login is an alias to adduser and behaves exactly the same way.

    -

    Configuration

    -

    registry

    +

    Configuration

    +

    registry

    Default: https://registry.npmjs.org/

    The base URL of the npm package registry. If scope is also specified, this registry will only be used for packages with that scope. scope defaults to the scope of the project directory you're currently in, if any. See scope.

    -

    scope

    +

    scope

    Default: none

    If specified, the user and login credentials given will be associated with the specified scope. See scope. You can use both at the same time, @@ -105,7 +111,7 @@

        npm adduser --registry=http://myregistry.example.com --scope=@myco

    This will set a registry for the given scope and login or create a user for that registry at the same time.

    -

    always-auth

    +

    always-auth

    Default: false

    If specified, save configuration indicating that all requests to the given registry should include authorization information. Useful for private @@ -115,7 +121,7 @@

    always-auth in config for more details on always-auth. Registry-specific configuration of always-auth takes precedence over any global configuration.

    -

    auth-type

    +

    auth-type

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-audit/index.html b/deps/npm/docs/public/cli-commands/npm-audit/index.html index 96b3cda738bb77..5d57fac3d4e3e5 100644 --- a/deps/npm/docs/public/cli-commands/npm-audit/index.html +++ b/deps/npm/docs/public/cli-commands/npm-audit/index.html @@ -1,4 +1,4 @@ -

    npm audit

    -

    Run a security audit

    -

    Synopsis

    +

    npm audit

    +

    Run a security audit

    +

    Synopsis

    npm audit [--json|--parseable|--audit-level=(low|moderate|high|critical)]
     npm audit fix [--force|--package-lock-only|--dry-run]
     
     common options: [--production] [--only=(dev|prod)]
    -

    Examples

    +

    Examples

    Scan your project for vulnerabilities and automatically install any compatible updates to vulnerable dependencies:

    $ npm audit fix
    @@ -103,7 +109,7 @@

    $ npm audit --parseable | awk -F $'\t' '{print $1,$4}'

    Fail an audit only if the results include a vulnerability with a level of moderate or higher:

    $ npm audit --audit-level=moderate
    -

    Description

    +

    Description

    The audit command submits a description of the dependencies configured in your project to your default registry and asks for a report of known vulnerabilities. The report returned includes instructions on how to act on @@ -120,7 +126,7 @@

    -

    Content Submitted

    +

    Content Submitted

    • npm_version
    • node_version
    • @@ -128,7 +134,7 @@

      Scrubbing

      +

      Scrubbing

      In order to ensure that potentially sensitive information is not included in the audit data bundle, some dependencies may have their names (and sometimes versions) replaced with opaque non-reversible identifiers. It is done for @@ -143,13 +149,13 @@

      Exit Code

      +

      Exit Code

      The npm audit command will exit with a 0 exit code if no vulnerabilities were found.

      If vulnerabilities were found the exit code will depend on the audit-level configuration setting.

      -

      See Also

      +

      See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-bin/index.html b/deps/npm/docs/public/cli-commands/npm-bin/index.html index d7069d3798c7ee..c54afe93556aeb 100644 --- a/deps/npm/docs/public/cli-commands/npm-bin/index.html +++ b/deps/npm/docs/public/cli-commands/npm-bin/index.html @@ -1,4 +1,4 @@ -

    npm bin

    -

    Display npm bin folder

    -

    Synopsis

    +

    npm bin

    +

    Display npm bin folder

    +

    Synopsis

    npm bin [-g|--global]
    -

    Description

    +

    Description

    Print the folder where npm will install executables.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-bugs/index.html b/deps/npm/docs/public/cli-commands/npm-bugs/index.html index d2d1c7f4563e63..d9f5b5282ff212 100644 --- a/deps/npm/docs/public/cli-commands/npm-bugs/index.html +++ b/deps/npm/docs/public/cli-commands/npm-bugs/index.html @@ -1,4 +1,4 @@ -

    npm bugs

    -

    Bugs for a package in a web browser maybe

    -

    Synopsis

    +

    npm bugs

    +

    Bugs for a package in a web browser maybe

    +

    Synopsis

    npm bugs [<pkgname>]
     
     aliases: issues
    -

    Description

    +

    Description

    This command tries to guess at the likely location of a package's bug tracker URL, and then tries to open it using the --browser config param. If no package name is provided, it will search for a package.json in the current folder and use the name property.

    -

    Configuration

    -

    browser

    +

    Configuration

    +

    browser

    • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • Type: String

    The browser that is called by the npm bugs command to open websites.

    -

    registry

    +

    registry

    The base URL of the npm package registry.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-build/index.html b/deps/npm/docs/public/cli-commands/npm-build/index.html index 4ef773207957b2..8850a4e9d88f3e 100644 --- a/deps/npm/docs/public/cli-commands/npm-build/index.html +++ b/deps/npm/docs/public/cli-commands/npm-build/index.html @@ -1,4 +1,4 @@ -

    npm build

    -

    Build a package

    -

    Synopsis

    +

    npm build

    +

    Build a package

    +

    Synopsis

    npm build [<package-folder>]
    • <package-folder>: A folder containing a package.json file in its root.
    -

    Description

    +

    Description

    This is the plumbing command called by npm link and npm install.

    It should generally be called during installation, but if you need to run it directly, run:

        npm run-script build
    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-bundle/index.html b/deps/npm/docs/public/cli-commands/npm-bundle/index.html index 017939b4ecfb91..9e8457cc5ac1c3 100644 --- a/deps/npm/docs/public/cli-commands/npm-bundle/index.html +++ b/deps/npm/docs/public/cli-commands/npm-bundle/index.html @@ -1,4 +1,4 @@ -

    npm bundle

    -

    REMOVED

    -

    Description

    +

    npm bundle

    +

    REMOVED

    +

    Description

    The npm bundle command has been removed in 1.0, for the simple reason that it is no longer necessary, as the default behavior is now to install packages into the local space.

    Just use npm install now to do what npm bundle used to do.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-cache/index.html b/deps/npm/docs/public/cli-commands/npm-cache/index.html index 974582d36a1b66..bbf164e0fb1e5a 100644 --- a/deps/npm/docs/public/cli-commands/npm-cache/index.html +++ b/deps/npm/docs/public/cli-commands/npm-cache/index.html @@ -1,4 +1,4 @@ -

    npm cache

    -

    Manipulates packages cache

    -

    Synopsis

    +

    npm cache

    +

    Manipulates packages cache

    +

    Synopsis

    npm cache add <tarball file>
     npm cache add <folder>
     npm cache add <tarball url>
    @@ -80,7 +86,7 @@ 

    npm cache clear, npm cache rm npm cache verify

    -

    Description

    +

    Description

    Used to add, list, or clean the npm cache folder.

    • add: @@ -93,7 +99,7 @@

    -

    Details

    +

    Details

    npm stores cache data in an opaque directory within the configured cache, named _cacache. This directory is a cacache-based content-addressable cache that stores all http request data as well as other package-related data. This @@ -110,7 +116,7 @@

    A note about the cache's design

    +

    A note about the cache's design

    The npm cache is strictly a cache: it should not be relied upon as a persistent and reliable data store for package data. npm makes no guarantee that a previously-cached piece of data will be available later, and will automatically @@ -118,18 +124,18 @@

    npm cache verify.

    -

    Configuration

    -

    cache

    +

    Configuration

    +

    cache

    Default: ~/.npm on Posix, or %AppData%/npm-cache on Windows.

    The root cache folder.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-ci/index.html b/deps/npm/docs/public/cli-commands/npm-ci/index.html index f5620f496ae57c..08b46aff44b0d5 100644 --- a/deps/npm/docs/public/cli-commands/npm-ci/index.html +++ b/deps/npm/docs/public/cli-commands/npm-ci/index.html @@ -1,4 +1,4 @@ -

    npm ci

    -

    Install a project with a clean slate

    -

    Synopsis

    +

    npm ci

    +

    Install a project with a clean slate

    +

    Synopsis

    npm ci
    -

    Example

    +

    Example

    Make sure you have a package-lock and an up-to-date install:

    $ cd ./my/npm/project
     $ npm install
    @@ -89,8 +95,8 @@ 

    "$HOME/.npm"

    -

    Description

    -

    This command is similar to npm install, except it's meant to be used in +

    Description

    +

    This command is similar to npm install, except it's meant to be used in automated environments such as test platforms, continuous integration, and deployment -- or any situation where you want to make sure you're doing a clean install of your dependencies. It can be significantly faster than a regular npm @@ -105,9 +111,9 @@

    If a node_modules is already present, it will be automatically removed before npm ci begins its install.
  • It will never write to package.json or any of the package-locks: installs are essentially frozen.
  • -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-completion/index.html b/deps/npm/docs/public/cli-commands/npm-completion/index.html index 3483cbc66784f2..0a8d28382f08e5 100644 --- a/deps/npm/docs/public/cli-commands/npm-completion/index.html +++ b/deps/npm/docs/public/cli-commands/npm-completion/index.html @@ -1,4 +1,4 @@ -

    npm completion

    -

    Tab Completion for npm

    -

    Synopsis

    +

    npm completion

    +

    Tab Completion for npm

    +

    Synopsis

    source <(npm completion)
    -

    Description

    +

    Description

    Enables tab-completion in all npm commands.

    The synopsis above loads the completions into your current shell. Adding it to @@ -87,7 +93,7 @@

    When COMP_CWORD, COMP_LINE, and COMP_POINT are defined in the environment, npm completion acts in "plumbing mode", and outputs completions based on the arguments.

    -

    See Also

    +

    See Also

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-config/index.html b/deps/npm/docs/public/cli-commands/npm-config/index.html index f9beefcd4039b5..5f6c38423fd106 100644 --- a/deps/npm/docs/public/cli-commands/npm-config/index.html +++ b/deps/npm/docs/public/cli-commands/npm-config/index.html @@ -1,4 +1,4 @@ -

    npm config

    -

    Manage the npm configuration files

    -

    Synopsis

    +

    npm config

    +

    Manage the npm configuration files

    +

    Synopsis

    npm config set <key> <value> [-g|--global]
     npm config get <key>
     npm config delete <key>
    @@ -80,7 +86,7 @@ 

    npm set <key> <value> [-g|--global] aliases: c

    -

    Description

    +

    Description

    npm gets its config settings from the command line, environment variables, npmrc files, and in some cases, the package.json file.

    See npmrc for more information about the npmrc files.

    @@ -88,30 +94,30 @@

    The npm config command can be used to update and edit the contents of the user and global npmrc files.

    -

    Sub-commands

    +

    Sub-commands

    Config supports the following sub-commands:

    -

    set

    +

    set

    npm config set key value

    Sets the config key to the value.

    If value is omitted, then it sets it to "true".

    -

    get

    +

    get

    npm config get key

    Echo the config value to stdout.

    -

    list

    +

    list

    npm config list

    Show all the config settings. Use -l to also show defaults. Use --json to show the settings in json format.

    -

    delete

    +

    delete

    npm config delete key

    Deletes the key from all configuration files.

    -

    edit

    +

    edit

    npm config edit

    Opens the config file in an editor. Use the --global flag to edit the global config.

    -

    See Also

    +

    See Also

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-dedupe/index.html b/deps/npm/docs/public/cli-commands/npm-dedupe/index.html index 571a3a34f2e02d..0b9b4e795290c3 100644 --- a/deps/npm/docs/public/cli-commands/npm-dedupe/index.html +++ b/deps/npm/docs/public/cli-commands/npm-dedupe/index.html @@ -1,4 +1,4 @@ -

    npm dedupe

    -

    Reduce duplication

    -

    Synopsis

    +

    npm dedupe

    +

    Reduce duplication

    +

    Synopsis

    npm dedupe
     npm ddp
     
     aliases: find-dupes, ddp
    -

    Description

    +

    Description

    Searches the local package tree and attempts to simplify the overall structure by moving dependencies further up the tree, where they can be more effectively shared by multiple dependent packages.

    @@ -103,11 +109,11 @@

    Modules

    Note that this operation transforms the dependency tree, but will never result in new modules being installed.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-deprecate/index.html b/deps/npm/docs/public/cli-commands/npm-deprecate/index.html index ef5df5c9a1339e..503e6ec7fc4660 100644 --- a/deps/npm/docs/public/cli-commands/npm-deprecate/index.html +++ b/deps/npm/docs/public/cli-commands/npm-deprecate/index.html @@ -1,4 +1,4 @@ -

    npm deprecate

    -

    Deprecate a version of a package

    -

    Synopsis

    +

    npm deprecate

    +

    Deprecate a version of a package

    +

    Synopsis

    npm deprecate <pkg>[@<version>] <message>
    -

    Description

    +

    Description

    This command will update the npm registry entry for a package, providing a deprecation warning to all who attempt to install it.

    It works on version ranges as well as specific @@ -83,9 +89,9 @@

    To un-deprecate a package, specify an empty string ("") for the message argument. Note that you must use double quotes with no space between them to format an empty string.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-dist-tag/index.html b/deps/npm/docs/public/cli-commands/npm-dist-tag/index.html index c560d919aa6d29..7955f8def330eb 100644 --- a/deps/npm/docs/public/cli-commands/npm-dist-tag/index.html +++ b/deps/npm/docs/public/cli-commands/npm-dist-tag/index.html @@ -1,4 +1,4 @@ -

    +

    section: cli-commands title: npm-dist-tag description: Modify package distribution tags


    -

    npm dist-tag

    -

    Modify package distribution tags

    -

    Synopsis

    +

    npm dist-tag

    +

    Modify package distribution tags

    +

    Synopsis

    npm dist-tag add <pkg>@<version> [<tag>]
     npm dist-tag rm <pkg> <tag>
     npm dist-tag ls [<pkg>]
     
     aliases: dist-tags
    -

    Description

    +

    Description

    Add, remove, and enumerate distribution tags on a package:

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-docs/index.html b/deps/npm/docs/public/cli-commands/npm-docs/index.html index 99ba5bed69f941..42f18e75075ce1 100644 --- a/deps/npm/docs/public/cli-commands/npm-docs/index.html +++ b/deps/npm/docs/public/cli-commands/npm-docs/index.html @@ -1,4 +1,4 @@ -

    npm docs

    -

    Docs for a package in a web browser maybe

    -

    Synopsis

    +

    npm docs

    +

    Docs for a package in a web browser maybe

    +

    Synopsis

    npm docs [<pkgname> [<pkgname> ...]]
     npm docs .
     npm home [<pkgname> [<pkgname> ...]]
     npm home .
    -

    Description

    +

    Description

    This command tries to guess at the likely location of a package's documentation URL, and then tries to open it using the --browser config param. You can pass multiple package names at once. If no package name is provided, it will search for a package.json in the current folder and use the name property.

    -

    Configuration

    -

    browser

    +

    Configuration

    +

    browser

    • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • Type: String

    The browser that is called by the npm docs command to open websites.

    -

    registry

    +

    registry

    The base URL of the npm package registry.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-doctor/index.html b/deps/npm/docs/public/cli-commands/npm-doctor/index.html index 1edad5dff749e6..ac94c50d0edca3 100644 --- a/deps/npm/docs/public/cli-commands/npm-doctor/index.html +++ b/deps/npm/docs/public/cli-commands/npm-doctor/index.html @@ -1,4 +1,4 @@ -

    npm doctor

    -

    Check your environments

    -

    Synopsis

    +

    npm doctor

    +

    Check your environments

    +

    Synopsis

    npm doctor
    -

    Description

    +

    Description

    npm doctor runs a set of checks to ensure that your npm installation has what it needs to manage your JavaScript packages. npm is mostly a standalone tool, but it does have some basic requirements that must be met:

    @@ -92,7 +98,7 @@

    npm doctor verifies the following items in your environment, and if there are any recommended changes, it will display them.

    -

    npm ping

    +

    npm ping

    By default, npm installs from the primary npm registry, registry.npmjs.org. npm doctor hits a special ping endpoint within the registry. This can also be checked with npm ping. If this check fails, you may be using a proxy that @@ -102,7 +108,7 @@

    npm config get registry), and if you're using a private registry that doesn't support the /whoami endpoint supported by the primary registry, this check may fail.

    -

    npm -v

    +

    npm -v

    While Node.js may come bundled with a particular version of npm, it's the policy of the CLI team that we recommend all users run npm@latest if they can. As the CLI is maintained by a small team of contributors, there are only @@ -110,34 +116,34 @@

    node -v

    +

    node -v

    For most users, in most circumstances, the best version of Node will be the latest long-term support (LTS) release. Those of you who want access to new ECMAscript features or bleeding-edge changes to Node's standard library may be running a newer version, and some of you may be required to run an older version of Node because of enterprise change control policies. That's OK! But in general, the npm team recommends that most users run Node.js LTS.

    -

    npm config get registry

    +

    npm config get registry

    Some of you may be installing from private package registries for your project or company. That's great! Others of you may be following tutorials or StackOverflow questions in an effort to troubleshoot problems you may be having. Sometimes, this may entail changing the registry you're pointing at. This part of npm doctor just lets you, and maybe whoever's helping you with support, know that you're not using the default registry.

    -

    which git

    +

    which git

    While it's documented in the README, it may not be obvious that npm needs Git installed to do many of the things that it does. Also, in some cases – especially on Windows – you may have Git set up in such a way that it's not accessible via your PATH so that npm can find it. This check ensures that Git is available.

    -

    Permissions checks

    +

    Permissions checks

    • Your cache must be readable and writable by the user running npm.
    • Global package binaries must be writable by the user running npm.
    • Your local node_modules path, if you're running npm doctor with a project directory, must be readable and writable by the user running npm.
    -

    Validate the checksums of cached packages

    +

    Validate the checksums of cached packages

    When an npm package is published, the publishing process generates a checksum that npm uses at install time to verify that the package didn't get corrupted in transit. npm doctor uses these checksums to validate the package tarballs @@ -145,11 +151,11 @@

    npm cache ls – probably more than you were expecting!). In the event that there are corrupt packages in your cache, you should probably run npm cache clean and reset the cache.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-edit/index.html b/deps/npm/docs/public/cli-commands/npm-edit/index.html index 54e257bf84feef..bddb1c09c83afc 100644 --- a/deps/npm/docs/public/cli-commands/npm-edit/index.html +++ b/deps/npm/docs/public/cli-commands/npm-edit/index.html @@ -1,4 +1,4 @@ -

    npm edit

    -

    Edit an installed package

    -

    Synopsis

    +

    npm edit

    +

    Edit an installed package

    +

    Synopsis

    npm edit <pkg>[/<subpkg>...]
    -

    Description

    +

    Description

    Selects a (sub)dependency in the current working directory and opens the package folder in the default editor (or whatever you've configured as the npm editor config -- see @@ -82,20 +88,20 @@

    For instance, you can do npm install connect to install connect into your package, and then npm edit connect to make a few changes to your locally installed copy.

    -

    Configuration

    -

    editor

    +

    Configuration

    +

    editor

    • Default: EDITOR environment variable if set, or "vi" on Posix, or "notepad" on Windows.
    • Type: path

    The command to run for npm edit or npm config edit.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-explore/index.html b/deps/npm/docs/public/cli-commands/npm-explore/index.html index 0b94db69d86c4e..97f438294558d4 100644 --- a/deps/npm/docs/public/cli-commands/npm-explore/index.html +++ b/deps/npm/docs/public/cli-commands/npm-explore/index.html @@ -1,4 +1,4 @@ -

    +

    section: cli-commands title: npm-explore description: Browse an installed package


    -

    npm explore

    -

    Browse an installed package

    -

    Synopsis

    +

    npm explore

    +

    Browse an installed package

    +

    Synopsis

    npm explore <pkg> [ -- <command>]
    -

    Description

    +

    Description

    Spawn a subshell in the directory of the installed package specified.

    If a command is specified, then it is run in the subshell, which then immediately terminates.

    @@ -86,21 +92,21 @@

    npm explore some-dependency -- git pull origin master

    Note that the package is not automatically rebuilt afterwards, so be sure to use npm rebuild <pkg> if you make any changes.

    -

    Configuration

    -

    shell

    +

    Configuration

    +

    shell

    • Default: SHELL environment variable, or "bash" on Posix, or "cmd" on Windows
    • Type: path

    The shell to run for the npm explore command.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-fund/index.html b/deps/npm/docs/public/cli-commands/npm-fund/index.html index 77f637f4ba388c..f58901446cd58a 100644 --- a/deps/npm/docs/public/cli-commands/npm-fund/index.html +++ b/deps/npm/docs/public/cli-commands/npm-fund/index.html @@ -1,4 +1,4 @@ -

    npm fund

    -

    Retrieve funding information

    -

    Synopsis

    +

    npm fund

    +

    Retrieve funding information

    +

    Synopsis

        npm fund [<pkg>]
    -

    Description

    +

    Description

    This command retrieves information on how to fund the dependencies of a given project. If no package name is provided, it will list all dependencies that are looking for funding in a tree-structure in which are listed the type of funding and the url to visit. If a package name is provided then it tries to open its funding url using the --browser -config param.

    +config param; if there are multiple funding sources for the package, the +user will be instructed to pass the --which command to disambiguate.

    The list will avoid duplicated entries and will stack all packages that share the same type/url as a single entry. Given this nature the list is not going to have the same shape of the output from npm ls.

    -

    Configuration

    -

    browser

    +

    Configuration

    +

    browser

    • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • Type: String

    The browser that is called by the npm fund command to open websites.

    -

    json

    +

    json

      -
    • Default: false
    • Type: Boolean
    • +
    • Default: false

    Show information in JSON format.

    -

    unicode

    +

    unicode

    • Type: Boolean
    • Default: true

    Whether to represent the tree structure using unicode characters. Set it to false in order to use all-ansi output.

    -

    See Also

    +

    which

    +
      +
    • Type: Number
    • +
    • Default: undefined
    • +
    +

    If there are multiple funding sources, which 1-indexed source URL to open.

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-help-search/index.html b/deps/npm/docs/public/cli-commands/npm-help-search/index.html index 9c4a06fa9114d0..abd84b775782d5 100644 --- a/deps/npm/docs/public/cli-commands/npm-help-search/index.html +++ b/deps/npm/docs/public/cli-commands/npm-help-search/index.html @@ -1,4 +1,4 @@ -

    npm help-search

    -

    Search npm help documentation

    -

    Synopsis

    +

    npm help-search

    +

    Search npm help documentation

    +

    Synopsis

    npm help-search <text>
    -

    Description

    +

    Description

    This command will search the npm markdown documentation files for the terms provided, and then list the results, sorted by relevance.

    If only one result is found, then it will show that help topic.

    If the argument to npm help is not a known help topic, then it will call help-search. It is rarely if ever necessary to call this command directly.

    -

    Configuration

    -

    long

    +

    Configuration

    +

    long

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-help/index.html b/deps/npm/docs/public/cli-commands/npm-help/index.html index f6fb102efb1b3b..e38710dc87f52c 100644 --- a/deps/npm/docs/public/cli-commands/npm-help/index.html +++ b/deps/npm/docs/public/cli-commands/npm-help/index.html @@ -1,4 +1,4 @@ -

    npm help

    -

    Get help on npm

    -

    Synopsis

    +

    npm help

    +

    Get help on npm

    +

    Synopsis

    npm help <term> [<terms..>]
    -

    Description

    +

    Description

    If supplied a topic, then show the appropriate documentation page.

    If the topic does not exist, or if multiple terms are provided, then run the help-search command to find a match. Note that, if help-search finds a single subject, then it will run help on that topic, so unique matches are equivalent to specifying a topic name.

    -

    Configuration

    -

    viewer

    +

    Configuration

    +

    viewer

    • Default: "man" on Posix, "browser" on Windows
    • Type: path

    The program to use to view help content.

    Set to "browser" to view html help content in the default web browser.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-hook/index.html b/deps/npm/docs/public/cli-commands/npm-hook/index.html index 6556b3b3dc967d..bd3e717c829525 100644 --- a/deps/npm/docs/public/cli-commands/npm-hook/index.html +++ b/deps/npm/docs/public/cli-commands/npm-hook/index.html @@ -1,4 +1,4 @@ -

    npm hook

    -

    Manage registry hooks

    -

    Synopsis

    +

    npm hook

    +

    Manage registry hooks

    +

    Synopsis

    npm hook ls [pkg]
     npm hook add <entity> <url> <secret>
     npm hook update <id> <url> [secret]
     npm hook rm <id>
    -

    Example

    +

    Example

    Add a hook to watch a package for changes:

    $ npm hook add lodash https://example.com/ my-shared-secret

    Add a hook to watch packages belonging to the user substack:

    @@ -90,7 +96,7 @@

    $ npm hook update id-deadbeef https://my-new-website.here/

    Remove a hook:

    $ npm hook rm id-deadbeef
    -

    Description

    +

    Description

    Allows you to manage npm hooks, including adding, removing, listing, and updating.

    Hooks allow you to configure URL endpoints that will be notified whenever a @@ -103,7 +109,7 @@

    The shared secret will be sent along to the URL endpoint so you can verify the request came from your own configured hook.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-init/index.html b/deps/npm/docs/public/cli-commands/npm-init/index.html index 4f619bb65d0e7a..0515fcadc6ce4b 100644 --- a/deps/npm/docs/public/cli-commands/npm-init/index.html +++ b/deps/npm/docs/public/cli-commands/npm-init/index.html @@ -1,4 +1,4 @@ -

    npm init

    -

    create a package.json file

    -

    Synopsis

    +

    npm init

    +

    create a package.json file

    +

    Synopsis

    npm init [--force|-f|--yes|-y|--scope]
     npm init <@scope> (same as `npx <@scope>/create`)
     npm init [<@scope>/]<name> (same as `npx [<@scope>/]create-<name>`)
    -

    Examples

    +

    Examples

    Create a new React-based project using create-react-app:

    $ npm init react-app ./my-react-app

    Create a new esm-compatible package using create-esm:

    @@ -86,7 +92,7 @@

    npm init

    Generate it without having it ask any questions:

    $ npm init -y
    -

    Description

    +

    Description

    npm init <initializer> can be used to set up a new or existing npm package.

    initializer in this case is an npm package named create-<initializer>, which will be installed by npx, and then have its main bin @@ -107,11 +113,11 @@

    -y/--yes to skip the questionnaire altogether. If you pass --scope, it will create a scoped package.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-install-ci-test/index.html b/deps/npm/docs/public/cli-commands/npm-install-ci-test/index.html index 8e54986627e34a..78f717dc33e524 100644 --- a/deps/npm/docs/public/cli-commands/npm-install-ci-test/index.html +++ b/deps/npm/docs/public/cli-commands/npm-install-ci-test/index.html @@ -1,4 +1,4 @@ -

    npm install-ci-test

    -

    Install a project with a clean slate and run tests

    -

    Synopsis

    +

    npm install-ci-test

    +

    Install a project with a clean slate and run tests

    +

    Synopsis

    npm install-ci-test
     
     alias: npm cit
    -

    Description

    +

    Description

    This command runs an npm ci followed immediately by an npm test.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-install-test/index.html b/deps/npm/docs/public/cli-commands/npm-install-test/index.html index 7cde472b8564c7..d63b61afcf1249 100644 --- a/deps/npm/docs/public/cli-commands/npm-install-test/index.html +++ b/deps/npm/docs/public/cli-commands/npm-install-test/index.html @@ -1,4 +1,4 @@ -

    npm install-test

    -

    Install package(s) and run tests

    -

    Synopsis

    +

    npm install-test

    +

    Install package(s) and run tests

    +

    Synopsis

    npm install-test (with no args, in package dir)
     npm install-test [<@scope>/]<name>
     npm install-test [<@scope>/]<name>@<tag>
    @@ -82,13 +88,13 @@ 

    npm it common options: [--save|--save-dev|--save-optional] [--save-exact] [--dry-run]

    -

    Description

    +

    Description

    This command runs an npm install followed immediately by an npm test. It takes exactly the same arguments as npm install.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-install/index.html b/deps/npm/docs/public/cli-commands/npm-install/index.html index 9ab2a20f5ecc62..16a98c965a6d08 100644 --- a/deps/npm/docs/public/cli-commands/npm-install/index.html +++ b/deps/npm/docs/public/cli-commands/npm-install/index.html @@ -1,4 +1,4 @@ -

    npm install

    -

    Install a package

    -

    Synopsis

    +

    npm install

    +

    Install a package

    +

    Synopsis

    npm install (with no args, in package dir)
     npm install [<@scope>/]<name>
     npm install [<@scope>/]<name>@<tag>
    @@ -85,18 +91,18 @@ 

    npm i, npm add common options: [-P|--save-prod|-D|--save-dev|-O|--save-optional] [-E|--save-exact] [-B|--save-bundle] [--no-save] [--dry-run]

    -

    Description

    +

    Description

    This command installs a package, and any packages that it depends on. If the package has a package-lock or shrinkwrap file, the installation of dependencies will be driven by that, with an npm-shrinkwrap.json taking precedence if both -files exist. See package-lock.json and npm shrinkwrap.

    +files exist. See package-lock.json and npm shrinkwrap.

    A package is:

    • a) a folder containing a program described by a package.json file
    • b) a gzipped tarball containing (a)
    • c) a url that resolves to (b)
    • d) a <name>@<version> that is published on the registry (see registry) with (c)
    • -
    • e) a <name>@<tag> (see npm dist-tag) that points to (d)
    • +
    • e) a <name>@<tag> (see npm dist-tag) that points to (d)
    • f) a <name> that has a "latest" tag satisfying (e)
    • g) a <git remote url> that resolves to (a)
    @@ -387,7 +393,7 @@

    npm-audit for details on what is sent.

    See config. Many of the configuration params have some effect on installation, since that's most of what npm does.

    -

    Algorithm

    +

    Algorithm

    To install a package, npm uses the following algorithm:

    load the existing node_modules tree from disk
     clone the tree
    @@ -419,7 +425,7 @@ 

    folders for a more detailed description of the specific folder structures that npm creates.

    -

    Limitations of npm's Install Algorithm

    +

    Limitations of npm's Install Algorithm

    npm will refuse to install any package with an identical name to the current package. This can be overridden with the --force flag, but in most cases can simply be addressed by changing the local package name.

    @@ -438,22 +444,22 @@

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-link/index.html b/deps/npm/docs/public/cli-commands/npm-link/index.html index 330ea407c2767f..5b568995d6209d 100644 --- a/deps/npm/docs/public/cli-commands/npm-link/index.html +++ b/deps/npm/docs/public/cli-commands/npm-link/index.html @@ -1,4 +1,4 @@ -

    npm link

    - -

    Synopsis

    +

    npm link

    + +

    Synopsis

    npm link (in package dir)
     npm link [<@scope>/]<pkg>[@<version>]
     
     alias: npm ln
    -

    Description

    +

    Description

    Package linking is a two-step process.

    First, npm link in a package folder will create a symlink in the global folder {prefix}/lib/node_modules/<package> that links to the package where the npm -link command was executed. (see npm-config for the value of prefix). It -will also link any bins in the package to {prefix}/bin/{name}.

    +link command was executed. It will also link any bins in the package to {prefix}/bin/{name}. +Note that npm link uses the global prefix (see npm prefix -g for its value).

    Next, in some other location, npm link package-name will create a symbolic link from globally-installed package-name to node_modules/ of the current folder.

    @@ -113,13 +119,13 @@

    redis.

    If your linked package is scoped (see scope) your link command must include that scope, e.g.

    npm link @myorg/privatepackage
    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-logout/index.html b/deps/npm/docs/public/cli-commands/npm-logout/index.html index a5126df803b915..7e4ce934fb5c4c 100644 --- a/deps/npm/docs/public/cli-commands/npm-logout/index.html +++ b/deps/npm/docs/public/cli-commands/npm-logout/index.html @@ -1,4 +1,4 @@ -

    npm logout

    -

    Log out of the registry

    -

    Synopsis

    +

    npm logout

    +

    Log out of the registry

    +

    Synopsis

    npm logout [--registry=<url>] [--scope=<@scope>]
    -

    Description

    +

    Description

    When logged into a registry that supports token-based authentication, tell the server to end this token's session. This will invalidate the token everywhere you're using it, not just for the current environment.

    @@ -81,21 +87,21 @@

    If --scope is provided, this will find the credentials for the registry connected to that scope, if set.

    -

    Configuration

    -

    registry

    +

    Configuration

    +

    registry

    Default: https://registry.npmjs.org/

    The base URL of the npm package registry. If scope is also specified, it takes precedence.

    -

    scope

    +

    scope

    Default: The scope of your current project, if any, otherwise none.

    If specified, you will be logged out of the specified scope. See scope.

    npm logout --scope=@myco
    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-ls/index.html b/deps/npm/docs/public/cli-commands/npm-ls/index.html index 5658a377e99742..89ed133f3ab21b 100644 --- a/deps/npm/docs/public/cli-commands/npm-ls/index.html +++ b/deps/npm/docs/public/cli-commands/npm-ls/index.html @@ -1,4 +1,4 @@ -

    npm ls

    -

    List installed packages

    -

    Synopsis

    +

    npm ls

    +

    List installed packages

    +

    Synopsis

    npm ls [[<@scope>/]<pkg> ...]
     
     aliases: list, la, ll
    -

    Description

    +

    Description

    This command will print to stdout all the versions of packages that are installed, as well as their dependencies, in a tree-structure.

    Positional arguments are name@version-range identifiers, which will limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

    -
        npm@6.13.4 /path/to/npm
    +
        npm@6.14.4 /path/to/npm
         └─┬ init-package-json@0.0.4
           └── promzard@0.1.5

    It will print out extraneous, missing, and invalid packages.

    @@ -91,78 +97,78 @@

    The tree shown is the logical dependency tree, based on package dependencies, not the physical layout of your node_modules folder.

    When run as ll or la, it shows extended information by default.

    -

    Configuration

    -

    json

    +

    Configuration

    +

    json

    • Default: false
    • Type: Boolean

    Show information in JSON format.

    -

    long

    +

    long

    • Default: false
    • Type: Boolean

    Show extended information.

    -

    parseable

    +

    parseable

    • Default: false
    • Type: Boolean

    Show parseable output instead of tree view.

    -

    global

    +

    global

    • Default: false
    • Type: Boolean

    List packages in the global install prefix instead of in the current project.

    -

    depth

    +

    depth

    • Type: Int

    Max display depth of the dependency tree.

    -

    prod / production

    +

    prod / production

    • Type: Boolean
    • Default: false

    Display only the dependency tree for packages in dependencies.

    -

    dev / development

    +

    dev / development

    • Type: Boolean
    • Default: false

    Display only the dependency tree for packages in devDependencies.

    -

    only

    +

    only

    • Type: String

    When "dev" or "development", is an alias to dev.

    When "prod" or "production", is an alias to production.

    - +
    • Type: Boolean
    • Default: false

    Display only dependencies which are linked

    -

    unicode

    +

    unicode

    • Type: Boolean
    • Default: true

    Whether to represent the tree structure using unicode characters. Set it to false in order to use all-ansi output.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-org/index.html b/deps/npm/docs/public/cli-commands/npm-org/index.html index 977f4e8cef976e..0a7800216e28e1 100644 --- a/deps/npm/docs/public/cli-commands/npm-org/index.html +++ b/deps/npm/docs/public/cli-commands/npm-org/index.html @@ -1,4 +1,4 @@ -

    npm org

    -

    Manage orgs

    -

    Synopsis

    +

    npm org

    +

    Manage orgs

    +

    Synopsis

    npm org set <orgname> <username> [developer | admin | owner]
     npm org rm <orgname> <username>
     npm org ls <orgname> [<username>]
    -

    Example

    +

    Example

    Add a new developer to an org:

    $ npm org set my-org @mx-smith

    Add a new admin to an org (or change a developer to an admin):

    @@ -87,11 +93,11 @@

    $ npm org ls my-org --json

    See what role a user has in an org:

    $ npm org ls my-org @mx-santos
    -

    Description

    +

    Description

    You can use the npm org commands to manage and view users of an organization. It supports adding and removing users, changing their roles, listing them, and finding specific ones and their roles.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-outdated/index.html b/deps/npm/docs/public/cli-commands/npm-outdated/index.html index 98b2cf029157e7..77274aff6bf25d 100644 --- a/deps/npm/docs/public/cli-commands/npm-outdated/index.html +++ b/deps/npm/docs/public/cli-commands/npm-outdated/index.html @@ -1,4 +1,4 @@ -

    npm outdated

    -

    Check for outdated packages

    -

    Synopsis

    +

    npm outdated

    +

    Check for outdated packages

    +

    Synopsis

    npm outdated [[<@scope>/]<pkg> ...]
    -

    Description

    +

    Description

    This command will check the registry to see if any (or, specific) installed packages are currently outdated.

    In the output:

    @@ -96,7 +102,7 @@

    Red means there's a newer version matching your semver requirements, so you should update now.
  • Yellow indicates that there's a newer version above your semver requirements (usually new major, or new 0.x minor) so proceed with caution.
  • -

    An example

    +

    An example

    $ npm outdated
     Package      Current   Wanted   Latest  Location
     glob          5.0.15   5.0.15    6.0.1  test-outdated-output
    @@ -127,42 +133,42 @@ 

    once is just plain out of date. Reinstalling node_modules from scratch or running npm update will bring it up to spec. -

    Configuration

    -

    json

    +

    Configuration

    +

    json

    • Default: false
    • Type: Boolean

    Show information in JSON format.

    -

    long

    +

    long

    • Default: false
    • Type: Boolean

    Show extended information.

    -

    parseable

    +

    parseable

    • Default: false
    • Type: Boolean

    Show parseable output instead of tree view.

    -

    global

    +

    global

    • Default: false
    • Type: Boolean

    Check packages in the global install prefix instead of in the current project.

    -

    depth

    +

    depth

    • Default: 0
    • Type: Int

    Max depth for checking dependency tree.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-owner/index.html b/deps/npm/docs/public/cli-commands/npm-owner/index.html index 87d6510c7d37da..d128bf2ff1136a 100644 --- a/deps/npm/docs/public/cli-commands/npm-owner/index.html +++ b/deps/npm/docs/public/cli-commands/npm-owner/index.html @@ -1,4 +1,4 @@ -

    npm owner

    -

    Manage package owners

    -

    Synopsis

    +

    npm owner

    +

    Manage package owners

    +

    Synopsis

    npm owner add <user> [<@scope>/]<pkg>
     npm owner rm <user> [<@scope>/]<pkg>
     npm owner ls [<@scope>/]<pkg>
     
     aliases: author
    -

    Description

    +

    Description

    Manage ownership of published packages.

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-pack/index.html b/deps/npm/docs/public/cli-commands/npm-pack/index.html index 3db98ee2758b4a..1bdd218cfb3f11 100644 --- a/deps/npm/docs/public/cli-commands/npm-pack/index.html +++ b/deps/npm/docs/public/cli-commands/npm-pack/index.html @@ -1,4 +1,4 @@ -

    npm pack

    -

    Create a tarball from a package

    -

    Synopsis

    +

    npm pack

    +

    Create a tarball from a package

    +

    Synopsis

    npm pack [[<@scope>/]<pkg>...] [--dry-run]
    -

    Description

    +

    Description

    For anything that's installable (that is, a package folder, tarball, tarball url, name@tag, name@version, name, or scoped name), this command will fetch it to the cache, and then copy the tarball to the @@ -83,11 +89,11 @@

    If no arguments are supplied, then npm packs the current package folder.

    The --dry-run argument will do everything that pack usually does without actually packing anything. Reports on what would have gone into the tarball.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-ping/index.html b/deps/npm/docs/public/cli-commands/npm-ping/index.html index 202f197dd8a6e8..478c206499f759 100644 --- a/deps/npm/docs/public/cli-commands/npm-ping/index.html +++ b/deps/npm/docs/public/cli-commands/npm-ping/index.html @@ -1,4 +1,4 @@ -

    npm ping

    -

    Ping npm registry

    -

    Synopsis

    +

    npm ping

    +

    Ping npm registry

    +

    Synopsis

    npm ping [--registry <registry>]
    -

    Description

    +

    Description

    Ping the configured or given npm registry and verify authentication. If it works it will output something like:

    Ping success: {*Details about registry*}

    otherwise you will get:

    Ping error: {*Detail about error}
    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-prefix/index.html b/deps/npm/docs/public/cli-commands/npm-prefix/index.html index 35f8f6cdce2180..aa5515abf372bb 100644 --- a/deps/npm/docs/public/cli-commands/npm-prefix/index.html +++ b/deps/npm/docs/public/cli-commands/npm-prefix/index.html @@ -1,4 +1,4 @@ -

    npm prefix

    -

    Display prefix

    -

    Synopsis

    +

    npm prefix

    +

    Display prefix

    +

    Synopsis

    npm prefix [-g]
    -

    Description

    +

    Description

    Print the local prefix to standard out. This is the closest parent directory to contain a package.json file or node_modules directory, unless -g is also specified.

    If -g is specified, this will be the value of the global prefix. See -npm config for more detail.

    -

    See Also

    +npm config for more detail.

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-profile/index.html b/deps/npm/docs/public/cli-commands/npm-profile/index.html index e8301c809d213a..97617c3fb01b80 100644 --- a/deps/npm/docs/public/cli-commands/npm-profile/index.html +++ b/deps/npm/docs/public/cli-commands/npm-profile/index.html @@ -1,4 +1,4 @@ -

    npm profile

    -

    Change settings on your registry profile

    -

    Synopsis

    +

    npm profile

    +

    Change settings on your registry profile

    +

    Synopsis

    npm profile get [--json|--parseable] [<property>]
     npm profile set [--json|--parseable] <property> <value>
     npm profile set password
     npm profile enable-2fa [auth-and-writes|auth-only]
     npm profile disable-2fa
    -

    Description

    +

    Description

    Change your profile information on the registry. This not be available if you're using a non-npmjs registry.

    -

    Details

    +

    Details

    All of the npm profile subcommands accept --json and --parseable and will tailor their output based on those. Some of these commands may not be available on non npmjs.com registries.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-prune/index.html b/deps/npm/docs/public/cli-commands/npm-prune/index.html index 34c2f9905f1c50..8dc6092402f5e1 100644 --- a/deps/npm/docs/public/cli-commands/npm-prune/index.html +++ b/deps/npm/docs/public/cli-commands/npm-prune/index.html @@ -1,4 +1,4 @@ -

    npm prune

    -

    Remove extraneous packages

    -

    Synopsis

    +

    npm prune

    +

    Remove extraneous packages

    +

    Synopsis

    npm prune [[<@scope>/]<pkg>...] [--production] [--dry-run] [--json]
    -

    Description

    +

    Description

    This command removes "extraneous" packages. If a package name is provided, then only packages matching one of the supplied names are removed.

    @@ -90,11 +96,11 @@

    --production flag.

    If you've disabled package-locks then extraneous modules will not be removed and it's up to you to run npm prune from time-to-time to remove them.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-publish/index.html b/deps/npm/docs/public/cli-commands/npm-publish/index.html index 8096dd81de6628..4ba3e0db658254 100644 --- a/deps/npm/docs/public/cli-commands/npm-publish/index.html +++ b/deps/npm/docs/public/cli-commands/npm-publish/index.html @@ -1,4 +1,4 @@ -

    npm publish

    -

    Publish a package

    -

    Synopsis

    +

    npm publish

    +

    Publish a package

    +

    Synopsis

    npm publish [<tarball>|<folder>] [--tag <tag>] [--access <public|restricted>] [--otp otpcode] [--dry-run]
     
     Publishes '.' if no argument supplied
     Sets tag 'latest' if no --tag specified
    -

    Description

    +

    Description

    Publishes a package to the registry so that it can be installed by name. All files in the package directory are included if no local .gitignore or .npmignore file exists. If both files exist and a file is ignored by @@ -111,22 +117,22 @@

    Once a package is published with a given name and version, that specific name and version combination can never be used again, even if -it is removed with npm unpublish.

    +it is removed with npm unpublish.

    As of npm@5, both a sha1sum and an integrity field with a sha512sum of the tarball will be submitted to the registry during publication. Subsequent installs will use the strongest supported algorithm to verify downloads.

    -

    Similar to --dry-run see npm pack, which figures out the files to be +

    Similar to --dry-run see npm pack, which figures out the files to be included and packs them into a tarball to be uploaded to the registry.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-rebuild/index.html b/deps/npm/docs/public/cli-commands/npm-rebuild/index.html index cd37ea2810314e..1be8c34433293f 100644 --- a/deps/npm/docs/public/cli-commands/npm-rebuild/index.html +++ b/deps/npm/docs/public/cli-commands/npm-rebuild/index.html @@ -1,4 +1,4 @@ -

    npm rebuild

    -

    Rebuild a package

    -

    Synopsis

    +

    npm rebuild

    +

    Rebuild a package

    +

    Synopsis

    npm rebuild [[<@scope>/<name>]...]
     
     alias: npm rb
    -

    Description

    +

    Description

    This command runs the npm build command on the matched folders. This is useful when you install a new version of node, and must recompile all your C++ addons with the new binary.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-repo/index.html b/deps/npm/docs/public/cli-commands/npm-repo/index.html index 20bf77637ffb3b..790ee382f5e989 100644 --- a/deps/npm/docs/public/cli-commands/npm-repo/index.html +++ b/deps/npm/docs/public/cli-commands/npm-repo/index.html @@ -1,4 +1,4 @@ -

    npm repo

    -

    Open package repository page in the browser

    -

    Synopsis

    +

    npm repo

    +

    Open package repository page in the browser

    +

    Synopsis

    npm repo [<pkg>]
    -

    Description

    +

    Description

    This command tries to guess at the likely location of a package's repository URL, and then tries to open it using the --browser config param. If no package name is provided, it will search for a package.json in the current folder and use the name property.

    -

    Configuration

    -

    browser

    +

    Configuration

    +

    browser

    • Default: OS X: "open", Windows: "start", Others: "xdg-open"
    • Type: String

    The browser that is called by the npm repo command to open websites.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-restart/index.html b/deps/npm/docs/public/cli-commands/npm-restart/index.html index 16a9827976f183..0a360a63e88e8f 100644 --- a/deps/npm/docs/public/cli-commands/npm-restart/index.html +++ b/deps/npm/docs/public/cli-commands/npm-restart/index.html @@ -1,4 +1,4 @@ -

    npm restart

    -

    Restart a package

    -

    Synopsis

    +

    npm restart

    +

    Restart a package

    +

    Synopsis

    npm restart [-- <args>]
    -

    Description

    +

    Description

    This restarts a package.

    This runs a package's "stop", "restart", and "start" scripts, and associated pre- and post- scripts, in the order given below:

    @@ -87,19 +93,19 @@

    poststart
  • postrestart
  • -

    Note

    +

    Note

    Note that the "restart" script is run in addition to the "stop" and "start" scripts, not instead of them.

    This is the behavior as of npm major version 2. A change in this behavior will be accompanied by an increase in major version number

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-root/index.html b/deps/npm/docs/public/cli-commands/npm-root/index.html index 6c415ca02c99ae..28c9770f184c2a 100644 --- a/deps/npm/docs/public/cli-commands/npm-root/index.html +++ b/deps/npm/docs/public/cli-commands/npm-root/index.html @@ -1,4 +1,4 @@ -

    npm root

    -

    Display npm root

    -

    Synopsis

    +

    npm root

    +

    Display npm root

    +

    Synopsis

    npm root [-g]
    -

    Description

    +

    Description

    Print the effective node_modules folder to standard out.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-run-script/index.html b/deps/npm/docs/public/cli-commands/npm-run-script/index.html index 7b437ad7a938f8..3afd3d51c62c09 100644 --- a/deps/npm/docs/public/cli-commands/npm-run-script/index.html +++ b/deps/npm/docs/public/cli-commands/npm-run-script/index.html @@ -1,4 +1,4 @@ -

    npm run-script

    -

    Run arbitrary package scripts

    -

    Synopsis

    +

    npm run-script

    +

    Run arbitrary package scripts

    +

    Synopsis

    npm run-script <command> [--silent] [-- <args>...]
     
     alias: npm run
    -

    Description

    +

    Description

    This runs an arbitrary command from a package's "scripts" object. If no "command" is provided, it will list the available scripts. run[-script] is used by the test, start, restart, and stop commands, but can be called @@ -122,14 +128,14 @@

    You can use the --if-present flag to avoid exiting with a non-zero exit code when the script is undefined. This lets you run potentially undefined scripts without breaking the execution chain.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-search/index.html b/deps/npm/docs/public/cli-commands/npm-search/index.html index b2e91e373cf91e..d97c2b26efa3dd 100644 --- a/deps/npm/docs/public/cli-commands/npm-search/index.html +++ b/deps/npm/docs/public/cli-commands/npm-search/index.html @@ -1,4 +1,4 @@ -

    npm search

    -

    Search for packages

    -

    Synopsis

    +

    npm search

    +

    Search for packages

    +

    Synopsis

    npm search [-l|--long] [--json] [--parseable] [--no-description] [search terms ...]
     
     aliases: s, se, find
    -

    Description

    +

    Description

    Search the registry for packages matching the search terms. npm search performs a linear, incremental, lexically-ordered search through package metadata for all files in the registry. If color is enabled, it will further @@ -91,28 +97,28 @@

    / will be ignored in this case. (Note that many regular expression characters must be escaped or quoted in most shells.)

    -

    A Note on caching

    -

    Configuration

    -

    description

    +

    A Note on caching

    +

    Configuration

    +

    description

    • Default: true
    • Type: Boolean

    Used as --no-description, disables search matching in package descriptions and suppresses display of that field in results.

    -

    json

    +

    json

    • Default: false
    • Type: Boolean

    Output search results as a JSON array.

    -

    parseable

    +

    parseable

    • Default: false
    • Type: Boolean

    Output search results as lines with tab-separated columns.

    -

    long

    +

    long

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-shrinkwrap/index.html b/deps/npm/docs/public/cli-commands/npm-shrinkwrap/index.html index c4537b43edec05..2cff81bb8c896b 100644 --- a/deps/npm/docs/public/cli-commands/npm-shrinkwrap/index.html +++ b/deps/npm/docs/public/cli-commands/npm-shrinkwrap/index.html @@ -1,4 +1,4 @@ -

    npm shrinkwrap

    -

    Lock down dependency versions for publication

    -

    Synopsis

    +

    npm shrinkwrap

    +

    Lock down dependency versions for publication

    +

    Synopsis

    npm shrinkwrap
    -

    Description

    +

    Description

    This command repurposes package-lock.json into a publishable npm-shrinkwrap.json or simply creates a new one. The file created and updated by this command will then take precedence over any other existing or future package-lock.json files. For a detailed explanation of the design and purpose of package locks in npm, see package-locks.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-star/index.html b/deps/npm/docs/public/cli-commands/npm-star/index.html index f00ac985b1433a..d0c887c754a130 100644 --- a/deps/npm/docs/public/cli-commands/npm-star/index.html +++ b/deps/npm/docs/public/cli-commands/npm-star/index.html @@ -1,4 +1,4 @@ -

    npm star

    -

    Mark your favorite packages

    -

    Synopsis

    +

    npm star

    +

    Mark your favorite packages

    +

    Synopsis

    npm star [<pkg>...]
     npm unstar [<pkg>...]
    -

    Description

    +

    Description

    "Starring" a package means that you have some interest in it. It's a vaguely positive way to show that you care.

    "Unstarring" is the same thing, but in reverse.

    It's a boolean thing. Starring repeatedly has no additional effect.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-stars/index.html b/deps/npm/docs/public/cli-commands/npm-stars/index.html index ee36575ada2452..226a132de82039 100644 --- a/deps/npm/docs/public/cli-commands/npm-stars/index.html +++ b/deps/npm/docs/public/cli-commands/npm-stars/index.html @@ -1,4 +1,4 @@ -

    npm stars

    -

    View packages marked as favorites

    -

    Synopsis

    +

    npm stars

    +

    View packages marked as favorites

    +

    Synopsis

    npm stars [<user>]
    -

    Description

    +

    Description

    If you have starred a lot of neat things and want to find them again quickly this command lets you do just that.

    You may also want to see your friend's favorite packages, in this case you will most certainly enjoy this command.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-start/index.html b/deps/npm/docs/public/cli-commands/npm-start/index.html index c5b8984a11ecd2..387e4fe959e9c9 100644 --- a/deps/npm/docs/public/cli-commands/npm-start/index.html +++ b/deps/npm/docs/public/cli-commands/npm-start/index.html @@ -1,4 +1,4 @@ -

    npm start

    -

    Start a package

    -

    Synopsis

    +

    npm start

    +

    Start a package

    +

    Synopsis

    npm start [-- <args>]
    -

    Description

    +

    Description

    This runs an arbitrary command specified in the package's "start" property of its "scripts" object. If no "start" property is specified on the "scripts" object, it will run node server.js.

    As of npm@2.0.0, you can -use custom arguments when executing scripts. Refer to npm run-script for more details.

    -

    See Also

    +use custom arguments when executing scripts. Refer to npm run-script for more details.

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-stop/index.html b/deps/npm/docs/public/cli-commands/npm-stop/index.html index 3559b9b8ca3bf6..e6fed3aeec6c23 100644 --- a/deps/npm/docs/public/cli-commands/npm-stop/index.html +++ b/deps/npm/docs/public/cli-commands/npm-stop/index.html @@ -1,4 +1,4 @@ -

    npm stop

    -

    Stop a package

    -

    Synopsis

    +

    npm stop

    +

    Stop a package

    +

    Synopsis

    npm stop [-- <args>]
    -

    Description

    +

    Description

    This runs a package's "stop" script, if one was provided.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-team/index.html b/deps/npm/docs/public/cli-commands/npm-team/index.html index 58c99f13f84da2..6d6a0bd0866a40 100644 --- a/deps/npm/docs/public/cli-commands/npm-team/index.html +++ b/deps/npm/docs/public/cli-commands/npm-team/index.html @@ -1,4 +1,4 @@ -

    npm team

    -

    Manage organization teams and team memberships

    -

    Synopsis

    +

    npm team

    +

    Manage organization teams and team memberships

    +

    Synopsis

    npm team create <scope:team>
     npm team destroy <scope:team>
     
    @@ -80,11 +86,12 @@ 

    npm team ls <scope>|<scope:team> npm team edit <scope:team>

    -

    Description

    +

    Description

    Used to manage teams in organizations, and change team memberships. Does not handle permissions for packages.

    Teams must always be fully qualified with the organization/scope they belong to when operating on them, separated by a colon (:). That is, if you have a wombats team in a wisdom organization, you must always refer to that team as wisdom:wombats in these commands.

    +

    If you have two-factor authentication enabled in auth-and-writes mode, then you can provide a code from your authenticator with [--otp <otpcode>]. If you don't include this then you will be prompted.

    -

    Details

    +

    Details

    npm team always operates directly on the current registry, configurable from the command line using --registry=<registry url>.

    In order to create teams and manage team membership, you must be a team admin @@ -107,9 +114,9 @@

    npm access command to grant or revoke the appropriate permissions.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-test/index.html b/deps/npm/docs/public/cli-commands/npm-test/index.html index f0a6a411dc1783..7f47f2ab2d328d 100644 --- a/deps/npm/docs/public/cli-commands/npm-test/index.html +++ b/deps/npm/docs/public/cli-commands/npm-test/index.html @@ -1,4 +1,4 @@ -

    npm test

    -

    Test a package

    -

    Synopsis

    +

    npm test

    +

    Test a package

    +

    Synopsis

    npm test [-- <args>]
     
     aliases: t, tst
    -

    Description

    +

    Description

    This runs a package's "test" script, if one was provided.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-token/index.html b/deps/npm/docs/public/cli-commands/npm-token/index.html index f42f3b5e32e7f9..10f880ea2e132e 100644 --- a/deps/npm/docs/public/cli-commands/npm-token/index.html +++ b/deps/npm/docs/public/cli-commands/npm-token/index.html @@ -1,4 +1,4 @@ -

    npm token

    -

    Manage your authentication tokens

    -

    Synopsis

    +

    npm token

    +

    Manage your authentication tokens

    +

    Synopsis

      npm token list [--json|--parseable]
       npm token create [--read-only] [--cidr=1.1.1.1/24,2.2.2.2/16]
       npm token revoke <id|token>
    -

    Description

    +

    Description

    This lets you list, create and revoke authentication tokens.

    • npm token list: @@ -127,4 +133,4 @@

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-uninstall/index.html b/deps/npm/docs/public/cli-commands/npm-uninstall/index.html index 869c5d76cce8aa..059bac05a46a2d 100644 --- a/deps/npm/docs/public/cli-commands/npm-uninstall/index.html +++ b/deps/npm/docs/public/cli-commands/npm-uninstall/index.html @@ -1,4 +1,4 @@ -

    npm uninstall

    -

    Remove a package

    -

    Synopsis

    +

    npm uninstall

    +

    Remove a package

    +

    Synopsis

    npm uninstall [<@scope>/]<pkg>[@<version>]... [-S|--save|-D|--save-dev|-O|--save-optional|--no-save]
     
     aliases: remove, rm, r, un, unlink
    -

    Description

    +

    Description

    This uninstalls a package, completely removing everything npm installed on its behalf.

    Example:

    @@ -98,12 +104,12 @@

    npm uninstall node-tap --save-dev npm uninstall dtrace-provider --save-optional npm uninstall lodash --no-save

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-unpublish/index.html b/deps/npm/docs/public/cli-commands/npm-unpublish/index.html index ef80682fba888b..f9ea9a44155b54 100644 --- a/deps/npm/docs/public/cli-commands/npm-unpublish/index.html +++ b/deps/npm/docs/public/cli-commands/npm-unpublish/index.html @@ -1,4 +1,4 @@ -

    npm unpublish

    -

    Remove a package from the registry

    -

    Synopsis

    -
    npm unpublish [<@scope>/]<pkg>[@<version>]
    -

    Warning

    -

    It is generally considered bad behavior to remove versions of a library -that others are depending on!

    -

    Consider using the deprecate command -instead, if your intent is to encourage users to upgrade.

    -

    There is plenty of room on the registry.

    -

    Description

    +

    npm unpublish

    +

    Remove a package from the registry

    +

    Synopsis

    +

    Unpublishing a single version of a package

    +
    npm unpublish [<@scope>/]<pkg>@<version>
    +

    Unpublishing an entire package

    +
    npm unpublish [<@scope>/]<pkg> --force
    +

    Warning

    +

    Consider using the deprecate command instead, if your intent is to encourage users to upgrade, or if you no longer want to maintain a package.

    +

    Description

    This removes a package version from the registry, deleting its entry and removing the tarball.

    If no version is specified, or if all versions are removed then the root package entry is removed from the registry entirely.

    Even if a package version is unpublished, that specific name and version combination can never be reused. In order to publish the -package again, a new version number must be used. Additionally, -new versions of packages with every version unpublished may not -be republished until 24 hours have passed.

    -

    With the default registry (registry.npmjs.org), unpublish is -only allowed with versions published in the last 72 hours. If you -are trying to unpublish a version published longer ago than that, -contact support@npmjs.com.

    -

    The scope is optional and follows the usual rules for scope.

    -

    See Also

    +package again, a new version number must be used. If you unpublish the entire package, you may not publish any new versions of that package until 24 hours have passed.

    +

    To learn more about how unpublish is treated on the npm registry, see our unpublish policies.

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-update/index.html b/deps/npm/docs/public/cli-commands/npm-update/index.html index e7db5859958bc5..e6653d1f1908f8 100644 --- a/deps/npm/docs/public/cli-commands/npm-update/index.html +++ b/deps/npm/docs/public/cli-commands/npm-update/index.html @@ -1,4 +1,4 @@ -

    npm update

    -

    Update a package

    -

    Synopsis

    +

    npm update

    +

    Update a package

    +

    Synopsis

    npm update [-g] [<pkg>...]
     
     aliases: up, upgrade
    -

    Description

    +

    Description

    This command will update all the packages listed to the latest version (specified by the tag config), respecting semver.

    It will also install missing packages. As with all commands that install @@ -90,7 +96,7 @@

    As of npm@5.0.0, the npm update will change package.json to save the new version as the minimum required dependency. To get the old behavior, use npm update --no-save.

    -

    Example

    +

    Example

    IMPORTANT VERSION NOTE: these examples assume npm@2.6.1 or later. For older versions of npm, you must specify --depth 0 to get the behavior described below.

    @@ -110,14 +116,14 @@

    "0.2.0" ] }

    -

    Caret Dependencies

    +

    Caret Dependencies

    If app's package.json contains:

    "dependencies": {
       "dep1": "^1.1.1"
     }

    Then npm update will install dep1@1.2.2, because 1.2.2 is latest and 1.2.2 satisfies ^1.1.1.

    -

    Tilde Dependencies

    +

    Tilde Dependencies

    However, if app's package.json contains:

    "dependencies": {
       "dep1": "~1.1.1"
    @@ -126,7 +132,7 @@ 

    1.2.2, this version does not satisfy ~1.1.1, which is equivalent to >=1.1.1 <1.2.0. So the highest-sorting version that satisfies ~1.1.1 is used, which is 1.1.2.

    -

    Caret Dependencies below 1.0.0

    +

    Caret Dependencies below 1.0.0

    Suppose app has a caret dependency on a version below 1.0.0, for example:

    "dependencies": {
       "dep1": "^0.2.0"
    @@ -139,20 +145,21 @@ 

    }

    Then npm update will install dep1@0.4.1, because that is the highest-sorting version that satisfies ^0.4.0 (>= 0.4.0 <0.5.0)

    -

    Updating Globally-Installed Packages

    +

    Updating Globally-Installed Packages

    npm update -g will apply the update action to each globally installed package that is outdated -- that is, has a version that is different from -latest.

    +wanted.

    +

    Note: Globally installed packages are treated as if they are installed with a caret semver range specified. So if you require to update to latest you may need to run npm install -g [<pkg>...]

    NOTE: If a package has been upgraded to a version newer than latest, it will be downgraded.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-version/index.html b/deps/npm/docs/public/cli-commands/npm-version/index.html index 442bd78028293d..d540d9d254764a 100644 --- a/deps/npm/docs/public/cli-commands/npm-version/index.html +++ b/deps/npm/docs/public/cli-commands/npm-version/index.html @@ -1,4 +1,4 @@ -

    npm version

    -

    Bump a package version

    -

    Synopsis

    +

    npm version

    +

    Bump a package version

    +

    Synopsis

    npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease [--preid=<prerelease-id>] | from-git]
     
     'npm [-v | --version]' to print npm version
     'npm view <pkg> version' to view a package's published version
     'npm ls' to inspect current package/dependency versions
    -

    Description

    +

    Description

    Run this in a package directory to bump the version and write the new data back to package.json, package-lock.json, and, if present, npm-shrinkwrap.json.

    The newversion argument should be a valid semver string, a @@ -132,37 +138,37 @@

    This runs all your tests, and proceeds only if they pass. Then runs your build script, and adds everything in the dist directory to the commit. After the commit, it pushes the new commit and tag up to the server, and deletes the build/temp directory.

    -

    Configuration

    -

    allow-same-version

    +

    Configuration

    +

    allow-same-version

    • Default: false
    • Type: Boolean

    Prevents throwing an error when npm version is used to set the new version to the same value as the current version.

    -

    git-tag-version

    +

    git-tag-version

    • Default: true
    • Type: Boolean

    Commit and tag the version change.

    -

    commit-hooks

    +

    commit-hooks

    • Default: true
    • Type: Boolean

    Run git commit hooks when committing the version change.

    -

    sign-git-tag

    +

    sign-git-tag

    • Default: false
    • Type: Boolean

    Pass the -s flag to git to sign the tag.

    Note that you must have a default GPG key set up in your git config for this to work properly.

    -

    See Also

    +

    See Also

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-view/index.html b/deps/npm/docs/public/cli-commands/npm-view/index.html index ffb7342d0fe1fa..c9345b8d0893a6 100644 --- a/deps/npm/docs/public/cli-commands/npm-view/index.html +++ b/deps/npm/docs/public/cli-commands/npm-view/index.html @@ -1,4 +1,4 @@ -

    npm view

    -

    View registry info

    -

    Synopsis

    +

    npm view

    +

    View registry info

    +

    Synopsis

    npm view [<@scope>/]<name>[@<version>] [<field>[.<subfield>]...]
     
     aliases: info, show, v
    -

    Description

    +

    Description

    This command shows data about a package and prints it to the stream referenced by the outfd config, which defaults to stdout.

    To show the package registry entry for the connect package, you can do @@ -116,7 +122,7 @@

    To show the connect package version history, you can do this:

    npm view connect versions
    -

    Output

    +

    Output

    If only a single string field for a single version is output, then it will not be colorized or quoted, so as to enable piping the output to another command. If the field is an object, it will be output as a JavaScript object literal.

    @@ -125,13 +131,13 @@

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm-whoami/index.html b/deps/npm/docs/public/cli-commands/npm-whoami/index.html index 37249551ba1e66..e0c37ba0252cc8 100644 --- a/deps/npm/docs/public/cli-commands/npm-whoami/index.html +++ b/deps/npm/docs/public/cli-commands/npm-whoami/index.html @@ -1,4 +1,4 @@ -

    npm whoami

    -

    Display npm username

    -

    Synopsis

    +

    npm whoami

    +

    Display npm username

    +

    Synopsis

    npm whoami [--registry <registry>]
    -

    Description

    +

    Description

    Print the username config to standard output.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/cli-commands/npm/index.html b/deps/npm/docs/public/cli-commands/npm/index.html index 96bdcfe10462df..0d06bfb33ab2e2 100644 --- a/deps/npm/docs/public/cli-commands/npm/index.html +++ b/deps/npm/docs/public/cli-commands/npm/index.html @@ -1,4 +1,4 @@ -

    npm

    -

    javascript package manager

    -

    Synopsis

    +

    npm

    +

    javascript package manager

    +

    Synopsis

    npm <command> [args]
    -

    Version

    -

    6.13.4

    -

    Description

    +

    Version

    +

    6.14.4

    +

    Description

    npm is the package manager for the Node JavaScript platform. It puts modules in place so that node can find them, and manages dependency conflicts intelligently.

    @@ -82,20 +88,20 @@

    Run npm help to get a list of available commands.

    -

    Important

    +

    Important

    npm is configured to use npm, Inc.'s public registry at https://registry.npmjs.org by default. Use of the npm public registry is subject to terms of use available at https://www.npmjs.com/policies/terms.

    You can configure npm to use any compatible registry you like, and even run your own registry. Use of someone else's registry may be governed by their terms of use.

    -

    Introduction

    +

    Introduction

    You probably got npm because you want to install stuff.

    Use npm install blerg to install the latest version of "blerg". Check out npm install for more info. It can do a lot of stuff.

    Use the npm search command to show everything that's available. Use npm ls to show everything you've installed.

    -

    Dependencies

    +

    Dependencies

    If a package references to another package with a git URL, npm depends on a preinstalled git.

    If one of the packages npm tries to install is a native node module and @@ -108,7 +114,7 @@

    the node-gyp repository and the node-gyp Wiki.

    -

    Directories

    +

    Directories

    See folders to learn about where npm puts stuff.

    In particular, npm has two modes of operation:

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/configuring-npm/folders/index.html b/deps/npm/docs/public/configuring-npm/folders/index.html index bf66afffd5d541..a48d6c70ff5ffd 100644 --- a/deps/npm/docs/public/configuring-npm/folders/index.html +++ b/deps/npm/docs/public/configuring-npm/folders/index.html @@ -1,4 +1,4 @@ -

    folders

    -

    Folder Structures Used by npm

    -

    Description

    +

    folders

    +

    Folder Structures Used by npm

    +

    Description

    npm puts various things on your computer. That's its job.

    This document will tell you what it puts where.

    -

    tl;dr

    +

    tl;dr

    • Local install (default): puts stuff in ./node_modules of the current package root.
    • @@ -83,7 +89,7 @@

      npm link.

    -

    prefix Configuration

    +

    prefix Configuration

    The prefix config defaults to the location where node is installed. On most systems, this is /usr/local. On Windows, it's %AppData%\npm. On Unix systems, it's one level up, since node is typically installed at @@ -91,7 +97,7 @@

    global flag is set, npm installs things into this prefix. When it is not set, it uses the root of the current package, or the current working directory if not in a package already.

    -

    Node Modules

    +

    Node Modules

    Packages are dropped into the node_modules folder under the prefix. When installing locally, this means that you can require("packagename") to load its main module, or @@ -104,28 +110,28 @@

    npm install @myorg/package would place the package in {prefix}/node_modules/@myorg/package. See scope for more details.

    If you wish to require() a package, then install it locally.

    -

    Executables

    +

    Executables

    When in global mode, executables are linked into {prefix}/bin on Unix, or directly into {prefix} on Windows.

    When in local mode, executables are linked into ./node_modules/.bin so that they can be made available to scripts run through npm. (For example, so that a test runner will be in the path when you run npm test.)

    -

    Man Pages

    +

    Man Pages

    When in global mode, man pages are linked into {prefix}/share/man.

    When in local mode, man pages are not installed.

    Man pages are not installed on Windows systems.

    -

    Cache

    -

    See npm cache. Cache files are stored in ~/.npm on Posix, or +

    Cache

    +

    See npm cache. Cache files are stored in ~/.npm on Posix, or %AppData%/npm-cache on Windows.

    This is controlled by the cache configuration param.

    -

    Temp Files

    +

    Temp Files

    Temporary files are stored by default in the folder specified by the tmp config, which defaults to the TMPDIR, TMP, or TEMP environment variables, or /tmp on Unix and c:\windows\temp on Windows.

    Temp files are given a unique folder under this root for each run of the program, and are deleted upon successful exit.

    -

    More Information

    +

    More Information

    When installing locally, npm first tries to find an appropriate prefix folder. This is so that npm install foo@1.2.3 will install to the sensible root of your package, even if you happen to have cded @@ -143,12 +149,12 @@

    ./node_modules/foo/node_modules/....

    Any bin files are symlinked to ./node_modules/.bin/, so that they may be found by npm scripts when necessary.

    -

    Global Installation

    +

    Global Installation

    If the global configuration is set to true, then npm will install packages "globally".

    For global installation, packages are installed roughly the same way, but using the folders described above.

    -

    Cycles, Conflicts, and Folder Parsimony

    +

    Cycles, Conflicts, and Folder Parsimony

    Cycles are handled using the property of node's module system that it walks up the directories looking for node_modules folders. So, at every stage, if a package is already installed in an ancestor node_modules @@ -168,7 +174,7 @@

    -

    Example

    +

    Example

    Consider this dependency graph:

    foo
     +-- blerg@1.2.5
    @@ -210,23 +216,23 @@ 

    foo -> baz [D], quux's [E] folder tree is empty, because its dependency on bar is satisfied by the parent folder copy installed at [B].

    For a graphical breakdown of what is installed where, use npm ls.

    -

    Publishing

    +

    Publishing

    Upon publishing, npm will look in the node_modules folder. If any of the items there are not in the bundledDependencies array, then they will not be included in the package tarball.

    This allows a package maintainer to install all of their dependencies (and dev dependencies) locally, but only re-publish those items that cannot be found elsewhere. See package.json for more information.

    -

    See also

    +

    See also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/configuring-npm/install/index.html b/deps/npm/docs/public/configuring-npm/install/index.html index 2d220314d40c8b..1464ac5477af5a 100644 --- a/deps/npm/docs/public/configuring-npm/install/index.html +++ b/deps/npm/docs/public/configuring-npm/install/index.html @@ -1,4 +1,4 @@ -

    install

    -

    Download and Install npm

    -

    Description

    +

    install

    +

    Download and Install npm

    +

    Description

    To publish and install packages to and from the public npm registry, you must install Node.js and the npm command line interface using either a Node version manager or a Node installer. We strongly recommend using a Node version manager to install Node.js and npm. We do not recommend using a Node installer, since the Node installation process installs npm in a directory with local permissions and can cause permissions errors when you run npm packages globally.

    -

    Overview

    +

    Overview

    -

    Checking your version of npm and Node.js

    +

    Checking your version of npm and Node.js

    To see if you already have Node.js and npm installed and check the installed version, run the following commands:

    node -v
     npm -v
    -

    Using a Node version manager to install Node.js and npm

    +

    Using a Node version manager to install Node.js and npm

    Node version managers allow you to install and switch between multiple versions of Node.js and npm on your system so you can test your applications on multiple versions of npm to ensure they work for users on different versions.

    -

    OSX or Linux Node version managers

    +

    OSX or Linux Node version managers

    -

    Windows Node version managers

    +

    Windows Node version managers

    -

    Using a Node installer to install Node.js and npm

    +

    Using a Node installer to install Node.js and npm

    If you are unable to use a Node version manager, you can use a Node installer to install both Node.js and npm on your system.

    -

    OS X or Windows Node installers

    +

    OS X or Windows Node installers

    If you're using OS X or Windows, use one of the installers from the Node.js download page. Be sure to install the version labeled LTS. Other versions have not yet been tested with npm.

    -

    Linux or other operating systems Node installers

    +

    Linux or other operating systems Node installers

    If you're using Linux or another operating system, use one of the following installers:

    Or see this page to install npm for Linux in the way many Linux developers prefer.

    -

    Less-common operating systems

    +

    Less-common operating systems

    For more information on installing Node.js on a variety of operating systems, see this page.

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/configuring-npm/npmrc/index.html b/deps/npm/docs/public/configuring-npm/npmrc/index.html index efffdb4cfb40f8..e1a2c4efda160e 100644 --- a/deps/npm/docs/public/configuring-npm/npmrc/index.html +++ b/deps/npm/docs/public/configuring-npm/npmrc/index.html @@ -1,4 +1,4 @@ -

    npmrc

    -

    The npm config files

    -

    Description

    +

    npmrc

    +

    The npm config files

    +

    Description

    npm gets its config settings from the command line, environment variables, and npmrc files.

    The npm config command can be used to update and edit the contents of the user and global npmrc files.

    For a list of available configuration options, see config.

    -

    Files

    +

    Files

    The four relevant files are:

    -

    Comments

    +

    Comments

    Lines in .npmrc files are interpreted as comments when they begin with a ; or # character. .npmrc files are parsed by npm/ini, which specifies this comment syntax.

    For example:

    # last modified: 01 Jan 2016
     ; Set a new registry for a scoped package
     @myscope:registry=https://mycustomregistry.example.org
    -

    Per-project config file

    +

    Per-project config file

    When working locally in a project, a .npmrc file in the root of the project (ie, a sibling of node_modules and package.json) will set config values specific to this project.

    @@ -111,24 +117,24 @@

    npm install -g.

    -

    Per-user config file

    +

    Per-user config file

    $HOME/.npmrc (or the userconfig param, if set in the environment or on the command line)

    -

    Global config file

    +

    Global config file

    $PREFIX/etc/npmrc (or the globalconfig param, if set above): This file is an ini-file formatted list of key = value parameters. Environment variables can be replaced as above.

    -

    Built-in config file

    +

    Built-in config file

    path/to/npm/itself/npmrc

    This is an unchangeable "builtin" configuration file that npm keeps consistent across updates. Set fields in here using the ./configure script that comes with npm. This is primarily for distribution maintainers to override default configs in a standard and consistent manner.

    -

    See also

    +

    See also

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/configuring-npm/package-json/index.html b/deps/npm/docs/public/configuring-npm/package-json/index.html index da8a44c1c371d0..0c18b027fdb734 100644 --- a/deps/npm/docs/public/configuring-npm/package-json/index.html +++ b/deps/npm/docs/public/configuring-npm/package-json/index.html @@ -1,4 +1,4 @@ -

    package.json

    -

    Specifics of npm's package.json handling

    -

    Description

    +

    package.json

    +

    Specifics of npm's package.json handling

    +

    Description

    This document is all you need to know about what's required in your package.json file. It must be actual JSON, not just a JavaScript object literal.

    A lot of the behavior described in this document is affected by the config settings described in config.

    -

    name

    +

    name

    If you plan to publish your package, the most important things in your package.json are the name and version fields as they will be required. The name and version together form an identifier that is assumed to be completely unique. @@ -104,7 +110,7 @@

    @myorg/mypackage. See scope for more detail.

    -

    version

    +

    version

    If you plan to publish your package, the most important things in your package.json are the name and version fields as they will be required. The name and version together form an identifier that is assumed to be completely unique. @@ -114,17 +120,17 @@

    node-semver, which is bundled with npm as a dependency. (npm install semver to use it yourself.)

    More on version numbers and ranges at semver.

    -

    description

    +

    description

    Put a description in it. It's a string. This helps people discover your package, as it's listed in npm search.

    -

    keywords

    +

    keywords

    Put keywords in it. It's an array of strings. This helps people discover your package as it's listed in npm search.

    -

    homepage

    +

    homepage

    The url to the project homepage.

    Example:

    "homepage": "https://github.com/owner/project#readme"
    -

    bugs

    +

    bugs

    The url to your project's issue tracker and / or the email address to which issues should be reported. These are helpful for people who encounter issues with your package.

    @@ -135,7 +141,7 @@

    If a url is provided, it will be used by the npm bugs command.

    -

    license

    +

    license

    You should specify a license for your package so that people know how they are permitted to use it, and any restrictions you're placing on it.

    If you're using a common license such as BSD-2-Clause or MIT, add a @@ -179,7 +185,7 @@

    { "license": "UNLICENSED" }

    Consider also setting "private": true to prevent accidental publication.

    -

    people fields: author, contributors

    +

    people fields: author, contributors

    The "author" is one person. "contributors" is an array of people. A "person" is an object with a "name" field and optionally "url" and "email", like this:

    { "name" : "Barney Rubble"
    @@ -190,9 +196,10 @@ 

    "Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)"

    Both email and url are optional either way.

    npm also sets a top-level "maintainers" field with your npm user info.

    -

    funding

    +

    funding

    You can specify an object containing an URL that provides up-to-date -information about ways to help fund development of your package:

    +information about ways to help fund development of your package, or +a string URL, or an array of these:

    "funding": {
       "type" : "individual",
       "url" : "http://example.com/donate"
    @@ -201,12 +208,27 @@ 

    npm fund subcommand to list the funding URLs of all dependencies of their project, direct and indirect. A shortcut to visit each funding url is also available when providing the project name such as: -npm fund <projectname>.

    -

    files

    +npm fund <projectname> (when there are multiple URLs, the first one will be +visited)

    +

    files

    The optional files field is an array of file patterns that describes the entries to be included when your package is installed as a dependency. File patterns follow a similar syntax to .gitignore, but @@ -251,18 +273,18 @@

    *.orig
  • package-lock.json (use shrinkwrap instead)
  • -

    main

    +

    main

    The main field is a module ID that is the primary entry point to your program. That is, if your package is named foo, and a user installs it, and then does require("foo"), then your main module's exports object will be returned.

    This should be a module ID relative to the root of your package folder.

    For most modules, it makes the most sense to have a main script and often not much else.

    -

    browser

    +

    browser

    If your module is meant to be used client-side the browser field should be used instead of the main field. This is helpful to hint users that it might rely on primitives that aren't available in Node.js modules. (e.g. window)

    -

    bin

    +

    bin

    A lot of packages have one or more executable files that they'd like to install into the PATH. npm makes this pretty easy (in fact, it uses this feature to install the "npm" executable.)

    @@ -286,7 +308,7 @@

    Please make sure that your file(s) referenced in bin starts with #!/usr/bin/env node, otherwise the scripts are started without the node executable!

    -

    man

    +

    man

    Specify either a single file or an array of filenames to put in place for the man program to find.

    If only a single file is provided, then it's installed such that it is the @@ -316,34 +338,34 @@

    , "man" : [ "./man/foo.1", "./man/foo.2" ] }

    will create entries for man foo and man 2 foo

    -

    directories

    +

    directories

    The CommonJS Packages spec details a few ways that you can indicate the structure of your package using a directories object. If you look at npm's package.json, you'll see that it has directories for doc, lib, and man.

    In the future, this information may be used in other creative ways.

    -

    directories.lib

    +

    directories.lib

    Tell people where the bulk of your library is. Nothing special is done with the lib folder in any way, but it's useful meta info.

    -

    directories.bin

    +

    directories.bin

    If you specify a bin directory in directories.bin, all the files in that folder will be added.

    Because of the way the bin directive works, specifying both a bin path and setting directories.bin is an error. If you want to specify individual files, use bin, and for all the files in an existing bin directory, use directories.bin.

    -

    directories.man

    +

    directories.man

    A folder that is full of man pages. Sugar to generate a "man" array by walking the folder.

    -

    directories.doc

    +

    directories.doc

    Put markdown files in here. Eventually, these will be displayed nicely, maybe, someday.

    -

    directories.example

    +

    directories.example

    Put example scripts in here. Someday, it might be exposed in some clever way.

    -

    directories.test

    +

    directories.test

    Put your tests in here. It is currently not exposed, but it might be in the future.

    -

    repository

    +

    repository

    Specify the place where your code lives. This is helpful for people who want to contribute. If the git repo is on GitHub, then the npm docs command will be able to find you.

    @@ -378,12 +400,12 @@

    "url" : "https://github.com/facebook/react.git", "directory": "packages/react-dom" }

    -

    scripts

    +

    scripts

    The "scripts" property is a dictionary containing script commands that are run at various times in the lifecycle of your package. The key is the lifecycle event, and the value is the command to run at that point.

    See scripts to find out more about writing package scripts.

    -

    config

    +

    config

    A "config" object can be used to set configuration parameters used in package scripts that persist across upgrades. For instance, if a package had the following:

    @@ -394,7 +416,7 @@

    npm config set foo:port 8001.

    See config and scripts for more on package configs.

    -

    dependencies

    +

    dependencies

    Dependencies are specified in a simple object that maps a package name to a version range. The version range is a string which has one or more space-separated descriptors. Dependencies can also be identified with a @@ -418,7 +440,7 @@

    range1 || range2 Passes if either range1 or range2 are satisfied.
  • git... See 'Git URLs as Dependencies' below
  • user/repo See 'GitHub URLs' below
  • -
  • tag A specific version tagged and published as tag See npm dist-tag
  • +
  • tag A specific version tagged and published as tag See npm dist-tag
  • path/path/path See Local Paths below
  • For example, these are all valid:

    @@ -437,11 +459,11 @@

    , "dyl" : "file:../dyl" } }

    -

    URLs as Dependencies

    +

    URLs as Dependencies

    You may specify a tarball URL in place of a version range.

    This tarball will be downloaded and installed locally to your package at install time.

    -

    Git URLs as Dependencies

    +

    Git URLs as Dependencies

    Git urls are of the form:

    <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:][/]<path>[#<commit-ish> | #semver:<semver>]

    <protocol> is one of git, git+ssh, git+http, git+https, or @@ -457,7 +479,7 @@

    #semver:^5.0 git+https://isaacs@github.com/npm/cli.git git://github.com/npm/cli.git#v1.0.27

    -

    GitHub URLs

    +

    GitHub URLs

    As of version 1.1.65, you can refer to GitHub urls as just "foo": "user/foo-project". Just as with git URLs, a commit-ish suffix can be included. For example:

    @@ -470,7 +492,7 @@

    "module": "user/repo#feature\/branch" } }

    -

    Local Paths

    +

    Local Paths

    As of version 2.0.0 you can provide a path to a local directory that contains a package. Local paths can be saved using npm install -S or npm install --save, using any of these forms:

    @@ -490,7 +512,7 @@

    -

    devDependencies

    +

    devDependencies

    If someone is planning on downloading and using your module in their program, then they probably don't want or need to download and build the external test or documentation framework that you use.

    @@ -518,7 +540,7 @@

    npm install), it'll run this script as well, so that you can test it easily.

    -

    peerDependencies

    +

    peerDependencies

    In some cases, you want to express the compatibility of your package with a host tool or library, while not necessarily doing a require of this host. This is usually referred to as a plugin. Notably, your module may be exposing @@ -549,7 +571,7 @@

    "^1.0" or "1.x" to express this. If you depend on features introduced in 1.5.2, use ">= 1.5.2 < 2".

    -

    bundledDependencies

    +

    bundledDependencies

    This defines an array of package names that will be bundled when publishing the package.

    In cases where you need to preserve npm packages locally or have them @@ -571,12 +593,13 @@

    dependencies.

    If this is spelled "bundleDependencies", then that is also honored.

    -

    optionalDependencies

    +

    optionalDependencies

    If a dependency can be used, but you would like npm to proceed if it cannot be found or fails to install, then you may put it in the optionalDependencies object. This is a map of package name to version or url, just like the dependencies object. The difference is that build failures do not cause -installation to fail.

    +installation to fail. Running npm install --no-optional will prevent these +dependencies from being installed.

    It is still your program's responsibility to handle the lack of the dependency. For example, something like this:

    try {
    @@ -596,7 +619,7 @@ 

    }

    Entries in optionalDependencies will override entries of the same name in dependencies, so it's usually best to only put in one place.

    -

    engines

    +

    engines

    You can specify the version of node that your stuff works on:

    { "engines" : { "node" : ">=0.10.3 <0.12" } }

    And, like with dependencies, if you don't specify the version (or if you @@ -609,11 +632,11 @@

    { "engines" : { "npm" : "~1.0.20" } }

    Unless the user has set the engine-strict config flag, this field is advisory only and will only produce warnings when your package is installed as a dependency.

    -

    engineStrict

    +

    engineStrict

    This feature was removed in npm 3.0.0

    Prior to npm 3.0.0, this feature was used to treat this package as if the user had set engine-strict. It is no longer used.

    -

    os

    +

    os

    You can specify which operating systems your module will run on:

    "os" : [ "darwin", "linux" ]
    @@ -623,19 +646,19 @@

    The host operating system is determined by process.platform

    It is allowed to both blacklist, and whitelist, although there isn't any good reason to do this.

    -

    cpu

    +

    cpu

    If your code only runs on certain cpu architectures, you can specify which ones.

    "cpu" : [ "x64", "ia32" ]

    Like the os option, you can also blacklist architectures:

    "cpu" : [ "!arm", "!mips" ]

    The host architecture is determined by process.arch

    -

    preferGlobal

    +

    preferGlobal

    DEPRECATED

    This option used to trigger an npm warning, but it will no longer warn. It is purely there for informational purposes. It is now recommended that you install any binaries as local devDependencies wherever possible.

    -

    private

    +

    private

    If you set "private": true in your package.json, then npm will refuse to publish it.

    This is a way to prevent accidental publication of private repositories. If @@ -643,7 +666,7 @@

    publishConfig dictionary described below to override the registry config param at publish-time.

    -

    publishConfig

    +

    publishConfig

    This is a set of config values that will be used at publish-time. It's especially handy if you want to set the tag, registry or access, so that you can ensure that a given package is not tagged with "latest", published @@ -652,7 +675,7 @@

    config to see the list of config options that can be overridden.

    -

    DEFAULT VALUES

    +

    DEFAULT VALUES

    npm will default some values based on package contents.

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file + \ No newline at end of file diff --git a/deps/npm/docs/public/configuring-npm/package-lock-json/index.html b/deps/npm/docs/public/configuring-npm/package-lock-json/index.html index 3f09e0ec572c60..6ffd16ebed3502 100644 --- a/deps/npm/docs/public/configuring-npm/package-lock-json/index.html +++ b/deps/npm/docs/public/configuring-npm/package-lock-json/index.html @@ -1,4 +1,4 @@ -

    package-lock.json

    -

    A manifestation of the manifest

    -

    Description

    +

    package-lock.json

    +

    A manifestation of the manifest

    +

    Description

    package-lock.json is automatically generated for any operations where npm modifies either the node_modules tree, or package.json. It describes the exact tree that was generated, such that subsequent installs are able to @@ -90,30 +96,30 @@

    If both package-lock.json and npm-shrinkwrap.json are present in the root of a package, package-lock.json will be completely ignored.

    -

    File Format

    -

    name

    +

    File Format

    +

    name

    The name of the package this is a package-lock for. This must match what's in package.json.

    -

    version

    +

    version

    The version of the package this is a package-lock for. This must match what's in package.json.

    -

    lockfileVersion

    +

    lockfileVersion

    An integer version, starting at 1 with the version number of this document whose semantics were used when generating this package-lock.json.

    -

    packageIntegrity

    +

    packageIntegrity

    This is a subresource integrity value created from the package.json. No preprocessing of the package.json should be done. Subresource integrity strings can be produced by modules like ssri.

    - +

    Indicates that the install was done with the environment variable NODE_PRESERVE_SYMLINKS enabled. The installer should insist that the value of this property match that environment variable.

    -

    dependencies

    +

    dependencies

    A mapping of package name to dependency object. Dependency objects have the following properties:

    -
    version
    +
    version

    This is a specifier that uniquely identifies this package and should be usable in fetching a new copy of it.

    -
    integrity
    +
    integrity

    This is a Standard Subresource Integrity for this resource.

    @@ -136,43 +142,43 @@
    resolved
    +
    resolved
    • For bundled dependencies this is not included, regardless of source.
    • For registry sources this is path of the tarball relative to the registry URL. If the tarball URL isn't on the same server as the registry URL then this is a complete URL.
    -
    bundled
    +
    bundled

    If true, this is the bundled dependency and will be installed by the parent module. When installing, this module will be extracted from the parent module during the extract phase, not installed as a separate dependency.

    -
    dev
    +
    dev

    If true then this dependency is either a development dependency ONLY of the top level module or a transitive dependency of one. This is false for dependencies that are both a development dependency of the top level and a transitive dependency of a non-development dependency of the top level.

    -
    optional
    +
    optional

    If true then this dependency is either an optional dependency ONLY of the top level module or a transitive dependency of one. This is false for dependencies that are both an optional dependency of the top level and a transitive dependency of a non-optional dependency of the top level.

    All optional dependencies should be included even if they're uninstallable on the current platform.

    -
    requires
    +
    requires

    This is a mapping of module name to version. This is a list of everything this module requires, regardless of where it will be installed. The version should match via normal matching rules a dependency either in our dependencies or in a level higher than us.

    -
    dependencies
    +
    dependencies

    The dependencies of this dependency, exactly as at the top level.

    -

    See also

    +

    See also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/configuring-npm/package-locks/index.html b/deps/npm/docs/public/configuring-npm/package-locks/index.html index 3308e55e82051a..535f83b28e08e2 100644 --- a/deps/npm/docs/public/configuring-npm/package-locks/index.html +++ b/deps/npm/docs/public/configuring-npm/package-locks/index.html @@ -1,4 +1,4 @@ -

    package-locks

    -

    An explanation of npm lockfiles

    -

    Description

    -

    Conceptually, the "input" to npm install is a package.json, while its +

    package-locks

    +

    An explanation of npm lockfiles

    +

    Description

    +

    Conceptually, the "input" to npm install is a package.json, while its "output" is a fully-formed node_modules tree: a representation of the dependencies you declared. In an ideal world, npm would work like a pure function: the same package.json should produce the exact same node_modules @@ -163,7 +169,7 @@

      "scripts": {
         "postshrinkwrap": "json -I -e \"this.myMetadata = $MY_APP_METADATA\""
       }

    -

    Using locked packages

    +

    Using locked packages

    Using a locked package is no different than using any package without a package lock: any commands that update node_modules and/or package.json's dependencies will automatically sync the existing lockfile. This includes npm @@ -178,7 +184,7 @@

    node_modules, so you can notice if any transitive dependencies were updated, hoisted, etc.

    -

    Resolving lockfile conflicts

    +

    Resolving lockfile conflicts

    Occasionally, two separate npm install will create package locks that cause merge conflicts in source control systems. As of npm@5.7.0, these conflicts can be resolved by manually fixing any package.json conflicts, and then @@ -194,13 +200,13 @@

    npm@5.7.0 versions of npm 5, albeit a bit more noisily. Note that if package.json itself conflicts, you will have to resolve that by hand and run npm install manually, even with the merge driver.

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/configuring-npm/shrinkwrap-json/index.html b/deps/npm/docs/public/configuring-npm/shrinkwrap-json/index.html index 9c90ad71c562fb..e2ff06feb4c377 100644 --- a/deps/npm/docs/public/configuring-npm/shrinkwrap-json/index.html +++ b/deps/npm/docs/public/configuring-npm/shrinkwrap-json/index.html @@ -1,4 +1,4 @@ -

    npm shrinkwrap.json

    -

    A publishable lockfile

    -

    Description

    -

    npm-shrinkwrap.json is a file created by npm shrinkwrap. It is identical to +

    npm shrinkwrap.json

    +

    A publishable lockfile

    +

    Description

    +

    npm-shrinkwrap.json is a file created by npm shrinkwrap. It is identical to package-lock.json, with one major caveat: Unlike package-lock.json, npm-shrinkwrap.json may be included when publishing a package.

    The recommended use-case for npm-shrinkwrap.json is applications deployed @@ -83,12 +89,12 @@

    package-lock.json will be ignored in favor of this file.

    For full details and description of the npm-shrinkwrap.json file format, refer to the manual page for package-lock.json.

    -

    See also

    +

    See also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/index.html b/deps/npm/docs/public/index.html index cab38416ba2291..a3bd3a8d519095 100644 --- a/deps/npm/docs/public/index.html +++ b/deps/npm/docs/public/index.html @@ -1,4 +1,4 @@ -npm cli | npm cli documentationnpm cli | npm cli documentation
    npm cli _
    The intelligent package manager for the Node Javascript Platform. Install stuff and get coding!
    npm cli _
    The intelligent package manager for the Node Javascript Platform. Install stuff and get coding!
    npm cli _
    The intelligent package manager for the Node Javascript Platform. Install stuff and get coding!

    The current stable version of npm is available on GitHub.

    To upgrade, run: npm install npm@latest -g

    \ No newline at end of file +
    npm cli _
    The intelligent package manager for the Node Javascript Platform. Install stuff and get coding!
    npm cli _
    The intelligent package manager for the Node Javascript Platform. Install stuff and get coding!
    npm cli _
    The intelligent package manager for the Node Javascript Platform. Install stuff and get coding!

    The current stable version of npm is available on GitHub.

    To upgrade, run: npm install npm@latest -g

    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/config/index.html b/deps/npm/docs/public/using-npm/config/index.html index 90b88a641b48ae..6d7c2995a95c3c 100644 --- a/deps/npm/docs/public/using-npm/config/index.html +++ b/deps/npm/docs/public/using-npm/config/index.html @@ -1,4 +1,4 @@ -

    config

    -

    More than you probably want to know about npm configuration

    -

    Description

    +

    config

    +

    More than you probably want to know about npm configuration

    +

    Description

    npm gets its configuration values from the following sources, sorted by priority:

    -

    Command Line Flags

    +

    Command Line Flags

    Putting --foo bar on the command line sets the foo configuration parameter to "bar". A -- argument tells the cli parser to stop reading flags. Using --flag without specifying any value will set @@ -82,7 +88,7 @@

    flag2 to bar. Finally, --flag1 --flag2 -- bar will set both configuration parameters to true, and the bar is taken as a command argument.

    -

    Environment Variables

    +

    Environment Variables

    Any environment variables that start with npm_config_ will be interpreted as a configuration parameter. For example, putting npm_config_foo=bar in your environment will set the foo @@ -95,7 +101,7 @@

    this issue.

    Notice that you need to use underscores instead of dashes, so --allow-same-version would become npm_config_allow_same_version=true.

    -

    npmrc Files

    +

    npmrc Files

    The four relevant files are:

    See npmrc for more details.

    -

    Default Configs

    +

    Default Configs

    Run npm config ls -l to see a set of configuration parameters that are internal to npm, and are defaults if nothing else is specified.

    -

    Shorthands and Other CLI Niceties

    +

    Shorthands and Other CLI Niceties

    The following shorthands are parsed on the command-line:

    -

    Per-Package Config Settings

    +

    Per-Package Config Settings

    When running scripts (see scripts) the package.json "config" keys are overwritten in the environment if there is a config param of <name>[@<version>]:<key>. For example, if the package.json has @@ -163,8 +169,8 @@

    then the user could change the behavior by doing:

    npm config set foo:port 80

    See package.json for more information.

    -

    Config Settings

    -

    access

    +

    Config Settings

    +

    access

    • Default: restricted
    • Type: Access
    • @@ -173,49 +179,49 @@

      --access=public. The only valid values for access are public and restricted. Unscoped packages always have an access level of public.

      -

      allow-same-version

      +

      allow-same-version

      • Default: false
      • Type: Boolean

      Prevents throwing an error when npm version is used to set the new version to the same value as the current version.

      -

      always-auth

      +

      always-auth

      • Default: false
      • Type: Boolean

      Force npm to always require authentication when accessing the registry, even for GET requests.

      -

      also

      +

      also

      • Default: null
      • Type: String

      When "dev" or "development" and running local npm shrinkwrap, npm outdated, or npm update, is an alias for --dev.

      -

      audit

      +

      audit

      • Default: true
      • Type: Boolean

      When "true" submit audit reports alongside npm install runs to the default registry and all registries configured for scopes. See the documentation -for npm audit for details on what is submitted.

      -

      audit-level

      +for npm audit for details on what is submitted.

      +

      audit-level

      • Default: "low"
      • Type: 'low', 'moderate', 'high', 'critical'

      The minimum level of vulnerability for npm audit to exit with a non-zero exit code.

      -

      auth-type

      +

      auth-type

      • Default: 'legacy'
      • Type: 'legacy', 'sso', 'saml', 'oauth'

      What authentication strategy to use with adduser/login.

      -

      before

      +

      before

    See also the strict-ssl config.

    -

    cafile

    +

    cafile

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/developers/index.html b/deps/npm/docs/public/using-npm/developers/index.html index c1a93d97d44cb2..a6cbcdf43bc5e3 100644 --- a/deps/npm/docs/public/using-npm/developers/index.html +++ b/deps/npm/docs/public/using-npm/developers/index.html @@ -1,4 +1,4 @@ -

    developers

    -

    Developer Guide

    -

    Description

    +

    developers

    +

    Developer Guide

    +

    Description

    So, you've decided to use npm to develop (and maybe publish/deploy) your project.

    Fantastic!

    There are a few things that you need to do above the simple steps that your users will do to install your program.

    -

    About These Documents

    +

    About These Documents

    These are man pages. If you install npm, you should be able to then do man npm-thing to get the documentation on a particular topic, or npm help thing to see the same information.

    -

    What is a package

    +

    What is a package

    A package is:

    • a) a folder containing a program described by a package.json file
    • @@ -102,7 +108,7 @@

      #commit-ish

    The commit-ish can be any tag, sha, or branch which can be supplied as an argument to git checkout. The default is master.

    -

    The package.json File

    +

    The package.json File

    You need to have a package.json file in the root of your project to do much of anything with npm. That is basically the whole interface.

    See package.json for details about what goes in that file. At the very @@ -143,7 +149,7 @@

    npm init in the root of your package in order to get you started with a pretty basic package.json file. See npm init for more info.

    -

    Keeping files out of your package

    +

    Keeping files out of your package

    Use a .npmignore file to keep stuff out of your package. If there's no .npmignore file, but there is a .gitignore file, then npm will ignore the stuff matched by the .gitignore file. If you want to @@ -191,18 +197,18 @@

    package.json, which is an array of file or directory names that should be included in your package. Sometimes a whitelist is easier to manage than a blacklist.

    -

    Testing whether your .npmignore or files config works

    +

    Testing whether your .npmignore or files config works

    If you want to double check that your package will include only the files you intend it to when published, you can run the npm pack command locally which will generate a tarball in the working directory, the same way it does for publishing.

    - +

    npm link is designed to install a development package and see the changes in real time without having to keep re-installing it. (You do need to either re-link or npm rebuild -g to update compiled packages, of course.)

    More info at npm link.

    -

    Before Publishing: Make Sure Your Package Installs and Works

    +

    Before Publishing: Make Sure Your Package Installs and Works

    This is important.

    If you can not install it locally, you'll have problems trying to publish it. Or, worse yet, you'll be able to @@ -220,12 +226,12 @@

    -

    Create a User Account

    +

    Create a User Account

    Create a user with the adduser command. It works like this:

    npm adduser

    and then follow the prompts.

    This is documented better in npm adduser.

    -

    Publish your package

    +

    Publish your package

    This part's easy. In the root of your folder, do this:

    npm publish

    You can give publish a url to a tarball, or a filename of a tarball, @@ -234,10 +240,10 @@

    .npmignore file to list out the globs to ignore, or publish from a fresh checkout.

    -

    Brag about it

    +

    Brag about it

    Send emails, write blogs, blab in IRC.

    Tell the world how easy it is to install your program!

    -

    See also

    +

    See also

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/disputes/index.html b/deps/npm/docs/public/using-npm/disputes/index.html index facb5d7c51f957..fa98276007062f 100644 --- a/deps/npm/docs/public/using-npm/disputes/index.html +++ b/deps/npm/docs/public/using-npm/disputes/index.html @@ -1,4 +1,4 @@ -

    disputes

    -

    Handling Module Name Disputes

    +

    disputes

    +

    Handling Module Name Disputes

    This document describes the steps that you should take to resolve module name disputes with other npm publishers. It also describes special steps you should take about names you think infringe your trademarks.

    @@ -77,14 +83,14 @@

    npm Code of Conduct, and nothing in this document should be interpreted to contradict any aspect of the npm Code of Conduct.

    -

    TL;DR

    +

    TL;DR

    1. Get the author email with npm owner ls <pkgname>
    2. Email the author, CC support@npmjs.com
    3. After a few weeks, if there's no resolution, we'll sort it out.

    Don't squat on package names. Publish code or move out of the way.

    -

    Description

    +

    Description

    There sometimes arise cases where a user publishes a module, and then later, some other user wants to use that name. Here are some common ways that happens (each of these is based on actual events.)

    @@ -121,7 +127,7 @@

    support@npmjs.com and we'll sort it out. ("Reasonable" is usually at least 4 weeks.) -

    Reasoning

    +

    Reasoning

    In almost every case so far, the parties involved have been able to reach an amicable resolution without any major intervention. Most people really do want to be reasonable, and are probably not even aware that they're in your way.

    @@ -130,7 +136,7 @@

    Exceptions

    +

    Exceptions

    Some things are not allowed, and will be removed without discussion if they are brought to the attention of the npm registry admins, including but not limited to:

    @@ -157,7 +163,7 @@

    If you see bad behavior like this, please report it to abuse@npmjs.com right away. You are never expected to resolve abusive behavior on your own. We are here to help.

    -

    Trademarkss

    +

    Trademarks

    If you think another npm publisher is infringing your trademark, such as by using a confusingly similar package name, email abuse@npmjs.com with a link to the package or user account on https://www.npmjs.com/. @@ -167,18 +173,18 @@

    README file or metadata.

    -

    Changes

    +

    Changes

    This is a living document and may be updated from time to time. Please refer to the git history for this document to view the changes.

    -

    License

    +

    License

    Copyright (C) npm, Inc., All rights reserved

    This document may be reused under a Creative Commons Attribution-ShareAlike License.

    -

    See also

    +

    See also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/orgs/index.html b/deps/npm/docs/public/using-npm/orgs/index.html index 72fedfb33fcfba..3ebd3a1444a936 100644 --- a/deps/npm/docs/public/using-npm/orgs/index.html +++ b/deps/npm/docs/public/using-npm/orgs/index.html @@ -1,4 +1,4 @@ -

    orgs

    -

    Working with Teams & Orgs

    -

    Description

    +

    orgs

    +

    Working with Teams & Orgs

    +

    Description

    There are three levels of org users:

    1. Super admin, controls billing & adding people to the org.
    2. @@ -82,10 +88,10 @@

      The developer will be able to access packages based on the teams they are on. Access is either read-write or read-only.

      There are two main commands:

        -
      1. npm team see npm team for more details
      2. -
      3. npm access see npm access for more details
      4. +
      5. npm team see npm team for more details
      6. +
      7. npm access see npm access for more details
      -

      Team Admins create teams

      +

      Team Admins create teams

      • Check who you’ve added to your org:
      @@ -99,7 +105,7 @@

      Add members to that team:
      npm team add <org:team> <user>
      -

      Publish a package and adjust package access

      +

      Publish a package and adjust package access

      • In package directory, run
      @@ -113,7 +119,7 @@

      npm access revoke <org:team> [<package>]

    -

    Monitor your package access

    +

    Monitor your package access

    • See what org packages a team member can access:
    @@ -126,10 +132,10 @@

    Check which teams are collaborating on a package:
    npm access ls-collaborators <pkg>
    -

    See also

    +

    See also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/registry/index.html b/deps/npm/docs/public/using-npm/registry/index.html index d6bdb097a6cc67..6cc806bc43651a 100644 --- a/deps/npm/docs/public/using-npm/registry/index.html +++ b/deps/npm/docs/public/using-npm/registry/index.html @@ -1,4 +1,4 @@ -

    registry

    -

    The JavaScript Package Registry

    -

    Description

    +

    registry

    +

    The JavaScript Package Registry

    +

    Description

    To resolve packages by name and version, npm talks to a registry website that implements the CommonJS Package Registry specification for reading package info.

    @@ -89,9 +95,9 @@

    https://github.com/npm/npm-registry-couchapp.

    The registry URL used is determined by the scope of the package (see scope. If no scope is specified, the default registry is used, which is -supplied by the registry config parameter. See npm config, +supplied by the registry config parameter. See npm config, npmrc, and config for more on managing npm's configuration.

    -

    Does npm send any information about me back to the registry?

    +

    Does npm send any information about me back to the registry?

    Yes.

    When making requests of the registry npm adds two headers with information about your environment:

    @@ -111,7 +117,7 @@

    Can I run my own private registry?

    +

    Can I run my own private registry?

    Yes!

    The easiest way is to replicate the couch database, and use the same (or similar) design doc to implement the APIs.

    @@ -121,24 +127,24 @@

    --registry option for that publish command.

    -

    I don't want my package published in the official registry. It's private.

    +

    I don't want my package published in the official registry. It's private.

    Set "private": true in your package.json to prevent it from being published at all, or "publishConfig":{"registry":"http://my-internal-registry.local"} to force it to be published only to your internal registry.

    See package.json for more info on what goes in the package.json file.

    -

    Will you replicate from my registry into the public one?

    +

    Will you replicate from my registry into the public one?

    No. If you want things to be public, then publish them into the public registry using npm. What little security there is would be for nought otherwise.

    -

    Do I have to use couchdb to build a registry that npm can talk to?

    +

    Do I have to use couchdb to build a registry that npm can talk to?

    No, but it's way easier. Basically, yes, you do, or you have to effectively implement the entire CouchDB API anyway.

    -

    Is there a website or something to see package docs and such?

    +

    Is there a website or something to see package docs and such?

    Yes, head over to https://www.npmjs.com/

    -

    See also

    +

    See also

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/removal/index.html b/deps/npm/docs/public/using-npm/removal/index.html index d75978c0b72b08..723334e4dae6e3 100644 --- a/deps/npm/docs/public/using-npm/removal/index.html +++ b/deps/npm/docs/public/using-npm/removal/index.html @@ -1,4 +1,4 @@ -

    removal

    -

    Cleaning the Slate

    -

    Synopsis

    +

    removal

    +

    Cleaning the Slate

    +

    Synopsis

    So sad to see you go.

    sudo npm uninstall npm -g

    Or, if that fails, get the npm source code, and do:

    sudo make uninstall
    -

    More Severe Uninstalling

    +

    More Severe Uninstalling

    Usually, the above instructions are sufficient. That will remove npm, but leave behind anything you've installed.

    If that doesn't work, or if you require more drastic measures, @@ -99,10 +105,10 @@

    find /usr/local/{lib/node,bin} -exec grep -l npm \{\} \; ;

    (This is also in the README file.)

    -

    See also

    +

    See also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/scope/index.html b/deps/npm/docs/public/using-npm/scope/index.html index ab6ddaac128813..fe450fd3739bd7 100644 --- a/deps/npm/docs/public/using-npm/scope/index.html +++ b/deps/npm/docs/public/using-npm/scope/index.html @@ -1,4 +1,4 @@ -

    scope

    -

    Scoped packages

    -

    Description

    +

    scope

    +

    Scoped packages

    +

    Description

    All npm packages have a name. Some package names also have a scope. A scope follows the usual rules for package names (URL-safe characters, no leading dots or underscores). When used in package names, scopes are preceded by an @ symbol @@ -86,7 +92,7 @@

    -

    Installing scoped packages

    +

    Installing scoped packages

    Scoped packages are installed to a sub-folder of the regular installation folder, e.g. if your other packages are installed in node_modules/packagename, scoped modules will be installed in node_modules/@myorg/packagename. The scope @@ -100,25 +106,25 @@

    "@myorg/mypackage": "^1.3.0" }

    Note that if the @ symbol is omitted, in either case, npm will instead attempt to -install from GitHub; see npm install.

    -

    Requiring scoped packages

    +install from GitHub; see npm install.

    +

    Requiring scoped packages

    Because scoped packages are installed into a scope folder, you have to include the name of the scope when requiring them in your code, e.g.

    require('@myorg/mypackage')

    There is nothing special about the way Node treats scope folders. This simply requires the mypackage module in the folder named @myorg.

    -

    Publishing scoped packages

    +

    Publishing scoped packages

    Scoped packages can be published from the CLI as of npm@2 and can be published to any registry that supports them, including the primary npm registry.

    (As of 2015-04-19, and with npm 2.0 or better, the primary npm registry does support scoped packages.)

    If you wish, you may associate a scope with a registry; see below.

    -

    Publishing public scoped packages to the primary npm registry

    +

    Publishing public scoped packages to the primary npm registry

    To publish a public scoped package, you must specify --access public with the initial publication. This will publish the package and set access to public as if you had run npm access public after publishing.

    -

    Publishing private scoped packages to the npm registry

    +

    Publishing private scoped packages to the npm registry

    To publish a private scoped package to the npm registry, you must have an npm Private Modules account.

    @@ -126,7 +132,7 @@

    npm access or on the npmjs.com website.

    -

    Associating a scope with a registry

    +

    Associating a scope with a registry

    Scopes can be associated with a separate registry. This allows you to seamlessly use a mix of packages from the primary npm registry and one or more private registries, such as npm Enterprise.

    @@ -140,11 +146,11 @@

    npm publish for a package name that contains the scope will be published to that registry instead.

    -

    See also

    +

    See also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/scripts/index.html b/deps/npm/docs/public/using-npm/scripts/index.html index f08811cc7d268b..d2376cf2754a68 100644 --- a/deps/npm/docs/public/using-npm/scripts/index.html +++ b/deps/npm/docs/public/using-npm/scripts/index.html @@ -1,4 +1,4 @@ -

    scripts

    -

    How npm handles the "scripts" field

    -

    Description

    -

    npm supports the "scripts" property of the package.json file, for the -following scripts:

    +

    scripts

    +

    How npm handles the "scripts" field

    +

    Description

    +

    The "scripts" property of of your package.json file supports a number of built-in scripts and their preset life cycle events as well as arbitrary scripts. These all can be executed by running npm run-script <stage> or npm run <stage> for short. Pre and post commands with matching names will be run for those as well (e.g. premyscript, myscript, postmyscript). Scripts from dependencies can be run with npm explore <pkg> -- npm run <stage>.

    +

    Pre & Post Scripts

    +

    To create "pre" or "post" scripts for any scripts defined in the "scripts" section of the package.json, simply create another script with a matching name and add "pre" or "post" to the beginning of them.

    +
    {
    +  "scripts": {
    +    "precompress": "{{ executes BEFORE the `compress` script }}",
    +    "compress": "{{ run command to compress files }}",
    +    "postcompress": "{{ executes AFTER `compress` script }}"
    +  }
    +}
    +

    Life Cycle Scripts

    +

    There are some special life cycle scripts that happen only in certain situations. These scripts happen in addtion to the "pre" and "post" script.

    +
      +
    • prepare, prepublish, prepublishOnly, prepack, postpack
    • +
    +

    prepare (since npm@4.0.0)

    +
      +
    • Runs BEFORE the package is packed
    • +
    • Runs BEFORE the package is published
    • +
    • Runs on local npm install without any arguments
    • +
    • Run AFTER prepublish, but BEFORE prepublishOnly
    • +
    • NOTE: If a package being installed through git contains a prepare script, its dependencies and devDependencies will be installed, and the prepare script will be run, before the package is packaged and installed.
    • +
    +

    prepublish (DEPRECATED)

    +
      +
    • Same as prepare
    • +
    +

    prepublishOnly

      -
    • prepublish (as of npm@5, prepublish is deprecated. Use prepare for build steps and prepublishOnly for upload-only.): -Run BEFORE the package is packed and published, as well as on local npm -install without any arguments. (See below)
    • -
    • prepare: -Run both BEFORE the package is packed and published, on local npm -install without any arguments, and when installing git dependencies (See -below). This is run AFTER prepublish, but BEFORE prepublishOnly.
    • -
    • prepublishOnly: -Run BEFORE the package is prepared and packed, ONLY on npm publish. (See -below.)
    • -
    • prepack: -run BEFORE a tarball is packed (on npm pack, npm publish, and when -installing git dependencies)
    • -
    • postpack: -Run AFTER the tarball has been generated and moved to its final destination.
    • -
    • publish, postpublish: -Run AFTER the package is published.
    • -
    • preinstall: -Run BEFORE the package is installed
    • -
    • install, postinstall: -Run AFTER the package is installed.
    • -
    • preuninstall, uninstall: -Run BEFORE the package is uninstalled.
    • -
    • postuninstall: -Run AFTER the package is uninstalled.
    • -
    • preversion: -Run BEFORE bumping the package version.
    • -
    • version: -Run AFTER bumping the package version, but BEFORE commit.
    • -
    • postversion: -Run AFTER bumping the package version, and AFTER commit.
    • -
    • pretest, test, posttest: -Run by the npm test command.
    • -
    • prestop, stop, poststop: -Run by the npm stop command.
    • -
    • prestart, start, poststart: -Run by the npm start command.
    • -
    • prerestart, restart, postrestart: -Run by the npm restart command. Note: npm restart will run the -stop and start scripts if no restart script is provided.
    • -
    • preshrinkwrap, shrinkwrap, postshrinkwrap: -Run by the npm shrinkwrap command.
    • +
    • Runs BEFORE the package is prepared and packed, ONLY on npm publish.
    -

    Additionally, arbitrary scripts can be executed by running npm -run-script <stage>. Pre and post commands with matching -names will be run for those as well (e.g. premyscript, myscript, -postmyscript). Scripts from dependencies can be run with -npm explore <pkg> -- npm run <stage>.

    -

    Prepublish and Prepare

    -

    Deprecation Note

    -

    Since npm@1.1.71, the npm CLI has run the prepublish script for both npm -publish and npm install, because it's a convenient way to prepare a package -for use (some common use cases are described in the section below). It has -also turned out to be, in practice, very -confusing. As of npm@4.0.0, a new -event has been introduced, prepare, that preserves this existing behavior. A -new event, prepublishOnly has been added as a transitional strategy to -allow users to avoid the confusing behavior of existing npm versions and only -run on npm publish (for instance, running the tests one last time to ensure -they're in good shape).

    -

    See https://github.com/npm/npm/issues/10074 for a much lengthier -justification, with further reading, for this change.

    -

    Use Cases

    -

    If you need to perform operations on your package before it is used, in a way -that is not dependent on the operating system or architecture of the -target system, use a prepublish script. This includes -tasks such as:

    +

    prepack

    +
      +
    • Runs BEFORE a tarball is packed (on "npm pack", "npm publish", and when installing a git dependencies).
    • +
    • NOTE: "npm run pack" is NOT the same as "npm pack". "npm run pack" is an arbitrary user defined script name, where as, "npm pack" is a CLI defined command.
    • +
    +

    postpack

    +
      +
    • Runs AFTER the tarball has been generated and moved to its final destination.
    • +
    +

    Prepare and Prepublish

    +

    Deprecation Note: prepublish

    +

    Since npm@1.1.71, the npm CLI has run the prepublish script for both npm publish and npm install, because it's a convenient way to prepare a package for use (some common use cases are described in the section below). It has also turned out to be, in practice, very confusing. As of npm@4.0.0, a new event has been introduced, prepare, that preserves this existing behavior. A new event, prepublishOnly has been added as a transitional strategy to allow users to avoid the confusing behavior of existing npm versions and only run on npm publish (for instance, running the tests one last time to ensure they're in good shape).

    +

    See https://github.com/npm/npm/issues/10074 for a much lengthier justification, with further reading, for this change.

    +

    Use Cases

    +

    If you need to perform operations on your package before it is used, in a way that is not dependent on the operating system or architecture of the target system, use a prepublish script. This includes tasks such as:

    • Compiling CoffeeScript source code into JavaScript.
    • Creating minified versions of JavaScript source code.
    • Fetching remote resources that your package will use.
    -

    The advantage of doing these things at prepublish time is that they can be done once, in a -single place, thus reducing complexity and variability. -Additionally, this means that:

    +

    The advantage of doing these things at prepublish time is that they can be done once, in a single place, thus reducing complexity and variability. Additionally, this means that:

    -

    Default Values

    +

    Life Cycle Operation Order

    +

    npm publish

    +
      +
    • prepublishOnly
    • +
    • prepare
    • +
    • prepublish
    • +
    • publish
    • +
    • postpublish
    • +
    +

    npm pack

    +
      +
    • prepack
    • +
    • postpack
    • +
    +

    npm install

    +
      +
    • preinstall
    • +
    • install
    • +
    • postinstall
    • +
    +

    Also triggers

    +
      +
    • prepublish (when on local)
    • +
    • prepare (when on local)
    • +
    +

    npm start

    +

    npm run start has an npm start shorthand.

    +
      +
    • prestart
    • +
    • start
    • +
    • poststart
    • +
    +

    Default Values

    npm will default some script values based on package contents.

    -

    User

    +

    User

    If npm was invoked with root privileges, then it will change the uid to the user account or uid specified by the user config, which defaults to nobody. Set the unsafe-perm flag to run scripts with root privileges.

    -

    Environment

    +

    Environment

    Package scripts run in an environment where many pieces of information are made available regarding the setup of npm and the current state of the process.

    -

    path

    +

    path

    If you depend on modules that define executable scripts, like test suites, then those executables will be added to the PATH for executing the scripts. So, if your package.json has this:

    @@ -190,7 +202,7 @@

    , "scripts": { "start" : "bar ./test" } }

    then you could run npm start to execute the bar script, which is exported into the node_modules/.bin directory on npm install.

    -

    package.json vars

    +

    package.json vars

    The package.json fields are tacked onto the npm_package_ prefix. So, for instance, if you had {"name":"foo", "version":"1.2.5"} in your package.json file, then your package scripts would have the @@ -198,11 +210,11 @@

    npm_package_version set to "1.2.5". You can access these variables in your code with process.env.npm_package_name and process.env.npm_package_version, and so on for other fields.

    -

    configuration

    +

    configuration

    Configuration parameters are put in the environment with the npm_config_ prefix. For instance, you can view the effective root config by checking the npm_config_root environment variable.

    -

    Special: package.json "config" object

    +

    Special: package.json "config" object

    The package.json "config" keys are overwritten in the environment if there is a config param of <name>[@<version>]:<key>. For example, if the package.json has this:

    @@ -213,7 +225,7 @@

    http.createServer(...).listen(process.env.npm_package_config_port)

    then the user could change the behavior by doing:

      npm config set foo:port 80
    -

    current lifecycle event

    +

    current lifecycle event

    Lastly, the npm_lifecycle_event environment variable is set to whichever stage of the cycle is being executed. So, you could have a single script used for different parts of the process which switches @@ -222,11 +234,11 @@

    {"scripts":{"install":"foo.js"}} in your package.json, then you'd see this in the script:

    process.env.npm_package_scripts_install === "foo.js"
    -

    Examples

    +

    Examples

    For example, if your package.json contains this:

    { "scripts" :
       { "install" : "scripts/install.js"
    -  , "postinstall" : "scripts/install.js"
    +  , "postinstall" : "scripts/postinstall.js"
       , "uninstall" : "scripts/uninstall.js"
       }
     }
    @@ -244,14 +256,14 @@

    , "test" : "make test" } }

    -

    Exiting

    +

    Exiting

    Scripts are run by passing the line as a script argument to sh.

    If the script exits with a code other than 0, then this will abort the process.

    Note that these script files don't have to be nodejs or even javascript programs. They just have to be some kind of executable file.

    -

    Hook Scripts

    +

    Hook Scripts

    If you want to run a specific script at a specific lifecycle event for ALL packages, then you can use a hook script.

    Place an executable file at node_modules/.hooks/{eventname}, and @@ -260,7 +272,7 @@

    Best Practices

    +

    Best Practices

    -

    See Also

    +

    See Also

    👀 Found a typo? Let us know!

    The current stable version of npm is here. To upgrade, run: npm install npm@latest -g

    To report bugs or submit feature requests for the docs, please post here. Submit npm issues here.

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/docs/public/using-npm/semver/index.html b/deps/npm/docs/public/using-npm/semver/index.html index d1bd745a08ea89..79ff8e1c437f92 100644 --- a/deps/npm/docs/public/using-npm/semver/index.html +++ b/deps/npm/docs/public/using-npm/semver/index.html @@ -1,4 +1,4 @@ -

    semver(7) -- The semantic versioner for npm

    -

    Install

    +

    semver(7) -- The semantic versioner for npm

    +

    Install

    npm install --save semver
    -

    Usage

    +

    Usage

    As a node module:

    const semver = require('semver')
     
    @@ -124,11 +130,11 @@ 

    Versions

    +

    Versions

    A "version" is described by the v2.0.0 specification found at https://semver.org/.

    A leading "=" or "v" character is stripped off and ignored.

    -

    Ranges

    +

    Ranges

    A version range is a set of comparators which specify versions that satisfy the range.

    A comparator is composed of an operator and a version. The set @@ -155,7 +161,7 @@

    1.1.0.

    The range 1.2.7 || >=1.2.9 <2.0.0 would match the versions 1.2.7, 1.2.9, and 1.4.6, but not the versions 1.2.8 or 2.0.0.

    -

    Prerelease Tags

    +

    Prerelease Tags

    If a version has a prerelease tag (for example, 1.2.3-alpha.3) then it will only be allowed to satisfy comparator sets if at least one comparator with the same [major, minor, patch] tuple also has a @@ -184,7 +190,7 @@

    functions that do range matching.

    -

    Prerelease Identifiers

    +

    Prerelease Identifiers

    The method .inc takes an additional identifier string argument that will append the value of the string as a prerelease identifier:

    semver.inc('1.2.3', 'prerelease', 'beta')
    @@ -195,12 +201,12 @@ 

    $ semver 1.2.4-beta.0 -i prerelease
     1.2.4-beta.1

    -

    Advanced Range Syntax

    +

    Advanced Range Syntax

    Advanced range syntax desugars to primitive comparators in deterministic ways.

    Advanced ranges may be combined in the same way as primitive comparators using white space or ||.

    -

    Hyphen Ranges X.Y.Z - A.B.C

    +

    Hyphen Ranges X.Y.Z - A.B.C

    Specifies an inclusive set.

    -

    X-Ranges 1.2.x 1.X 1.2.* *

    +

    X-Ranges 1.2.x 1.X 1.2.* *

    Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple.

    -

    Tilde Ranges ~1.2.3 ~1.2 ~1

    +

    Tilde Ranges ~1.2.3 ~1.2 ~1

    Allows patch-level changes if a minor version is specified on the comparator. Allows minor-level changes if not.

    -

    Caret Ranges ^1.2.3 ^0.2.5 ^0.0.4

    +

    Caret Ranges ^1.2.3 ^0.2.5 ^0.0.4

    Allows changes that do not modify the left-most non-zero digit in the [major, minor, patch] tuple. In other words, this allows patch and minor updates for versions 1.0.0 and above, patch updates for @@ -289,7 +295,7 @@

    ^1.x := >=1.0.0 <2.0.0
  • ^0.x := >=0.0.0 <1.0.0
  • -

    Range Grammar

    +

    Range Grammar

    Putting all this together, here is a Backus-Naur grammar for ranges, for the benefit of parser authors:

    range-set  ::= range ( logical-or range ) *
    @@ -308,7 +314,7 @@ 

    ::= parts parts ::= part ( '.' part ) * part ::= nr | [-0-9A-Za-z]+

    -

    Functions

    +

    Functions

    All methods and classes take a final options object argument. All options in this object are false by default. The options supported are:

    @@ -351,7 +357,7 @@

    parse(v): Attempt to parse a string as a semantic version, returning either a SemVer object or null. -

    Comparison

    +

    Comparison

    -

    Comparators

    +

    Comparators

    • intersects(comparator): Return true if the comparators intersect
    -

    Ranges

    +

    Ranges

    • validRange(range): Return the valid range or null if it's not valid
    • satisfies(version, range): Return true if the version satisfies the @@ -407,7 +413,7 @@

      satisfies(version, range) function.

      -

      Coercion

      +

      Coercion

      • coerce(version): Coerces a string to semver if possible
      @@ -429,4 +435,4 @@

    \ No newline at end of file +
    \ No newline at end of file diff --git a/deps/npm/lib/access.js b/deps/npm/lib/access.js index 6657f4b0717a1f..e850c132eb24b2 100644 --- a/deps/npm/lib/access.js +++ b/deps/npm/lib/access.js @@ -112,7 +112,7 @@ access.grant = ([perms, scopeteam, pkg], opts) => { } return modifyPackage(pkg, opts, (pkgName, opts) => { return libaccess.grant(pkgName, scopeteam, perms, opts) - }) + }, false) }) } diff --git a/deps/npm/lib/ci.js b/deps/npm/lib/ci.js index a0df3b86ff42bc..d5b5c15442512d 100644 --- a/deps/npm/lib/ci.js +++ b/deps/npm/lib/ci.js @@ -33,7 +33,7 @@ function ci (args, cb) { } for (const key in npm.config.list[0]) { - if (key !== 'log') { + if (!['log', 'cache'].includes(key)) { opts[key] = npm.config.list[0][key] } } diff --git a/deps/npm/lib/fund.js b/deps/npm/lib/fund.js index 00954c844d7981..e605ea8c3fd039 100644 --- a/deps/npm/lib/fund.js +++ b/deps/npm/lib/fund.js @@ -14,13 +14,14 @@ const readShrinkwrap = require('./install/read-shrinkwrap.js') const mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js') const output = require('./utils/output.js') const openUrl = require('./utils/open-url.js') -const { getFundingInfo, retrieveFunding, validFundingUrl } = require('./utils/funding.js') +const { getFundingInfo, retrieveFunding, validFundingField, flatCacheSymbol } = require('./utils/funding.js') const FundConfig = figgyPudding({ browser: {}, // used by ./utils/open-url global: {}, json: {}, - unicode: {} + unicode: {}, + which: {} }) module.exports = fundCmd @@ -29,7 +30,7 @@ const usage = require('./utils/usage') fundCmd.usage = usage( 'fund', 'npm fund [--json]', - 'npm fund [--browser] [[<@scope>/]' + 'npm fund [--browser] [[<@scope>/] [--which=]' ) fundCmd.completion = function (opts, cb) { @@ -52,96 +53,52 @@ function printJSON (fundingInfo) { // level possible, in that process they also carry their dependencies along // with them, moving those up in the visual tree function printHuman (fundingInfo, opts) { - // mapping logic that keeps track of seen items in order to be able - // to push all other items from the same type/url in the same place - const seen = new Map() + const flatCache = fundingInfo[flatCacheSymbol] - function seenKey ({ type, url } = {}) { - return url ? String(type) + String(url) : null - } - - function setStackedItem (funding, result) { - const key = seenKey(funding) - if (key && !seen.has(key)) seen.set(key, result) - } + const { name, version } = fundingInfo + const printableVersion = version ? `@${version}` : '' - function retrieveStackedItem (funding) { - const key = seenKey(funding) - if (key && seen.has(key)) return seen.get(key) - } + const items = Object.keys(flatCache).map((url) => { + const deps = flatCache[url] - // --- - - const getFundingItems = (fundingItems) => - Object.keys(fundingItems || {}).map((fundingItemName) => { - // first-level loop, prepare the pretty-printed formatted data - const fundingItem = fundingItems[fundingItemName] - const { version, funding } = fundingItem - const { type, url } = funding || {} + const packages = deps.map((dep) => { + const { name, version } = dep const printableVersion = version ? `@${version}` : '' - const printableType = type && { label: `type: ${funding.type}` } - const printableUrl = url && { label: `url: ${funding.url}` } - const result = { - fundingItem, - label: fundingItemName + printableVersion, - nodes: [] - } - - if (printableType) { - result.nodes.push(printableType) - } - - if (printableUrl) { - result.nodes.push(printableUrl) - } - - setStackedItem(funding, result) - - return result - }).reduce((res, result) => { - // recurse and exclude nodes that are going to be stacked together - const { fundingItem } = result - const { dependencies, funding } = fundingItem - const items = getFundingItems(dependencies) - const stackedResult = retrieveStackedItem(funding) - items.forEach(i => result.nodes.push(i)) - - if (stackedResult && stackedResult !== result) { - stackedResult.label += `, ${result.label}` - items.forEach(i => stackedResult.nodes.push(i)) - return res - } - - res.push(result) - - return res - }, []) - - const [ result ] = getFundingItems({ - [fundingInfo.name]: { - dependencies: fundingInfo.dependencies, - funding: fundingInfo.funding, - version: fundingInfo.version + return `${name}${printableVersion}` + }) + + return { + label: url, + nodes: [packages.join(', ')] } }) - return archy(result, '', { unicode: opts.unicode }) + return archy({ label: `${name}${printableVersion}`, nodes: items }, '', { unicode: opts.unicode }) } -function openFundingUrl (packageName, cb) { +function openFundingUrl (packageName, fundingSourceNumber, cb) { function getUrlAndOpen (packageMetadata) { const { funding } = packageMetadata - const { type, url } = retrieveFunding(funding) || {} - const noFundingError = - new Error(`No funding method available for: ${packageName}`) - noFundingError.code = 'ENOFUND' - const typePrefix = type ? `${type} funding` : 'Funding' - const msg = `${typePrefix} available at the following URL` - - if (validFundingUrl(funding)) { + const validSources = [].concat(retrieveFunding(funding)).filter(validFundingField) + + if (validSources.length === 1 || (fundingSourceNumber > 0 && fundingSourceNumber <= validSources.length)) { + const { type, url } = validSources[fundingSourceNumber ? fundingSourceNumber - 1 : 0] + const typePrefix = type ? `${type} funding` : 'Funding' + const msg = `${typePrefix} available at the following URL` openUrl(url, msg, cb) + } else if (!(fundingSourceNumber >= 1)) { + validSources.forEach(({ type, url }, i) => { + const typePrefix = type ? `${type} funding` : 'Funding' + const msg = `${typePrefix} available at the following URL` + console.log(`${i + 1}: ${msg}: ${url}`) + }) + console.log('Run `npm fund [<@scope>/] --which=1`, for example, to open the first funding URL listed in that package') + cb() } else { + const noFundingError = new Error(`No valid funding method available for: ${packageName}`) + noFundingError.code = 'ENOFUND' + throw noFundingError } } @@ -161,15 +118,24 @@ function fundCmd (args, cb) { const opts = FundConfig(npmConfig()) const dir = path.resolve(npm.dir, '..') const packageName = args[0] + const numberArg = opts.which + + const fundingSourceNumber = numberArg && parseInt(numberArg, 10) + + if (numberArg !== undefined && (String(fundingSourceNumber) !== numberArg || fundingSourceNumber < 1)) { + const err = new Error('`npm fund [<@scope>/] [--which=fundingSourceNumber]` must be given a positive integer') + err.code = 'EFUNDNUMBER' + throw err + } if (opts.global) { - const err = new Error('`npm fund` does not support globals') + const err = new Error('`npm fund` does not support global packages') err.code = 'EFUNDGLOBAL' throw err } if (packageName) { - openFundingUrl(packageName, cb) + openFundingUrl(packageName, fundingSourceNumber, cb) return } diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js index 35850078f834d1..74ef6ad2c6e748 100644 --- a/deps/npm/lib/npm.js +++ b/deps/npm/lib/npm.js @@ -283,22 +283,28 @@ ua = ua.replace(/\{arch\}/gi, process.arch) // continuous integration platforms - const ci = process.env.GERRIT_PROJECT ? 'ci/gerrit' - : process.env.GITLAB_CI ? 'ci/gitlab' - : process.env.CIRCLECI ? 'ci/circle-ci' - : process.env.SEMAPHORE ? 'ci/semaphore' - : process.env.DRONE ? 'ci/drone' - : process.env.GITHUB_ACTION ? 'ci/github-actions' - : process.env.TDDIUM ? 'ci/tddium' - : process.env.JENKINS_URL ? 'ci/jenkins' - : process.env['bamboo.buildKey'] ? 'ci/bamboo' - : process.env.GO_PIPELINE_NAME ? 'ci/gocd' - // codeship and a few others - : process.env.CI_NAME ? `ci/${process.env.CI_NAME}` - // test travis last, since many of these mimic it - : process.env.TRAVIS ? 'ci/travis-ci' - : process.env.CI === 'true' || process.env.CI === '1' ? 'ci/custom' - : '' + const ciName = process.env.GERRIT_PROJECT ? 'gerrit' + : process.env.GITLAB_CI ? 'gitlab' + : process.env.APPVEYOR ? 'appveyor' + : process.env.CIRCLECI ? 'circle-ci' + : process.env.SEMAPHORE ? 'semaphore' + : process.env.DRONE ? 'drone' + : process.env.GITHUB_ACTION ? 'github-actions' + : process.env.TDDIUM ? 'tddium' + : process.env.JENKINS_URL ? 'jenkins' + : process.env['bamboo.buildKey'] ? 'bamboo' + : process.env.GO_PIPELINE_NAME ? 'gocd' + // codeship and a few others + : process.env.CI_NAME ? process.env.CI_NAME + // test travis after the others, since several CI systems mimic it + : process.env.TRAVIS ? 'travis-ci' + // aws CodeBuild/CodePipeline + : process.env.CODEBUILD_SRC_DIR ? 'aws-codebuild' + : process.env.CI === 'true' || process.env.CI === '1' ? 'custom' + // Google Cloud Build - it sets almost nothing + : process.env.BUILDER_OUTPUT ? 'builder' + : false + const ci = ciName ? `ci/${ciName}` : '' ua = ua.replace(/\{ci\}/gi, ci) config.set('user-agent', ua.trim()) diff --git a/deps/npm/lib/team.js b/deps/npm/lib/team.js index 2b56e3b14f95bb..e24f733475a23a 100644 --- a/deps/npm/lib/team.js +++ b/deps/npm/lib/team.js @@ -14,10 +14,10 @@ team.subcommands = ['create', 'destroy', 'add', 'rm', 'ls', 'edit'] team.usage = usage( 'team', - 'npm team create \n' + - 'npm team destroy \n' + - 'npm team add \n' + - 'npm team rm \n' + + 'npm team create [--otp ]\n' + + 'npm team destroy [--otp ]\n' + + 'npm team add [--otp ]\n' + + 'npm team rm [--otp ]\n' + 'npm team ls |\n' + 'npm team edit ' ) diff --git a/deps/npm/lib/unpublish.js b/deps/npm/lib/unpublish.js index 203c8b592f1099..59d7d1b5887d21 100644 --- a/deps/npm/lib/unpublish.js +++ b/deps/npm/lib/unpublish.js @@ -20,7 +20,11 @@ const readJson = BB.promisify(require('read-package-json')) const usage = require('./utils/usage.js') const whoami = BB.promisify(require('./whoami.js')) -unpublish.usage = usage('npm unpublish [<@scope>/][@]') +unpublish.usage = usage( + 'unpublish', + '\nnpm unpublish [<@scope>/]@' + + '\nnpm unpublish [<@scope>/] --force' +) function UsageError () { throw Object.assign(new Error(`Usage: ${unpublish.usage}`), { @@ -75,7 +79,7 @@ function unpublish (args, cb) { 'Refusing to delete entire project.\n' + 'Run with --force to do this.\n' + unpublish.usage - ), {code: 'EUSAGE'}) + ), { code: 'EUSAGE' }) } if (!spec || path.resolve(spec.name) === npm.localPrefix) { // if there's a package.json in the current folder, then diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js index 39e0035c272881..3e6f176ef8206b 100644 --- a/deps/npm/lib/utils/error-handler.js +++ b/deps/npm/lib/utils/error-handler.js @@ -36,7 +36,7 @@ process.on('timing', function (name, value) { process.on('exit', function (code) { process.emit('timeEnd', 'npm') log.disableProgress() - if (npm.config.loaded && npm.config.get('timing')) { + if (npm.config && npm.config.loaded && npm.config.get('timing')) { try { timings.logfile = getLogFile() cacheFile.append('_timing.json', JSON.stringify(timings) + '\n') @@ -64,7 +64,7 @@ process.on('exit', function (code) { log.verbose('code', code) } } - if (npm.config.loaded && npm.config.get('timing') && !wroteLogFile) writeLogFile() + if (npm.config && npm.config.loaded && npm.config.get('timing') && !wroteLogFile) writeLogFile() if (wroteLogFile) { // just a line break if (log.levels[log.level] <= log.levels.error) console.error('') @@ -79,7 +79,7 @@ process.on('exit', function (code) { wroteLogFile = false } - var doExit = npm.config.loaded && npm.config.get('_exit') + var doExit = npm.config && npm.config.loaded && npm.config.get('_exit') if (doExit) { // actually exit. if (exitCode === 0 && !itWorked) { @@ -94,7 +94,7 @@ process.on('exit', function (code) { function exit (code, noLog) { exitCode = exitCode || process.exitCode || code - var doExit = npm.config.loaded ? npm.config.get('_exit') : true + var doExit = npm.config && npm.config.loaded ? npm.config.get('_exit') : true log.verbose('exit', [code, doExit]) if (log.level === 'silent') noLog = true diff --git a/deps/npm/lib/utils/error-message.js b/deps/npm/lib/utils/error-message.js index 12f304d1e894ac..3faa78f3089146 100644 --- a/deps/npm/lib/utils/error-message.js +++ b/deps/npm/lib/utils/error-message.js @@ -35,9 +35,9 @@ function errorMessage (er) { case 'EACCES': case 'EPERM': const isCachePath = typeof er.path === 'string' && - er.path.startsWith(npm.config.get('cache')) + npm.config && er.path.startsWith(npm.config.get('cache')) const isCacheDest = typeof er.dest === 'string' && - er.dest.startsWith(npm.config.get('cache')) + npm.config && er.dest.startsWith(npm.config.get('cache')) const isWindows = process.platform === 'win32' diff --git a/deps/npm/lib/utils/funding.js b/deps/npm/lib/utils/funding.js index c3d06b10899638..5375639109ee2a 100644 --- a/deps/npm/lib/utils/funding.js +++ b/deps/npm/lib/utils/funding.js @@ -4,22 +4,31 @@ const URL = require('url').URL exports.getFundingInfo = getFundingInfo exports.retrieveFunding = retrieveFunding -exports.validFundingUrl = validFundingUrl +exports.validFundingField = validFundingField -// supports both object funding and string shorthand +const flatCacheSymbol = Symbol('npm flat cache') +exports.flatCacheSymbol = flatCacheSymbol + +// supports object funding and string shorthand, or an array of these +// if original was an array, returns an array; else returns the lone item function retrieveFunding (funding) { - return typeof funding === 'string' - ? { - url: funding - } - : funding + const sources = [].concat(funding || []).map(item => ( + typeof item === 'string' + ? { url: item } + : item + )) + return Array.isArray(funding) ? sources : sources[0] } // Is the value of a `funding` property of a `package.json` // a valid type+url for `npm fund` to display? -function validFundingUrl (funding) { +function validFundingField (funding) { if (!funding) return false + if (Array.isArray(funding)) { + return funding.every(f => !Array.isArray(f) && validFundingField(f)) + } + try { var parsed = new URL(funding.url || funding) } catch (error) { @@ -34,11 +43,13 @@ function validFundingUrl (funding) { return Boolean(parsed.host) } +const empty = () => Object.create(null) + function getFundingInfo (idealTree, opts) { - let length = 0 + let packageWithFundingCount = 0 + const flat = empty() const seen = new Set() const { countOnly } = opts || {} - const empty = () => Object.create(null) const _trailingDependencies = Symbol('trailingDependencies') function tracked (name, version) { @@ -70,52 +81,70 @@ function getFundingInfo (idealTree, opts) { ) } + function addToFlatCache (funding, dep) { + [].concat(funding || []).forEach((f) => { + const key = f.url + if (!Array.isArray(flat[key])) { + flat[key] = [] + } + flat[key].push(dep) + }) + } + + function attachFundingInfo (target, funding, dep) { + if (funding && validFundingField(funding)) { + target.funding = retrieveFunding(funding) + if (!countOnly) { + addToFlatCache(target.funding, dep) + } + + packageWithFundingCount++ + } + } + function getFundingDependencies (tree) { const deps = tree && tree.dependencies if (!deps) return empty() - // broken into two steps to make sure items appearance - // within top levels takes precedence over nested ones - return (Object.keys(deps)).map((key) => { + const directDepsWithFunding = Object.keys(deps).map((key) => { const dep = deps[key] const { name, funding, version } = dep - const fundingItem = {} - // avoids duplicated items within the funding tree if (tracked(name, version)) return empty() + const fundingItem = {} + if (version) { fundingItem.version = version } - if (funding && validFundingUrl(funding)) { - fundingItem.funding = retrieveFunding(funding) - length++ - } + attachFundingInfo(fundingItem, funding, dep) return { dep, fundingItem } - }).reduce((res, { dep, fundingItem }, i) => { - if (!fundingItem) return res + }) + + return directDepsWithFunding.reduce((res, { dep: directDep, fundingItem }, i) => { + if (!fundingItem || fundingItem.length === 0) return res // recurse - const dependencies = dep.dependencies && - Object.keys(dep.dependencies).length > 0 && - getFundingDependencies(dep) + const transitiveDependencies = directDep.dependencies && + Object.keys(directDep.dependencies).length > 0 && + getFundingDependencies(directDep) // if we're only counting items there's no need // to add all the data to the resulting object if (countOnly) return null - if (hasDependencies(dependencies)) { - fundingItem.dependencies = retrieveDependencies(dependencies) + if (hasDependencies(transitiveDependencies)) { + fundingItem.dependencies = retrieveDependencies(transitiveDependencies) } - if (fundingItem.funding) { - res[dep.name] = fundingItem + if (fundingItem.funding && fundingItem.funding.length !== 0) { + res[directDep.name] = fundingItem } else if (fundingItem.dependencies) { res[_trailingDependencies] = Object.assign( @@ -126,12 +155,12 @@ function getFundingInfo (idealTree, opts) { } return res - }, empty()) + }, countOnly ? null : empty()) } const idealTreeDependencies = getFundingDependencies(idealTree) const result = { - length + length: packageWithFundingCount } if (!countOnly) { @@ -145,8 +174,9 @@ function getFundingInfo (idealTree, opts) { result.funding = retrieveFunding(idealTree.funding) } - result.dependencies = - retrieveDependencies(idealTreeDependencies) + result.dependencies = retrieveDependencies(idealTreeDependencies) + + result[flatCacheSymbol] = flat } return result diff --git a/deps/npm/lib/utils/unsupported.js b/deps/npm/lib/utils/unsupported.js index 71a304030e2424..c78cdcbc294940 100644 --- a/deps/npm/lib/utils/unsupported.js +++ b/deps/npm/lib/utils/unsupported.js @@ -1,22 +1,14 @@ 'use strict' var semver = require('semver') -var supportedNode = [ - {ver: '6', min: '6.0.0'}, - {ver: '8', min: '8.0.0'}, - {ver: '9', min: '9.0.0'}, - {ver: '10', min: '10.0.0'}, - {ver: '11', min: '11.0.0'}, - {ver: '12', min: '12.0.0'}, - {ver: '13', min: '13.0.0'} -] -var knownBroken = '<6.2.0 || 9.0 - 9.2' +var supported = require('../../package.json').engines.node +var knownBroken = '<6.2.0 || 9 <9.3.0' var checkVersion = exports.checkVersion = function (version) { var versionNoPrerelease = version.replace(/-.*$/, '') return { version: versionNoPrerelease, broken: semver.satisfies(versionNoPrerelease, knownBroken), - unsupported: !semver.satisfies(versionNoPrerelease, supportedNode.map(function (n) { return '^' + n.min }).join('||')) + unsupported: !semver.satisfies(versionNoPrerelease, supported) } } @@ -24,18 +16,8 @@ exports.checkForBrokenNode = function () { var nodejs = checkVersion(process.version) if (nodejs.broken) { console.error('ERROR: npm is known not to run on Node.js ' + process.version) - supportedNode.forEach(function (rel) { - if (semver.satisfies(nodejs.version, rel.ver)) { - console.error('Node.js ' + rel.ver + " is supported but the specific version you're running has") - console.error('a bug known to break npm. Please update to at least ' + rel.min + ' to use this') - console.error('version of npm. You can find the latest release of Node.js at https://nodejs.org/') - process.exit(1) - } - }) - var supportedMajors = supportedNode.map(function (n) { return n.ver }).join(', ') - console.error("You'll need to upgrade to a newer version in order to use this") - console.error('version of npm. Supported versions are ' + supportedMajors + '. You can find the') - console.error('latest version at https://nodejs.org/') + console.error("You'll need to upgrade to a newer Node.js version in order to use this") + console.error('version of npm. You can find the latest version at https://nodejs.org/') process.exit(1) } } @@ -44,11 +26,9 @@ exports.checkForUnsupportedNode = function () { var nodejs = checkVersion(process.version) if (nodejs.unsupported) { var log = require('npmlog') - var supportedMajors = supportedNode.map(function (n) { return n.ver }).join(', ') log.warn('npm', 'npm does not support Node.js ' + process.version) log.warn('npm', 'You should probably upgrade to a newer version of node as we') log.warn('npm', "can't make any promises that npm will work with this version.") - log.warn('npm', 'Supported releases of Node.js are the latest release of ' + supportedMajors + '.') log.warn('npm', 'You can find the latest version at https://nodejs.org/') } } diff --git a/deps/npm/lib/version.js b/deps/npm/lib/version.js index a8c2a648c74736..6619a8ba9d0d76 100644 --- a/deps/npm/lib/version.js +++ b/deps/npm/lib/version.js @@ -286,22 +286,32 @@ function checkGit (localData, cb) { module.exports.buildCommitArgs = buildCommitArgs function buildCommitArgs (args) { - args = args || [ 'commit' ] - if (!npm.config.get('commit-hooks')) args.push('-n') - return args + const add = [] + args = args || [] + if (args[0] === 'commit') args.shift() + if (!npm.config.get('commit-hooks')) add.push('-n') + if (npm.config.get('allow-same-version')) add.push('--allow-empty') + return ['commit', ...add, ...args] +} + +module.exports.buildTagFlags = buildTagFlags +function buildTagFlags () { + return '-'.concat( + npm.config.get('sign-git-tag') ? 's' : '', + npm.config.get('allow-same-version') ? 'f' : '', + 'm' + ) } function _commit (version, localData, cb) { const options = { env: process.env } const message = npm.config.get('message').replace(/%s/g, version) - const signTag = npm.config.get('sign-git-tag') const signCommit = npm.config.get('sign-git-commit') const commitArgs = buildCommitArgs([ 'commit', ...(signCommit ? ['-S', '-m'] : ['-m']), message ]) - const flagForTag = signTag ? '-sm' : '-m' stagePackageFiles(localData, options).then(() => { return git.exec(commitArgs, options) @@ -309,7 +319,7 @@ function _commit (version, localData, cb) { if (!localData.existingTag) { return git.exec([ 'tag', npm.config.get('tag-version-prefix') + version, - flagForTag, message + buildTagFlags(), message ], options) } }).nodeify(cb) diff --git a/deps/npm/man/man1/npm-README.1 b/deps/npm/man/man1/npm-README.1 index d3028ee37bfd02..2ba6afd57c0e2f 100644 --- a/deps/npm/man/man1/npm-README.1 +++ b/deps/npm/man/man1/npm-README.1 @@ -1,4 +1,4 @@ -.TH "NPM" "1" "December 2019" "" "" +.TH "NPM" "1" "March 2020" "" "" .SH "NAME" \fBnpm\fR \- a JavaScript package manager .P @@ -158,10 +158,6 @@ https://npm\.community/c/bugs .P Be sure to include \fIall\fR of the output from the npm command that didn't work as expected\. The \fBnpm\-debug\.log\fP file is also helpful to provide\. -.P -You can also find npm people in \fB#npm\fP on https://package\.community/ or -on Twitter \fIhttps://twitter\.com/npm_support\fR\|\. Whoever responds will no -doubt tell you to put the output in a gist or email\. .SH SEE ALSO .RS 0 .IP \(bu 2 diff --git a/deps/npm/man/man1/npm-access.1 b/deps/npm/man/man1/npm-access.1 index a08b24798002e3..448c9859a44a62 100644 --- a/deps/npm/man/man1/npm-access.1 +++ b/deps/npm/man/man1/npm-access.1 @@ -1,4 +1,4 @@ -.TH "NPM\-ACCESS" "1" "December 2019" "" "" +.TH "NPM\-ACCESS" "1" "March 2020" "" "" .SH "NAME" \fBnpm-access\fR \- Set access level on published packages .SS Synopsis diff --git a/deps/npm/man/man1/npm-adduser.1 b/deps/npm/man/man1/npm-adduser.1 index f2f9557dcc7d13..3d005b13029d1a 100644 --- a/deps/npm/man/man1/npm-adduser.1 +++ b/deps/npm/man/man1/npm-adduser.1 @@ -1,4 +1,9 @@ -.TH "NPM\-ADDUSER" "1" "December 2019" "" "" +.HR +.P +section: cli\-commands +title: npm\-adduser +.SH description: Set access level on published packages +.TH "NPM\-ADDUSER" "1" "March 2020" "" "" .SH "NAME" \fBnpm-adduser\fR \- Add a registry user account .SS Synopsis diff --git a/deps/npm/man/man1/npm-audit.1 b/deps/npm/man/man1/npm-audit.1 index 1536217ad0a109..d0a77fdf0d7815 100644 --- a/deps/npm/man/man1/npm-audit.1 +++ b/deps/npm/man/man1/npm-audit.1 @@ -1,4 +1,4 @@ -.TH "NPM\-AUDIT" "1" "December 2019" "" "" +.TH "NPM\-AUDIT" "1" "March 2020" "" "" .SH "NAME" \fBnpm-audit\fR \- Run a security audit .SS Synopsis diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1 index 1045b8a057a38f..26480b0d0ff647 100644 --- a/deps/npm/man/man1/npm-bin.1 +++ b/deps/npm/man/man1/npm-bin.1 @@ -1,4 +1,4 @@ -.TH "NPM\-BIN" "1" "December 2019" "" "" +.TH "NPM\-BIN" "1" "March 2020" "" "" .SH "NAME" \fBnpm-bin\fR \- Display npm bin folder .SS Synopsis diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1 index 26cf705225edbf..1566c8706c1c53 100644 --- a/deps/npm/man/man1/npm-bugs.1 +++ b/deps/npm/man/man1/npm-bugs.1 @@ -1,4 +1,4 @@ -.TH "NPM\-BUGS" "1" "December 2019" "" "" +.TH "NPM\-BUGS" "1" "March 2020" "" "" .SH "NAME" \fBnpm-bugs\fR \- Bugs for a package in a web browser maybe .SS Synopsis diff --git a/deps/npm/man/man1/npm-build.1 b/deps/npm/man/man1/npm-build.1 index ccee0f7c094fdb..20919da86c19f8 100644 --- a/deps/npm/man/man1/npm-build.1 +++ b/deps/npm/man/man1/npm-build.1 @@ -1,4 +1,4 @@ -.TH "NPM\-BUILD" "1" "December 2019" "" "" +.TH "NPM\-BUILD" "1" "March 2020" "" "" .SH "NAME" \fBnpm-build\fR \- Build a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-bundle.1 b/deps/npm/man/man1/npm-bundle.1 index 936659595a8e3c..a2cb2ad35b4f2a 100644 --- a/deps/npm/man/man1/npm-bundle.1 +++ b/deps/npm/man/man1/npm-bundle.1 @@ -1,4 +1,4 @@ -.TH "NPM\-BUNDLE" "1" "December 2019" "" "" +.TH "NPM\-BUNDLE" "1" "March 2020" "" "" .SH "NAME" \fBnpm-bundle\fR \- REMOVED .SS Description diff --git a/deps/npm/man/man1/npm-cache.1 b/deps/npm/man/man1/npm-cache.1 index da2a65f513b4ef..30186d7925cf8f 100644 --- a/deps/npm/man/man1/npm-cache.1 +++ b/deps/npm/man/man1/npm-cache.1 @@ -1,4 +1,4 @@ -.TH "NPM\-CACHE" "1" "December 2019" "" "" +.TH "NPM\-CACHE" "1" "March 2020" "" "" .SH "NAME" \fBnpm-cache\fR \- Manipulates packages cache .SS Synopsis diff --git a/deps/npm/man/man1/npm-ci.1 b/deps/npm/man/man1/npm-ci.1 index 75cc55041a9c1f..625cf2ef7b4eea 100644 --- a/deps/npm/man/man1/npm-ci.1 +++ b/deps/npm/man/man1/npm-ci.1 @@ -1,4 +1,4 @@ -.TH "NPM\-CI" "1" "December 2019" "" "" +.TH "NPM\-CI" "1" "March 2020" "" "" .SH "NAME" \fBnpm-ci\fR \- Install a project with a clean slate .SS Synopsis diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1 index b267ffe8387016..263e04cba27875 100644 --- a/deps/npm/man/man1/npm-completion.1 +++ b/deps/npm/man/man1/npm-completion.1 @@ -1,4 +1,4 @@ -.TH "NPM\-COMPLETION" "1" "December 2019" "" "" +.TH "NPM\-COMPLETION" "1" "March 2020" "" "" .SH "NAME" \fBnpm-completion\fR \- Tab Completion for npm .SS Synopsis diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1 index 1300519368339f..2c71ad1410e40c 100644 --- a/deps/npm/man/man1/npm-config.1 +++ b/deps/npm/man/man1/npm-config.1 @@ -1,4 +1,4 @@ -.TH "NPM\-CONFIG" "1" "December 2019" "" "" +.TH "NPM\-CONFIG" "1" "March 2020" "" "" .SH "NAME" \fBnpm-config\fR \- Manage the npm configuration files .SS Synopsis diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1 index ef7c109d770f98..53e71c0f405040 100644 --- a/deps/npm/man/man1/npm-dedupe.1 +++ b/deps/npm/man/man1/npm-dedupe.1 @@ -1,4 +1,4 @@ -.TH "NPM\-DEDUPE" "1" "December 2019" "" "" +.TH "NPM\-DEDUPE" "1" "March 2020" "" "" .SH "NAME" \fBnpm-dedupe\fR \- Reduce duplication .SS Synopsis diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1 index ccbb03b550a3b4..3d7c160d987b33 100644 --- a/deps/npm/man/man1/npm-deprecate.1 +++ b/deps/npm/man/man1/npm-deprecate.1 @@ -1,4 +1,4 @@ -.TH "NPM\-DEPRECATE" "1" "December 2019" "" "" +.TH "NPM\-DEPRECATE" "1" "March 2020" "" "" .SH "NAME" \fBnpm-deprecate\fR \- Deprecate a version of a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-dist-tag.1 b/deps/npm/man/man1/npm-dist-tag.1 index 50896edfd10561..9e8fb37ac0db3b 100644 --- a/deps/npm/man/man1/npm-dist-tag.1 +++ b/deps/npm/man/man1/npm-dist-tag.1 @@ -1,4 +1,9 @@ -.TH "NPM\-DIST\-TAG" "1" "December 2019" "" "" +.HR +.P +section: cli\-commands +title: npm\-dist\-tag +.SH description: Modify package distribution tags +.TH "NPM\-DIST\-TAG" "1" "March 2020" "" "" .SH "NAME" \fBnpm-dist-tag\fR \- Modify package distribution tags .SS Synopsis diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1 index c4c80b2396e515..e518a5082fd6de 100644 --- a/deps/npm/man/man1/npm-docs.1 +++ b/deps/npm/man/man1/npm-docs.1 @@ -1,4 +1,4 @@ -.TH "NPM\-DOCS" "1" "December 2019" "" "" +.TH "NPM\-DOCS" "1" "March 2020" "" "" .SH "NAME" \fBnpm-docs\fR \- Docs for a package in a web browser maybe .SS Synopsis diff --git a/deps/npm/man/man1/npm-doctor.1 b/deps/npm/man/man1/npm-doctor.1 index d92053da430b90..4c04a7b6be9d41 100644 --- a/deps/npm/man/man1/npm-doctor.1 +++ b/deps/npm/man/man1/npm-doctor.1 @@ -1,4 +1,4 @@ -.TH "NPM\-DOCTOR" "1" "December 2019" "" "" +.TH "NPM\-DOCTOR" "1" "March 2020" "" "" .SH "NAME" \fBnpm-doctor\fR \- Check your environments .SS Synopsis diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1 index e76ae46c7af092..9f992f04d55f65 100644 --- a/deps/npm/man/man1/npm-edit.1 +++ b/deps/npm/man/man1/npm-edit.1 @@ -1,4 +1,4 @@ -.TH "NPM\-EDIT" "1" "December 2019" "" "" +.TH "NPM\-EDIT" "1" "March 2020" "" "" .SH "NAME" \fBnpm-edit\fR \- Edit an installed package .SS Synopsis diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1 index bf34d050ed4dca..74159220becef2 100644 --- a/deps/npm/man/man1/npm-explore.1 +++ b/deps/npm/man/man1/npm-explore.1 @@ -1,4 +1,9 @@ -.TH "NPM\-EXPLORE" "1" "December 2019" "" "" +.HR +.P +section: cli\-commands +title: npm\-explore +.SH description: Browse an installed package +.TH "NPM\-EXPLORE" "1" "March 2020" "" "" .SH "NAME" \fBnpm-explore\fR \- Browse an installed package .SS Synopsis diff --git a/deps/npm/man/man1/npm-fund.1 b/deps/npm/man/man1/npm-fund.1 index 170d93753f56ca..e4c418f8dae881 100644 --- a/deps/npm/man/man1/npm-fund.1 +++ b/deps/npm/man/man1/npm-fund.1 @@ -1,4 +1,4 @@ -.TH "NPM\-FUND" "1" "December 2019" "" "" +.TH "NPM\-FUND" "1" "March 2020" "" "" .SH "NAME" \fBnpm-fund\fR \- Retrieve funding information .SS Synopsis @@ -15,7 +15,8 @@ a given project\. If no package name is provided, it will list all dependencies that are looking for funding in a tree\-structure in which are listed the type of funding and the url to visit\. If a package name is provided then it tries to open its funding url using the \fB\-\-browser\fP -config param\. +config param; if there are multiple funding sources for the package, the +user will be instructed to pass the \fB\-\-which\fP command to disambiguate\. .P The list will avoid duplicated entries and will stack all packages that share the same type/url as a single entry\. Given this nature the @@ -34,9 +35,9 @@ The browser that is called by the \fBnpm fund\fP command to open websites\. .SS json .RS 0 .IP \(bu 2 -Default: false -.IP \(bu 2 Type: Boolean +.IP \(bu 2 +Default: false .RE .P @@ -52,6 +53,16 @@ Default: true .P Whether to represent the tree structure using unicode characters\. Set it to \fBfalse\fP in order to use all\-ansi output\. +.SS which +.RS 0 +.IP \(bu 2 +Type: Number +.IP \(bu 2 +Default: undefined + +.RE +.P +If there are multiple funding sources, which 1\-indexed source URL to open\. .SH See Also .RS 0 .IP \(bu 2 diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1 index fcf4b863541cb4..19c7d7b5f5693d 100644 --- a/deps/npm/man/man1/npm-help-search.1 +++ b/deps/npm/man/man1/npm-help-search.1 @@ -1,4 +1,4 @@ -.TH "NPM\-HELP\-SEARCH" "1" "December 2019" "" "" +.TH "NPM\-HELP\-SEARCH" "1" "March 2020" "" "" .SH "NAME" \fBnpm-help-search\fR \- Search npm help documentation .SS Synopsis diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1 index 2fd749f88d1ade..6fa907cc9000f2 100644 --- a/deps/npm/man/man1/npm-help.1 +++ b/deps/npm/man/man1/npm-help.1 @@ -1,4 +1,4 @@ -.TH "NPM\-HELP" "1" "December 2019" "" "" +.TH "NPM\-HELP" "1" "March 2020" "" "" .SH "NAME" \fBnpm-help\fR \- Get help on npm .SS Synopsis diff --git a/deps/npm/man/man1/npm-hook.1 b/deps/npm/man/man1/npm-hook.1 index dbc6f8b898644a..74169fb4423c60 100644 --- a/deps/npm/man/man1/npm-hook.1 +++ b/deps/npm/man/man1/npm-hook.1 @@ -1,4 +1,4 @@ -.TH "NPM\-HOOK" "1" "December 2019" "" "" +.TH "NPM\-HOOK" "1" "March 2020" "" "" .SH "NAME" \fBnpm-hook\fR \- Manage registry hooks .SS Synopsis diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1 index bdd4ab126fa26f..5c1b522ccbf7bb 100644 --- a/deps/npm/man/man1/npm-init.1 +++ b/deps/npm/man/man1/npm-init.1 @@ -1,4 +1,4 @@ -.TH "NPM\-INIT" "1" "December 2019" "" "" +.TH "NPM\-INIT" "1" "March 2020" "" "" .SH "NAME" \fBnpm-init\fR \- create a package\.json file .SS Synopsis diff --git a/deps/npm/man/man1/npm-install-ci-test.1 b/deps/npm/man/man1/npm-install-ci-test.1 index 487de9cbe4ee45..e5962b93fdae02 100644 --- a/deps/npm/man/man1/npm-install-ci-test.1 +++ b/deps/npm/man/man1/npm-install-ci-test.1 @@ -1,4 +1,4 @@ -.TH "NPM" "" "December 2019" "" "" +.TH "NPM" "" "March 2020" "" "" .SH "NAME" \fBnpm\fR .SS Synopsis diff --git a/deps/npm/man/man1/npm-install-test.1 b/deps/npm/man/man1/npm-install-test.1 index 0b5915cd2ed5c7..73c7400b73d3de 100644 --- a/deps/npm/man/man1/npm-install-test.1 +++ b/deps/npm/man/man1/npm-install-test.1 @@ -1,4 +1,4 @@ -.TH "NPM" "" "December 2019" "" "" +.TH "NPM" "" "March 2020" "" "" .SH "NAME" \fBnpm\fR .SS Synopsis diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1 index ba9e8cc12dcfa1..6bd9a4cd58e440 100644 --- a/deps/npm/man/man1/npm-install.1 +++ b/deps/npm/man/man1/npm-install.1 @@ -1,4 +1,4 @@ -.TH "NPM\-INSTALL" "1" "December 2019" "" "" +.TH "NPM\-INSTALL" "1" "March 2020" "" "" .SH "NAME" \fBnpm-install\fR \- Install a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1 index 9120d99ebfac26..79ad02d88ca0db 100644 --- a/deps/npm/man/man1/npm-link.1 +++ b/deps/npm/man/man1/npm-link.1 @@ -1,4 +1,4 @@ -.TH "NPM\-LINK" "1" "December 2019" "" "" +.TH "NPM\-LINK" "1" "March 2020" "" "" .SH "NAME" \fBnpm-link\fR \- Symlink a package folder .SS Synopsis @@ -17,8 +17,8 @@ Package linking is a two\-step process\. .P First, \fBnpm link\fP in a package folder will create a symlink in the global folder \fB{prefix}/lib/node_modules/\fP that links to the package where the \fBnpm -link\fP command was executed\. (see \fBnpm\-config\fP \fInpm\-config\fR for the value of \fBprefix\fP)\. It -will also link any bins in the package to \fB{prefix}/bin/{name}\fP\|\. +link\fP command was executed\. It will also link any bins in the package to \fB{prefix}/bin/{name}\fP\|\. +Note that \fBnpm link\fP uses the global prefix (see \fBnpm prefix \-g\fP for its value)\. .P Next, in some other location, \fBnpm link package\-name\fP will create a symbolic link from globally\-installed \fBpackage\-name\fP to \fBnode_modules/\fP diff --git a/deps/npm/man/man1/npm-logout.1 b/deps/npm/man/man1/npm-logout.1 index 1469659def9e49..d9020ea68413cb 100644 --- a/deps/npm/man/man1/npm-logout.1 +++ b/deps/npm/man/man1/npm-logout.1 @@ -1,4 +1,4 @@ -.TH "NPM\-LOGOUT" "1" "December 2019" "" "" +.TH "NPM\-LOGOUT" "1" "March 2020" "" "" .SH "NAME" \fBnpm-logout\fR \- Log out of the registry .SS Synopsis diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1 index fc46b3ad787e65..54ef77772f060f 100644 --- a/deps/npm/man/man1/npm-ls.1 +++ b/deps/npm/man/man1/npm-ls.1 @@ -1,4 +1,4 @@ -.TH "NPM\-LS" "1" "December 2019" "" "" +.TH "NPM\-LS" "1" "March 2020" "" "" .SH "NAME" \fBnpm-ls\fR \- List installed packages .SS Synopsis @@ -22,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show: .P .RS 2 .nf - npm@6\.13\.4 /path/to/npm + npm@6\.14\.4 /path/to/npm └─┬ init\-package\-json@0\.0\.4 └── promzard@0\.1\.5 .fi diff --git a/deps/npm/man/man1/npm-org.1 b/deps/npm/man/man1/npm-org.1 index bb0f44eee8110a..d3f1531252ed66 100644 --- a/deps/npm/man/man1/npm-org.1 +++ b/deps/npm/man/man1/npm-org.1 @@ -1,4 +1,4 @@ -.TH "NPM\-ORG" "1" "December 2019" "" "" +.TH "NPM\-ORG" "1" "March 2020" "" "" .SH "NAME" \fBnpm-org\fR \- Manage orgs .SS Synopsis diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1 index c180c6f1c378a7..808555c7b1b989 100644 --- a/deps/npm/man/man1/npm-outdated.1 +++ b/deps/npm/man/man1/npm-outdated.1 @@ -1,4 +1,4 @@ -.TH "NPM\-OUTDATED" "1" "December 2019" "" "" +.TH "NPM\-OUTDATED" "1" "March 2020" "" "" .SH "NAME" \fBnpm-outdated\fR \- Check for outdated packages .SS Synopsis diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1 index 609562e7aa105c..f0e2f07a0cbc9a 100644 --- a/deps/npm/man/man1/npm-owner.1 +++ b/deps/npm/man/man1/npm-owner.1 @@ -1,4 +1,4 @@ -.TH "NPM\-OWNER" "1" "December 2019" "" "" +.TH "NPM\-OWNER" "1" "March 2020" "" "" .SH "NAME" \fBnpm-owner\fR \- Manage package owners .SS Synopsis diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1 index 73d12bbab94fdb..dac6963b4a2672 100644 --- a/deps/npm/man/man1/npm-pack.1 +++ b/deps/npm/man/man1/npm-pack.1 @@ -1,4 +1,4 @@ -.TH "NPM\-PACK" "1" "December 2019" "" "" +.TH "NPM\-PACK" "1" "March 2020" "" "" .SH "NAME" \fBnpm-pack\fR \- Create a tarball from a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-ping.1 b/deps/npm/man/man1/npm-ping.1 index f555c4f6e2ba0d..28ae935229cda4 100644 --- a/deps/npm/man/man1/npm-ping.1 +++ b/deps/npm/man/man1/npm-ping.1 @@ -1,4 +1,4 @@ -.TH "NPM\-PING" "1" "December 2019" "" "" +.TH "NPM\-PING" "1" "March 2020" "" "" .SH "NAME" \fBnpm-ping\fR \- Ping npm registry .SS Synopsis diff --git a/deps/npm/man/man1/npm-prefix.1 b/deps/npm/man/man1/npm-prefix.1 index d4fe8fb2ef74e3..3b695b870e085b 100644 --- a/deps/npm/man/man1/npm-prefix.1 +++ b/deps/npm/man/man1/npm-prefix.1 @@ -1,4 +1,4 @@ -.TH "NPM\-PREFIX" "1" "December 2019" "" "" +.TH "NPM\-PREFIX" "1" "March 2020" "" "" .SH "NAME" \fBnpm-prefix\fR \- Display prefix .SS Synopsis diff --git a/deps/npm/man/man1/npm-profile.1 b/deps/npm/man/man1/npm-profile.1 index d05b776e85e23b..b0990f099e5085 100644 --- a/deps/npm/man/man1/npm-profile.1 +++ b/deps/npm/man/man1/npm-profile.1 @@ -1,6 +1,54 @@ +.TH "NPM\-PROFILE" "1" "March 2020" "" "" +.SH "NAME" +\fBnpm-profile\fR \- Change settings on your registry profile +.SS Synopsis .P -+ -``` +.RS 2 +.nf +npm profile get [\-\-json|\-\-parseable] [] +npm profile set [\-\-json|\-\-parseable] +npm profile set password +npm profile enable\-2fa [auth\-and\-writes|auth\-only] +npm profile disable\-2fa +.fi +.RE +.SS Description +.P +Change your profile information on the registry\. This not be available if +you're using a non\-npmjs registry\. +.RS 0 +.IP \(bu 2 +\fBnpm profile get []\fP: +Display all of the properties of your profile, or one or more specific +properties\. It looks like: + +.RE +.P +.RS 2 +.nf ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| name | example | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| email | me@example\.com (verified) | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| two factor auth | auth\-and\-writes | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| fullname | Example User | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| homepage | | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| freenode | | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| twitter | | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| github | | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| created | 2015\-02\-26T01:38:35\.892Z | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| updated | 2017\-10\-02T21:29:45\.922Z | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +.fi +.RE .RS 0 .IP \(bu 2 \fBnpm profile set \fP: diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1 index 15cdbc2d69fa45..b51f829ca9c9fc 100644 --- a/deps/npm/man/man1/npm-prune.1 +++ b/deps/npm/man/man1/npm-prune.1 @@ -1,4 +1,4 @@ -.TH "NPM\-PRUNE" "1" "December 2019" "" "" +.TH "NPM\-PRUNE" "1" "March 2020" "" "" .SH "NAME" \fBnpm-prune\fR \- Remove extraneous packages .SS Synopsis diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1 index 63a08a5f19bd0a..eec1f60120a4cd 100644 --- a/deps/npm/man/man1/npm-publish.1 +++ b/deps/npm/man/man1/npm-publish.1 @@ -1,4 +1,4 @@ -.TH "NPM\-PUBLISH" "1" "December 2019" "" "" +.TH "NPM\-PUBLISH" "1" "March 2020" "" "" .SH "NAME" \fBnpm-publish\fR \- Publish a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1 index 367766f81f5484..7e0d43fadf134d 100644 --- a/deps/npm/man/man1/npm-rebuild.1 +++ b/deps/npm/man/man1/npm-rebuild.1 @@ -1,4 +1,4 @@ -.TH "NPM\-REBUILD" "1" "December 2019" "" "" +.TH "NPM\-REBUILD" "1" "March 2020" "" "" .SH "NAME" \fBnpm-rebuild\fR \- Rebuild a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-repo.1 b/deps/npm/man/man1/npm-repo.1 index aa72275dfe730b..68920454a69173 100644 --- a/deps/npm/man/man1/npm-repo.1 +++ b/deps/npm/man/man1/npm-repo.1 @@ -1,4 +1,4 @@ -.TH "NPM\-REPO" "1" "December 2019" "" "" +.TH "NPM\-REPO" "1" "March 2020" "" "" .SH "NAME" \fBnpm-repo\fR \- Open package repository page in the browser .SS Synopsis diff --git a/deps/npm/man/man1/npm-restart.1 b/deps/npm/man/man1/npm-restart.1 index a10b578c2d18c8..d90bebb90633d5 100644 --- a/deps/npm/man/man1/npm-restart.1 +++ b/deps/npm/man/man1/npm-restart.1 @@ -1,4 +1,4 @@ -.TH "NPM\-RESTART" "1" "December 2019" "" "" +.TH "NPM\-RESTART" "1" "March 2020" "" "" .SH "NAME" \fBnpm-restart\fR \- Restart a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1 index f670fd7edd226c..dab19fcabf5a0e 100644 --- a/deps/npm/man/man1/npm-root.1 +++ b/deps/npm/man/man1/npm-root.1 @@ -1,4 +1,4 @@ -.TH "NPM\-ROOT" "1" "December 2019" "" "" +.TH "NPM\-ROOT" "1" "March 2020" "" "" .SH "NAME" \fBnpm-root\fR \- Display npm root .SS Synopsis diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1 index d618c879456894..8a7d2b6e2ff06c 100644 --- a/deps/npm/man/man1/npm-run-script.1 +++ b/deps/npm/man/man1/npm-run-script.1 @@ -1,4 +1,4 @@ -.TH "NPM\-RUN\-SCRIPT" "1" "December 2019" "" "" +.TH "NPM\-RUN\-SCRIPT" "1" "March 2020" "" "" .SH "NAME" \fBnpm-run-script\fR \- Run arbitrary package scripts .SS Synopsis diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1 index 3fc442642c14f0..9b9b7861dab818 100644 --- a/deps/npm/man/man1/npm-search.1 +++ b/deps/npm/man/man1/npm-search.1 @@ -1,4 +1,4 @@ -.TH "NPM\-SEARCH" "1" "December 2019" "" "" +.TH "NPM\-SEARCH" "1" "March 2020" "" "" .SH "NAME" \fBnpm-search\fR \- Search for packages .SS Synopsis diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1 index 70e8924d67b5ac..59b2e499d1e9bf 100644 --- a/deps/npm/man/man1/npm-shrinkwrap.1 +++ b/deps/npm/man/man1/npm-shrinkwrap.1 @@ -1,4 +1,4 @@ -.TH "NPM\-SHRINKWRAP" "1" "December 2019" "" "" +.TH "NPM\-SHRINKWRAP" "1" "March 2020" "" "" .SH "NAME" \fBnpm-shrinkwrap\fR \- Lock down dependency versions for publication .SS Synopsis diff --git a/deps/npm/man/man1/npm-star.1 b/deps/npm/man/man1/npm-star.1 index e5ba538f9ce361..e5a18f85be1374 100644 --- a/deps/npm/man/man1/npm-star.1 +++ b/deps/npm/man/man1/npm-star.1 @@ -1,4 +1,4 @@ -.TH "NPM\-STAR" "1" "December 2019" "" "" +.TH "NPM\-STAR" "1" "March 2020" "" "" .SH "NAME" \fBnpm-star\fR \- Mark your favorite packages .SS Synopsis diff --git a/deps/npm/man/man1/npm-stars.1 b/deps/npm/man/man1/npm-stars.1 index e2d447fee790fe..bcc7cce20518c1 100644 --- a/deps/npm/man/man1/npm-stars.1 +++ b/deps/npm/man/man1/npm-stars.1 @@ -1,4 +1,4 @@ -.TH "NPM\-STARS" "1" "December 2019" "" "" +.TH "NPM\-STARS" "1" "March 2020" "" "" .SH "NAME" \fBnpm-stars\fR \- View packages marked as favorites .SS Synopsis diff --git a/deps/npm/man/man1/npm-start.1 b/deps/npm/man/man1/npm-start.1 index 7768a9bc9eea78..64a22b7cb9461a 100644 --- a/deps/npm/man/man1/npm-start.1 +++ b/deps/npm/man/man1/npm-start.1 @@ -1,4 +1,4 @@ -.TH "NPM\-START" "1" "December 2019" "" "" +.TH "NPM\-START" "1" "March 2020" "" "" .SH "NAME" \fBnpm-start\fR \- Start a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-stop.1 b/deps/npm/man/man1/npm-stop.1 index d81ba646e033b5..5144671e15fcdd 100644 --- a/deps/npm/man/man1/npm-stop.1 +++ b/deps/npm/man/man1/npm-stop.1 @@ -1,4 +1,4 @@ -.TH "NPM\-STOP" "1" "December 2019" "" "" +.TH "NPM\-STOP" "1" "March 2020" "" "" .SH "NAME" \fBnpm-stop\fR \- Stop a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-team.1 b/deps/npm/man/man1/npm-team.1 index d7194d5c8c2b83..6e0b1da57d6e06 100644 --- a/deps/npm/man/man1/npm-team.1 +++ b/deps/npm/man/man1/npm-team.1 @@ -1,4 +1,4 @@ -.TH "NPM\-TEAM" "1" "December 2019" "" "" +.TH "NPM\-TEAM" "1" "March 2020" "" "" .SH "NAME" \fBnpm-team\fR \- Manage organization teams and team memberships .SS Synopsis @@ -23,6 +23,8 @@ handle permissions for packages\. .P Teams must always be fully qualified with the organization/scope they belong to when operating on them, separated by a colon (\fB:\fP)\. That is, if you have a \fBwombats\fP team in a \fBwisdom\fP organization, you must always refer to that team as \fBwisdom:wombats\fP in these commands\. +.P +If you have two\-factor authentication enabled in \fBauth\-and\-writes\fP mode, then you can provide a code from your authenticator with \fB[\-\-otp ]\fP\|\. If you don't include this then you will be prompted\. .RS 0 .IP \(bu 2 create / destroy: diff --git a/deps/npm/man/man1/npm-test.1 b/deps/npm/man/man1/npm-test.1 index e68297858b4c4f..fed0b5d5bb2dd1 100644 --- a/deps/npm/man/man1/npm-test.1 +++ b/deps/npm/man/man1/npm-test.1 @@ -1,4 +1,4 @@ -.TH "NPM\-TEST" "1" "December 2019" "" "" +.TH "NPM\-TEST" "1" "March 2020" "" "" .SH "NAME" \fBnpm-test\fR \- Test a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-token.1 b/deps/npm/man/man1/npm-token.1 index 04a0f5f82f2c6c..2ef8c563f1eb30 100644 --- a/deps/npm/man/man1/npm-token.1 +++ b/deps/npm/man/man1/npm-token.1 @@ -1,6 +1,70 @@ +.TH "NPM\-TOKEN" "1" "March 2020" "" "" +.SH "NAME" +\fBnpm-token\fR \- Manage your authentication tokens +.SS Synopsis .P -+ -``` +.RS 2 +.nf + npm token list [\-\-json|\-\-parseable] + npm token create [\-\-read\-only] [\-\-cidr=1\.1\.1\.1/24,2\.2\.2\.2/16] + npm token revoke +.fi +.RE +.SS Description +.P +This lets you list, create and revoke authentication tokens\. +.RS 0 +.IP \(bu 2 +\fBnpm token list\fP: +Shows a table of all active authentication tokens\. You can request this as +JSON with \fB\-\-json\fP or tab\-separated values with \fB\-\-parseable\fP\|\. + +.RE +.P +.RS 2 +.nf ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| id | token | created | read\-only | CIDR whitelist | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| 7f3134 | 1fa9ba… | 2017\-10\-02 | yes | | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| c03241 | af7aef… | 2017\-10\-02 | no | 192\.168\.0\.1/24 | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| e0cf92 | 3a436a… | 2017\-10\-02 | no | | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| 63eb9d | 74ef35… | 2017\-09\-28 | no | | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| 2daaa8 | cbad5f… | 2017\-09\-26 | no | | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| 68c2fe | 127e51… | 2017\-09\-23 | no | | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| 6334e1 | 1dadd1… | 2017\-09\-23 | no | | ++\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +.fi +.RE +.RS 0 +.IP \(bu 2 +\fBnpm token create [\-\-read\-only] [\-\-cidr=]\fP: +Create a new authentication token\. It can be \fB\-\-read\-only\fP or accept a list of +CIDR \fIhttps://en\.wikipedia\.org/wiki/Classless_Inter\-Domain_Routing\fR ranges to +limit use of this token to\. This will prompt you for your password, and, if you have +two\-factor authentication enabled, an otp\. + +.RE +.P +.RS 2 +.nf ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| token | a73c9572\-f1b9\-8983\-983d\-ba3ac3cc913d | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| cidr_whitelist | | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| readonly | false | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +| created | 2017\-10\-02T07:52:24\.838Z | ++\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +.fi +.RE .RS 0 .IP \(bu 2 \fBnpm token revoke \fP: diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1 index 7e5a6feab701c1..72172f08c8f1fb 100644 --- a/deps/npm/man/man1/npm-uninstall.1 +++ b/deps/npm/man/man1/npm-uninstall.1 @@ -1,4 +1,4 @@ -.TH "NPM\-UNINSTALL" "1" "December 2019" "" "" +.TH "NPM\-UNINSTALL" "1" "March 2020" "" "" .SH "NAME" \fBnpm-uninstall\fR \- Remove a package .SS Synopsis diff --git a/deps/npm/man/man1/npm-unpublish.1 b/deps/npm/man/man1/npm-unpublish.1 index 2cfa8071372e95..5db95caffc36d5 100644 --- a/deps/npm/man/man1/npm-unpublish.1 +++ b/deps/npm/man/man1/npm-unpublish.1 @@ -1,22 +1,24 @@ -.TH "NPM\-UNPUBLISH" "1" "December 2019" "" "" +.TH "NPM\-UNPUBLISH" "1" "March 2020" "" "" .SH "NAME" \fBnpm-unpublish\fR \- Remove a package from the registry .SS Synopsis +.SS Unpublishing a single version of a package .P .RS 2 .nf -npm unpublish [<@scope>/][@] +npm unpublish [<@scope>/]@ .fi .RE -.SS Warning -.P -\fBIt is generally considered bad behavior to remove versions of a library -that others are depending on!\fR +.SS Unpublishing an entire package .P -Consider using the \fBdeprecate\fP command -instead, if your intent is to encourage users to upgrade\. +.RS 2 +.nf +npm unpublish [<@scope>/] \-\-force +.fi +.RE +.SS Warning .P -There is plenty of room on the registry\. +Consider using the \fBdeprecate\fP command instead, if your intent is to encourage users to upgrade, or if you no longer want to maintain a package\. .SS Description .P This removes a package version from the registry, deleting its @@ -27,16 +29,9 @@ the root package entry is removed from the registry entirely\. .P Even if a package version is unpublished, that specific name and version combination can never be reused\. In order to publish the -package again, a new version number must be used\. Additionally, -new versions of packages with every version unpublished may not -be republished until 24 hours have passed\. -.P -With the default registry (\fBregistry\.npmjs\.org\fP), unpublish is -only allowed with versions published in the last 72 hours\. If you -are trying to unpublish a version published longer ago than that, -contact support@npmjs\.com\|\. +package again, a new version number must be used\. If you unpublish the entire package, you may not publish any new versions of that package until 24 hours have passed\. .P -The scope is optional and follows the usual rules for npm help \fBscope\fP\|\. +To learn more about how unpublish is treated on the npm registry, see our unpublish policies\|\. .SS See Also .RS 0 .IP \(bu 2 diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1 index dd61226c352498..b236b1eaaaa561 100644 --- a/deps/npm/man/man1/npm-update.1 +++ b/deps/npm/man/man1/npm-update.1 @@ -1,4 +1,4 @@ -.TH "NPM\-UPDATE" "1" "December 2019" "" "" +.TH "NPM\-UPDATE" "1" "March 2020" "" "" .SH "NAME" \fBnpm-update\fR \- Update a package .SS Synopsis @@ -120,7 +120,9 @@ version that satisfies \fB^0\.4\.0\fP (\fB>= 0\.4\.0 <0\.5\.0\fP) .P \fBnpm update \-g\fP will apply the \fBupdate\fP action to each globally installed package that is \fBoutdated\fP \-\- that is, has a version that is different from -\fBlatest\fP\|\. +\fBwanted\fP\|\. +.P +Note: Globally installed packages are treated as if they are installed with a caret semver range specified\. So if you require to update to \fBlatest\fP you may need to run \fBnpm install \-g [\.\.\.]\fP .P NOTE: If a package has been upgraded to a version newer than \fBlatest\fP, it will be \fIdowngraded\fR\|\. diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1 index f87f182c8d3809..22dc7a71ed4b01 100644 --- a/deps/npm/man/man1/npm-version.1 +++ b/deps/npm/man/man1/npm-version.1 @@ -1,4 +1,4 @@ -.TH "NPM\-VERSION" "1" "December 2019" "" "" +.TH "NPM\-VERSION" "1" "March 2020" "" "" .SH "NAME" \fBnpm-version\fR \- Bump a package version .SS Synopsis diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1 index ee47347e5c10ee..0bed92ababc3dd 100644 --- a/deps/npm/man/man1/npm-view.1 +++ b/deps/npm/man/man1/npm-view.1 @@ -1,4 +1,4 @@ -.TH "NPM\-VIEW" "1" "December 2019" "" "" +.TH "NPM\-VIEW" "1" "March 2020" "" "" .SH "NAME" \fBnpm-view\fR \- View registry info .SS Synopsis diff --git a/deps/npm/man/man1/npm-whoami.1 b/deps/npm/man/man1/npm-whoami.1 index 4958d4cc2d8fd1..c581a1f0a4d363 100644 --- a/deps/npm/man/man1/npm-whoami.1 +++ b/deps/npm/man/man1/npm-whoami.1 @@ -1,4 +1,4 @@ -.TH "NPM\-WHOAMI" "1" "December 2019" "" "" +.TH "NPM\-WHOAMI" "1" "March 2020" "" "" .SH "NAME" \fBnpm-whoami\fR \- Display npm username .SS Synopsis diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1 index 44859cc22e3123..a9ea697aea7dc2 100644 --- a/deps/npm/man/man1/npm.1 +++ b/deps/npm/man/man1/npm.1 @@ -1,4 +1,4 @@ -.TH "NPM" "1" "December 2019" "" "" +.TH "NPM" "1" "March 2020" "" "" .SH "NAME" \fBnpm\fR \- javascript package manager .SS Synopsis @@ -10,7 +10,7 @@ npm [args] .RE .SS Version .P -6\.13\.4 +6\.14\.4 .SS Description .P npm is the package manager for the Node JavaScript platform\. It puts diff --git a/deps/npm/man/man1/npx.1 b/deps/npm/man/man1/npx.1 index cd44dda044ad62..e5fc2d48e6fa5d 100644 --- a/deps/npm/man/man1/npx.1 +++ b/deps/npm/man/man1/npx.1 @@ -1,4 +1,4 @@ -.TH "NPX" "1" "April 2018" "npx@10.1.1" "User Commands" +.TH "NPX" "1" "January 2020" "npx@10.2.1" "User Commands" .SH "NAME" \fBnpx\fR \- execute npm package binaries .SH SYNOPSIS @@ -158,7 +158,7 @@ Huge thanks to Kwyn Meagher \fIhttps://blog\.kwyn\.io\fR for generously donating Written by Kat Marchan \fIhttps://github\.com/zkat\fR\|\. .SH REPORTING BUGS .P -Please file any relevant issues on Github\. \fIhttps://github\.com/zkat/npx\fR +Please file any relevant issues on Github\. \fIhttps://github\.com/npm/npx\fR .SH LICENSE .P This work is released by its authors into the public domain under CC0\-1\.0\. See \fBLICENSE\.md\fP for details\. diff --git a/deps/npm/man/man5/folders.5 b/deps/npm/man/man5/folders.5 index a6d802775989a0..c88bdecd34f1e8 100644 --- a/deps/npm/man/man5/folders.5 +++ b/deps/npm/man/man5/folders.5 @@ -1,6 +1,176 @@ +.TH "FOLDERS" "5" "March 2020" "" "" +.SH "NAME" +\fBfolders\fR \- Folder Structures Used by npm +.SS Description .P -[E] -``` +npm puts various things on your computer\. That's its job\. +.P +This document will tell you what it puts where\. +.SS tl;dr +.RS 0 +.IP \(bu 2 +Local install (default): puts stuff in \fB\|\./node_modules\fP of the current +package root\. +.IP \(bu 2 +Global install (with \fB\-g\fP): puts stuff in /usr/local or wherever node +is installed\. +.IP \(bu 2 +Install it \fBlocally\fR if you're going to \fBrequire()\fP it\. +.IP \(bu 2 +Install it \fBglobally\fR if you're going to run it on the command line\. +.IP \(bu 2 +If you need both, then install it in both places, or use \fBnpm link\fP\|\. + +.RE +.SS prefix Configuration +.P +The \fBprefix\fP config defaults to the location where node is installed\. +On most systems, this is \fB/usr/local\fP\|\. On Windows, it's \fB%AppData%\\npm\fP\|\. +On Unix systems, it's one level up, since node is typically installed at +\fB{prefix}/bin/node\fP rather than \fB{prefix}/node\.exe\fP\|\. +.P +When the \fBglobal\fP flag is set, npm installs things into this prefix\. +When it is not set, it uses the root of the current package, or the +current working directory if not in a package already\. +.SS Node Modules +.P +Packages are dropped into the \fBnode_modules\fP folder under the \fBprefix\fP\|\. +When installing locally, this means that you can +\fBrequire("packagename")\fP to load its main module, or +\fBrequire("packagename/lib/path/to/sub/module")\fP to load other modules\. +.P +Global installs on Unix systems go to \fB{prefix}/lib/node_modules\fP\|\. +Global installs on Windows go to \fB{prefix}/node_modules\fP (that is, no +\fBlib\fP folder\.) +.P +Scoped packages are installed the same way, except they are grouped together +in a sub\-folder of the relevant \fBnode_modules\fP folder with the name of that +scope prefix by the @ symbol, e\.g\. \fBnpm install @myorg/package\fP would place +the package in \fB{prefix}/node_modules/@myorg/package\fP\|\. See npm help \fBscope\fP for more details\. +.P +If you wish to \fBrequire()\fP a package, then install it locally\. +.SS Executables +.P +When in global mode, executables are linked into \fB{prefix}/bin\fP on Unix, +or directly into \fB{prefix}\fP on Windows\. +.P +When in local mode, executables are linked into +\fB\|\./node_modules/\.bin\fP so that they can be made available to scripts run +through npm\. (For example, so that a test runner will be in the path +when you run \fBnpm test\fP\|\.) +.SS Man Pages +.P +When in global mode, man pages are linked into \fB{prefix}/share/man\fP\|\. +.P +When in local mode, man pages are not installed\. +.P +Man pages are not installed on Windows systems\. +.SS Cache +.P +See npm help \fBcache\fP\|\. Cache files are stored in \fB~/\.npm\fP on Posix, or +\fB%AppData%/npm\-cache\fP on Windows\. +.P +This is controlled by the \fBcache\fP configuration param\. +.SS Temp Files +.P +Temporary files are stored by default in the folder specified by the +\fBtmp\fP config, which defaults to the TMPDIR, TMP, or TEMP environment +variables, or \fB/tmp\fP on Unix and \fBc:\\windows\\temp\fP on Windows\. +.P +Temp files are given a unique folder under this root for each run of the +program, and are deleted upon successful exit\. +.SS More Information +.P +When installing locally, npm first tries to find an appropriate +\fBprefix\fP folder\. This is so that \fBnpm install foo@1\.2\.3\fP will install +to the sensible root of your package, even if you happen to have \fBcd\fPed +into some other folder\. +.P +Starting at the $PWD, npm will walk up the folder tree checking for a +folder that contains either a \fBpackage\.json\fP file, or a \fBnode_modules\fP +folder\. If such a thing is found, then that is treated as the effective +"current directory" for the purpose of running npm commands\. (This +behavior is inspired by and similar to git's \.git\-folder seeking +logic when running git commands in a working dir\.) +.P +If no package root is found, then the current folder is used\. +.P +When you run \fBnpm install foo@1\.2\.3\fP, then the package is loaded into +the cache, and then unpacked into \fB\|\./node_modules/foo\fP\|\. Then, any of +foo's dependencies are similarly unpacked into +\fB\|\./node_modules/foo/node_modules/\.\.\.\fP\|\. +.P +Any bin files are symlinked to \fB\|\./node_modules/\.bin/\fP, so that they may +be found by npm scripts when necessary\. +.SS Global Installation +.P +If the \fBglobal\fP configuration is set to true, then npm will +install packages "globally"\. +.P +For global installation, packages are installed roughly the same way, +but using the folders described above\. +.SS Cycles, Conflicts, and Folder Parsimony +.P +Cycles are handled using the property of node's module system that it +walks up the directories looking for \fBnode_modules\fP folders\. So, at every +stage, if a package is already installed in an ancestor \fBnode_modules\fP +folder, then it is not installed at the current location\. +.P +Consider the case above, where \fBfoo \-> bar \-> baz\fP\|\. Imagine if, in +addition to that, baz depended on bar, so you'd have: +\fBfoo \-> bar \-> baz \-> bar \-> baz \.\.\.\fP\|\. However, since the folder +structure is: \fBfoo/node_modules/bar/node_modules/baz\fP, there's no need to +put another copy of bar into \fB\|\.\.\./baz/node_modules\fP, since when it calls +require("bar"), it will get the copy that is installed in +\fBfoo/node_modules/bar\fP\|\. +.P +This shortcut is only used if the exact same +version would be installed in multiple nested \fBnode_modules\fP folders\. It +is still possible to have \fBa/node_modules/b/node_modules/a\fP if the two +"a" packages are different versions\. However, without repeating the +exact same package multiple times, an infinite regress will always be +prevented\. +.P +Another optimization can be made by installing dependencies at the +highest level possible, below the localized "target" folder\. +.SS Example +.P +Consider this dependency graph: +.P +.RS 2 +.nf +foo ++\-\- blerg@1\.2\.5 ++\-\- bar@1\.2\.3 +| +\-\- blerg@1\.x (latest=1\.3\.7) +| +\-\- baz@2\.x +| | `\-\- quux@3\.x +| | `\-\- bar@1\.2\.3 (cycle) +| `\-\- asdf@* +`\-\- baz@1\.2\.3 + `\-\- quux@3\.x + `\-\- bar +.fi +.RE +.P +In this case, we might expect a folder structure like this: +.P +.RS 2 +.nf +foo ++\-\- node_modules + +\-\- blerg (1\.2\.5) <\-\-\-[A] + +\-\- bar (1\.2\.3) <\-\-\-[B] + | `\-\- node_modules + | +\-\- baz (2\.0\.2) <\-\-\-[C] + | | `\-\- node_modules + | | `\-\- quux (3\.2\.0) + | `\-\- asdf (2\.3\.4) + `\-\- baz (1\.2\.3) <\-\-\-[D] + `\-\- node_modules + `\-\- quux (3\.2\.0) <\-\-\-[E] +.fi +.RE .P Since foo depends directly on \fBbar@1\.2\.3\fP and \fBbaz@1\.2\.3\fP, those are installed in foo's \fBnode_modules\fP folder\. diff --git a/deps/npm/man/man5/install.5 b/deps/npm/man/man5/install.5 index f01da284796b41..9309aa1f17c006 100644 --- a/deps/npm/man/man5/install.5 +++ b/deps/npm/man/man5/install.5 @@ -1,4 +1,4 @@ -.TH "INSTALL" "5" "December 2019" "" "" +.TH "INSTALL" "5" "March 2020" "" "" .SH "NAME" \fBinstall\fR \- Download and Install npm .SS Description diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5 index 73a298cf626343..bc3f8fdaed0e5b 100644 --- a/deps/npm/man/man5/npmrc.5 +++ b/deps/npm/man/man5/npmrc.5 @@ -1,4 +1,4 @@ -.TH "NPMRC" "5" "December 2019" "" "" +.TH "NPMRC" "5" "March 2020" "" "" .SH "NAME" \fBnpmrc\fR \- The npm config files .SS Description diff --git a/deps/npm/man/man5/package-json.5 b/deps/npm/man/man5/package-json.5 index c278ee7acfc99c..13d90854131429 100644 --- a/deps/npm/man/man5/package-json.5 +++ b/deps/npm/man/man5/package-json.5 @@ -1,4 +1,4 @@ -.TH "PACKAGE\.JSON" "5" "December 2019" "" "" +.TH "PACKAGE\.JSON" "5" "March 2020" "" "" .SH "NAME" \fBpackage.json\fR \- Specifics of npm's package\.json handling .SS Description @@ -216,7 +216,8 @@ npm also sets a top\-level "maintainers" field with your npm user info\. .SS funding .P You can specify an object containing an URL that provides up\-to\-date -information about ways to help fund development of your package: +information about ways to help fund development of your package, or +a string URL, or an array of these: .P .RS 2 .nf @@ -229,13 +230,28 @@ information about ways to help fund development of your package: "type" : "patreon", "url" : "https://www\.patreon\.com/my\-account" } + +"funding": "http://example\.com/donate" + +"funding": [ + { + "type" : "individual", + "url" : "http://example\.com/donate" + }, + "http://example\.com/donateAlso", + { + "type" : "patreon", + "url" : "https://www\.patreon\.com/my\-account" + } +] .fi .RE .P Users can use the \fBnpm fund\fP subcommand to list the \fBfunding\fP URLs of all dependencies of their project, direct and indirect\. A shortcut to visit each funding url is also available when providing the project name such as: -\fBnpm fund \fP\|\. +\fBnpm fund \fP (when there are multiple URLs, the first one will be +visited) .SS files .P The optional \fBfiles\fP field is an array of file patterns that describes @@ -824,7 +840,8 @@ If a dependency can be used, but you would like npm to proceed if it cannot be found or fails to install, then you may put it in the \fBoptionalDependencies\fP object\. This is a map of package name to version or url, just like the \fBdependencies\fP object\. The difference is that build failures do not cause -installation to fail\. +installation to fail\. Running \fBnpm install \-\-no\-optional\fP will prevent these +dependencies from being installed\. .P It is still your program's responsibility to handle the lack of the dependency\. For example, something like this: diff --git a/deps/npm/man/man5/package-lock-json.5 b/deps/npm/man/man5/package-lock-json.5 index 5f190bf08c852d..43c6e419367742 100644 --- a/deps/npm/man/man5/package-lock-json.5 +++ b/deps/npm/man/man5/package-lock-json.5 @@ -1,4 +1,4 @@ -.TH "PACKAGE\-LOCK\.JSON" "5" "December 2019" "" "" +.TH "PACKAGE\-LOCK\.JSON" "5" "March 2020" "" "" .SH "NAME" \fBpackage-lock.json\fR \- A manifestation of the manifest .SS Description diff --git a/deps/npm/man/man5/package-locks.5 b/deps/npm/man/man5/package-locks.5 index 0c8af6163305a9..f610e42ba4ba4a 100644 --- a/deps/npm/man/man5/package-locks.5 +++ b/deps/npm/man/man5/package-locks.5 @@ -1,4 +1,4 @@ -.TH "PACKAGE\-LOCKS" "5" "December 2019" "" "" +.TH "PACKAGE\-LOCKS" "5" "March 2020" "" "" .SH "NAME" \fBpackage-locks\fR \- An explanation of npm lockfiles .SS Description diff --git a/deps/npm/man/man5/shrinkwrap-json.5 b/deps/npm/man/man5/shrinkwrap-json.5 index 22b517dbbbaf41..e891c84ecff4ee 100644 --- a/deps/npm/man/man5/shrinkwrap-json.5 +++ b/deps/npm/man/man5/shrinkwrap-json.5 @@ -1,4 +1,4 @@ -.TH "NPM\-SHRINKWRAP\.JSON" "5" "December 2019" "" "" +.TH "NPM\-SHRINKWRAP\.JSON" "5" "March 2020" "" "" .SH "NAME" \fBnpm-shrinkwrap.json\fR \- A publishable lockfile .SS Description diff --git a/deps/npm/man/man7/config.7 b/deps/npm/man/man7/config.7 index 617b5354c1db25..0f653366b1d287 100644 --- a/deps/npm/man/man7/config.7 +++ b/deps/npm/man/man7/config.7 @@ -1,6 +1,846 @@ +.TH "CONFIG" "7" "March 2020" "" "" +.SH "NAME" +\fBconfig\fR \- More than you probably want to know about npm configuration +.SS Description .P -" -``` +npm gets its configuration values from the following sources, sorted by priority: +.SS Command Line Flags +.P +Putting \fB\-\-foo bar\fP on the command line sets the \fBfoo\fP configuration +parameter to \fB"bar"\fP\|\. A \fB\-\-\fP argument tells the cli parser to stop +reading flags\. Using \fB\-\-flag\fP without specifying any value will set +the value to \fBtrue\fP\|\. +.P +Example: \fB\-\-flag1 \-\-flag2\fP will set both configuration parameters +to \fBtrue\fP, while \fB\-\-flag1 \-\-flag2 bar\fP will set \fBflag1\fP to \fBtrue\fP, +and \fBflag2\fP to \fBbar\fP\|\. Finally, \fB\-\-flag1 \-\-flag2 \-\- bar\fP will set +both configuration parameters to \fBtrue\fP, and the \fBbar\fP is taken +as a command argument\. +.SS Environment Variables +.P +Any environment variables that start with \fBnpm_config_\fP will be +interpreted as a configuration parameter\. For example, putting +\fBnpm_config_foo=bar\fP in your environment will set the \fBfoo\fP +configuration parameter to \fBbar\fP\|\. Any environment configurations that +are not given a value will be given the value of \fBtrue\fP\|\. Config +values are case\-insensitive, so \fBNPM_CONFIG_FOO=bar\fP will work the +same\. However, please note that inside npm help \fBscripts\fP +npm will set its own environment variables and Node will prefer +those lowercase versions over any uppercase ones that you might set\. +For details see this issue \fIhttps://github\.com/npm/npm/issues/14528\fR\|\. +.P +Notice that you need to use underscores instead of dashes, so \fB\-\-allow\-same\-version\fP +would become \fBnpm_config_allow_same_version=true\fP\|\. +.SS npmrc Files +.P +The four relevant files are: +.RS 0 +.IP \(bu 2 +per\-project configuration file (\fB/path/to/my/project/\.npmrc\fP) +.IP \(bu 2 +per\-user configuration file (defaults to \fB$HOME/\.npmrc\fP; configurable via CLI +option \fB\-\-userconfig\fP or environment variable \fB$NPM_CONFIG_USERCONFIG\fP) +.IP \(bu 2 +global configuration file (defaults to \fB$PREFIX/etc/npmrc\fP; configurable via +CLI option \fB\-\-globalconfig\fP or environment variable \fB$NPM_CONFIG_GLOBALCONFIG\fP) +.IP \(bu 2 +npm's built\-in configuration file (\fB/path/to/npm/npmrc\fP) + +.RE +.P +See npm help npmrc for more details\. +.SS Default Configs +.P +Run \fBnpm config ls \-l\fP to see a set of configuration parameters that are +internal to npm, and are defaults if nothing else is specified\. +.SS Shorthands and Other CLI Niceties +.P +The following shorthands are parsed on the command\-line: +.RS 0 +.IP \(bu 2 +\fB\-v\fP: \fB\-\-version\fP +.IP \(bu 2 +\fB\-h\fP, \fB\-?\fP, \fB\-\-help\fP, \fB\-H\fP: \fB\-\-usage\fP +.IP \(bu 2 +\fB\-s\fP, \fB\-\-silent\fP: \fB\-\-loglevel silent\fP +.IP \(bu 2 +\fB\-q\fP, \fB\-\-quiet\fP: \fB\-\-loglevel warn\fP +.IP \(bu 2 +\fB\-d\fP: \fB\-\-loglevel info\fP +.IP \(bu 2 +\fB\-dd\fP, \fB\-\-verbose\fP: \fB\-\-loglevel verbose\fP +.IP \(bu 2 +\fB\-ddd\fP: \fB\-\-loglevel silly\fP +.IP \(bu 2 +\fB\-g\fP: \fB\-\-global\fP +.IP \(bu 2 +\fB\-C\fP: \fB\-\-prefix\fP +.IP \(bu 2 +\fB\-l\fP: \fB\-\-long\fP +.IP \(bu 2 +\fB\-m\fP: \fB\-\-message\fP +.IP \(bu 2 +\fB\-p\fP, \fB\-\-porcelain\fP: \fB\-\-parseable\fP +.IP \(bu 2 +\fB\-reg\fP: \fB\-\-registry\fP +.IP \(bu 2 +\fB\-f\fP: \fB\-\-force\fP +.IP \(bu 2 +\fB\-desc\fP: \fB\-\-description\fP +.IP \(bu 2 +\fB\-S\fP: \fB\-\-save\fP +.IP \(bu 2 +\fB\-P\fP: \fB\-\-save\-prod\fP +.IP \(bu 2 +\fB\-D\fP: \fB\-\-save\-dev\fP +.IP \(bu 2 +\fB\-O\fP: \fB\-\-save\-optional\fP +.IP \(bu 2 +\fB\-B\fP: \fB\-\-save\-bundle\fP +.IP \(bu 2 +\fB\-E\fP: \fB\-\-save\-exact\fP +.IP \(bu 2 +\fB\-y\fP: \fB\-\-yes\fP +.IP \(bu 2 +\fB\-n\fP: \fB\-\-yes false\fP +.IP \(bu 2 +\fBll\fP and \fBla\fP commands: \fBls \-\-long\fP + +.RE +.P +If the specified configuration param resolves unambiguously to a known +configuration parameter, then it is expanded to that configuration +parameter\. For example: +.P +.RS 2 +.nf +npm ls \-\-par +# same as: +npm ls \-\-parseable +.fi +.RE +.P +If multiple single\-character shorthands are strung together, and the +resulting combination is unambiguously not some other configuration +param, then it is expanded to its various component pieces\. For +example: +.P +.RS 2 +.nf +npm ls \-gpld +# same as: +npm ls \-\-global \-\-parseable \-\-long \-\-loglevel info +.fi +.RE +.SS Per\-Package Config Settings +.P +When running scripts (see npm help \fBscripts\fP) the package\.json "config" +keys are overwritten in the environment if there is a config param of +\fB[@]:\fP\|\. For example, if the package\.json has +this: +.P +.RS 2 +.nf +{ "name" : "foo" +, "config" : { "port" : "8080" } +, "scripts" : { "start" : "node server\.js" } } +.fi +.RE +.P +and the server\.js is this: +.P +.RS 2 +.nf +http\.createServer(\.\.\.)\.listen(process\.env\.npm_package_config_port) +.fi +.RE +.P +then the user could change the behavior by doing: +.P +.RS 2 +.nf +npm config set foo:port 80 +.fi +.RE +.P +See npm help package\.json for more information\. +.SS Config Settings +.SS access +.RS 0 +.IP \(bu 2 +Default: \fBrestricted\fP +.IP \(bu 2 +Type: Access + +.RE +.P +When publishing scoped packages, the access level defaults to \fBrestricted\fP\|\. If +you want your scoped package to be publicly viewable (and installable) set +\fB\-\-access=public\fP\|\. The only valid values for \fBaccess\fP are \fBpublic\fP and +\fBrestricted\fP\|\. Unscoped packages \fIalways\fR have an access level of \fBpublic\fP\|\. +.SS allow\-same\-version +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Prevents throwing an error when \fBnpm version\fP is used to set the new version +to the same value as the current version\. +.SS always\-auth +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Force npm to always require authentication when accessing the registry, +even for \fBGET\fP requests\. +.SS also +.RS 0 +.IP \(bu 2 +Default: null +.IP \(bu 2 +Type: String + +.RE +.P +When "dev" or "development" and running local \fBnpm shrinkwrap\fP, +\fBnpm outdated\fP, or \fBnpm update\fP, is an alias for \fB\-\-dev\fP\|\. +.SS audit +.RS 0 +.IP \(bu 2 +Default: true +.IP \(bu 2 +Type: Boolean + +.RE +.P +When "true" submit audit reports alongside \fBnpm install\fP runs to the default +registry and all registries configured for scopes\. See the documentation +for npm help \fBaudit\fP for details on what is submitted\. +.SS audit\-level +.RS 0 +.IP \(bu 2 +Default: \fB"low"\fP +.IP \(bu 2 +Type: \fB\|'low'\fP, \fB\|'moderate'\fP, \fB\|'high'\fP, \fB\|'critical'\fP + +.RE +.P +The minimum level of vulnerability for \fBnpm audit\fP to exit with +a non\-zero exit code\. +.SS auth\-type +.RS 0 +.IP \(bu 2 +Default: \fB\|'legacy'\fP +.IP \(bu 2 +Type: \fB\|'legacy'\fP, \fB\|'sso'\fP, \fB\|'saml'\fP, \fB\|'oauth'\fP + +.RE +.P +What authentication strategy to use with \fBadduser\fP/\fBlogin\fP\|\. +.SS before +.RS 0 +.IP \(bu 2 +Alias: enjoy\-by +.IP \(bu 2 +Default: null +.IP \(bu 2 +Type: Date + +.RE +.P +If passed to \fBnpm install\fP, will rebuild the npm tree such that only versions +that were available \fBon or before\fR the \fB\-\-before\fP time get installed\. +If there's no versions available for the current set of direct dependencies, the +command will error\. +.P +If the requested version is a \fBdist\-tag\fP and the given tag does not pass the +\fB\-\-before\fP filter, the most recent version less than or equal to that tag will +be used\. For example, \fBfoo@latest\fP might install \fBfoo@1\.2\fP even though \fBlatest\fP +is \fB2\.0\fP\|\. +.SS bin\-links +.RS 0 +.IP \(bu 2 +Default: \fBtrue\fP +.IP \(bu 2 +Type: Boolean + +.RE +.P +Tells npm to create symlinks (or \fB\|\.cmd\fP shims on Windows) for package +executables\. +.P +Set to false to have it not do this\. This can be used to work around +the fact that some file systems don't support symlinks, even on +ostensibly Unix systems\. +.SS browser +.RS 0 +.IP \(bu 2 +Default: OS X: \fB"open"\fP, Windows: \fB"start"\fP, Others: \fB"xdg\-open"\fP +.IP \(bu 2 +Type: String + +.RE +.P +The browser that is called by the \fBnpm docs\fP command to open websites\. +.SS ca +.RS 0 +.IP \(bu 2 +Default: The npm CA certificate +.IP \(bu 2 +Type: String, Array or null + +.RE +.P +The Certificate Authority signing certificate that is trusted for SSL +connections to the registry\. Values should be in PEM format (Windows calls it "Base\-64 encoded X\.509 (\.CER)") with newlines +replaced by the string "\\n"\. For example: +.P +.RS 2 +.nf +ca="\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-\\nXXXX\\nXXXX\\n\-\-\-\-\-END CERTIFICATE\-\-\-\-\-" +.fi +.RE +.P +Set to \fBnull\fP to only allow "known" registrars, or to a specific CA cert +to trust only that specific signing authority\. +.P +Multiple CAs can be trusted by specifying an array of certificates: +.P +.RS 2 +.nf +ca[]="\.\.\." +ca[]="\.\.\." +.fi +.RE +.P +See also the \fBstrict\-ssl\fP config\. +.SS cafile +.RS 0 +.IP \(bu 2 +Default: \fBnull\fP +.IP \(bu 2 +Type: path + +.RE +.P +A path to a file containing one or multiple Certificate Authority signing +certificates\. Similar to the \fBca\fP setting, but allows for multiple CA's, as +well as for the CA information to be stored in a file on disk\. +.SS cache +.RS 0 +.IP \(bu 2 +Default: Windows: \fB%AppData%\\npm\-cache\fP, Posix: \fB~/\.npm\fP +.IP \(bu 2 +Type: path + +.RE +.P +The location of npm's cache directory\. See npm help \fBcache\fP +.SS cache\-lock\-stale +.RS 0 +.IP \(bu 2 +Default: 60000 (1 minute) +.IP \(bu 2 +Type: Number + +.RE +.P +The number of ms before cache folder lockfiles are considered stale\. +.SS cache\-lock\-retries +.RS 0 +.IP \(bu 2 +Default: 10 +.IP \(bu 2 +Type: Number + +.RE +.P +Number of times to retry to acquire a lock on cache folder lockfiles\. +.SS cache\-lock\-wait +.RS 0 +.IP \(bu 2 +Default: 10000 (10 seconds) +.IP \(bu 2 +Type: Number + +.RE +.P +Number of ms to wait for cache lock files to expire\. +.SS cache\-max +.RS 0 +.IP \(bu 2 +Default: Infinity +.IP \(bu 2 +Type: Number + +.RE +.P +\fBDEPRECATED\fR: This option has been deprecated in favor of \fB\-\-prefer\-online\fP\|\. +.P +\fB\-\-cache\-max=0\fP is an alias for \fB\-\-prefer\-online\fP\|\. +.SS cache\-min +.RS 0 +.IP \(bu 2 +Default: 10 +.IP \(bu 2 +Type: Number + +.RE +.P +\fBDEPRECATED\fR: This option has been deprecated in favor of \fB\-\-prefer\-offline\fP\|\. +.P +\fB\-\-cache\-min=9999 (or bigger)\fP is an alias for \fB\-\-prefer\-offline\fP\|\. +.SS cert +.RS 0 +.IP \(bu 2 +Default: \fBnull\fP +.IP \(bu 2 +Type: String + +.RE +.P +A client certificate to pass when accessing the registry\. Values should be in +PEM format (Windows calls it "Base\-64 encoded X\.509 (\.CER)") with newlines replaced by the string "\\n"\. For example: +.P +.RS 2 +.nf +cert="\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-\\nXXXX\\nXXXX\\n\-\-\-\-\-END CERTIFICATE\-\-\-\-\-" +.fi +.RE +.P +It is \fInot\fR the path to a certificate file (and there is no "certfile" option)\. +.SS cidr +.RS 0 +.IP \(bu 2 +Default: \fBnull\fP +.IP \(bu 2 +Type: String, Array, null + +.RE +.P +This is a list of CIDR address to be used when configuring limited access tokens with the \fBnpm token create\fP command\. +.SS color +.RS 0 +.IP \(bu 2 +Default: true +.IP \(bu 2 +Type: Boolean or \fB"always"\fP + +.RE +.P +If false, never shows colors\. If \fB"always"\fP then always shows colors\. +If true, then only prints color codes for tty file descriptors\. +.P +This option can also be changed using the environment: colors are +disabled when the environment variable \fBNO_COLOR\fP is set to any value\. +.SS depth +.RS 0 +.IP \(bu 2 +Default: Infinity +.IP \(bu 2 +Type: Number + +.RE +.P +The depth to go when recursing directories for \fBnpm ls\fP, +\fBnpm cache ls\fP, and \fBnpm outdated\fP\|\. +.P +For \fBnpm outdated\fP, a setting of \fBInfinity\fP will be treated as \fB0\fP +since that gives more useful information\. To show the outdated status +of all packages and dependents, use a large integer value, +e\.g\., \fBnpm outdated \-\-depth 9999\fP +.SS description +.RS 0 +.IP \(bu 2 +Default: true +.IP \(bu 2 +Type: Boolean + +.RE +.P +Show the description in \fBnpm search\fP +.SS dev +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Install \fBdev\-dependencies\fP along with packages\. +.SS dry\-run +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Indicates that you don't want npm to make any changes and that it should +only report what it would have done\. This can be passed into any of the +commands that modify your local installation, eg, \fBinstall\fP, \fBupdate\fP, +\fBdedupe\fP, \fBuninstall\fP\|\. This is NOT currently honored by some network related +commands, eg \fBdist\-tags\fP, \fBowner\fP, etc\. +.SS editor +.RS 0 +.IP \(bu 2 +Default: \fBEDITOR\fP environment variable if set, or \fB"vi"\fP on Posix, +or \fB"notepad"\fP on Windows\. +.IP \(bu 2 +Type: path + +.RE +.P +The command to run for \fBnpm edit\fP or \fBnpm config edit\fP\|\. +.SS engine\-strict +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +If set to true, then npm will stubbornly refuse to install (or even +consider installing) any package that claims to not be compatible with +the current Node\.js version\. +.SS force +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Makes various commands more forceful\. +.RS 0 +.IP \(bu 2 +lifecycle script failure does not block progress\. +.IP \(bu 2 +publishing clobbers previously published versions\. +.IP \(bu 2 +skips cache when requesting from the registry\. +.IP \(bu 2 +prevents checks against clobbering non\-npm files\. + +.RE +.SS format\-package\-lock +.RS 0 +.IP \(bu 2 +Default: true +.IP \(bu 2 +Type: Boolean + +.RE +.P +Format \fBpackage\-lock\.json\fP or \fBnpm\-shrinkwrap\.json\fP as a human readable file\. +.SS fetch\-retries +.RS 0 +.IP \(bu 2 +Default: 2 +.IP \(bu 2 +Type: Number + +.RE +.P +The "retries" config for the \fBretry\fP module to use when fetching +packages from the registry\. +.SS fetch\-retry\-factor +.RS 0 +.IP \(bu 2 +Default: 10 +.IP \(bu 2 +Type: Number + +.RE +.P +The "factor" config for the \fBretry\fP module to use when fetching +packages\. +.SS fetch\-retry\-mintimeout +.RS 0 +.IP \(bu 2 +Default: 10000 (10 seconds) +.IP \(bu 2 +Type: Number + +.RE +.P +The "minTimeout" config for the \fBretry\fP module to use when fetching +packages\. +.SS fetch\-retry\-maxtimeout +.RS 0 +.IP \(bu 2 +Default: 60000 (1 minute) +.IP \(bu 2 +Type: Number + +.RE +.P +The "maxTimeout" config for the \fBretry\fP module to use when fetching +packages\. +.SS fund +.RS 0 +.IP \(bu 2 +Default: true +.IP \(bu 2 +Type: Boolean + +.RE +.P +When "true" displays the message at the end of each \fBnpm install\fP +aknowledging the number of dependencies looking for funding\. +See npm help \fBfund\fP for details\. +.SS git +.RS 0 +.IP \(bu 2 +Default: \fB"git"\fP +.IP \(bu 2 +Type: String + +.RE +.P +The command to use for git commands\. If git is installed on the +computer, but is not in the \fBPATH\fP, then set this to the full path to +the git binary\. +.SS git\-tag\-version +.RS 0 +.IP \(bu 2 +Default: \fBtrue\fP +.IP \(bu 2 +Type: Boolean + +.RE +.P +Tag the commit when using the \fBnpm version\fP command\. +.SS commit\-hooks +.RS 0 +.IP \(bu 2 +Default: \fBtrue\fP +.IP \(bu 2 +Type: Boolean + +.RE +.P +Run git commit hooks when using the \fBnpm version\fP command\. +.SS global +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Operates in "global" mode, so that packages are installed into the +\fBprefix\fP folder instead of the current working directory\. See +npm help folders for more on the differences in behavior\. +.RS 0 +.IP \(bu 2 +packages are installed into the \fB{prefix}/lib/node_modules\fP folder, instead of the +current working directory\. +.IP \(bu 2 +bin files are linked to \fB{prefix}/bin\fP +.IP \(bu 2 +man pages are linked to \fB{prefix}/share/man\fP + +.RE +.SS globalconfig +.RS 0 +.IP \(bu 2 +Default: {prefix}/etc/npmrc +.IP \(bu 2 +Type: path + +.RE +.P +The config file to read for global config options\. +.SS global\-style +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Causes npm to install the package into your local \fBnode_modules\fP folder with +the same layout it uses with the global \fBnode_modules\fP folder\. Only your +direct dependencies will show in \fBnode_modules\fP and everything they depend +on will be flattened in their \fBnode_modules\fP folders\. This obviously will +eliminate some deduping\. If used with \fBlegacy\-bundling\fP, \fBlegacy\-bundling\fP will be +preferred\. +.SS group +.RS 0 +.IP \(bu 2 +Default: GID of the current process +.IP \(bu 2 +Type: String or Number + +.RE +.P +The group to use when running package scripts in global mode as the root +user\. +.SS heading +.RS 0 +.IP \(bu 2 +Default: \fB"npm"\fP +.IP \(bu 2 +Type: String + +.RE +.P +The string that starts all the debugging log output\. +.SS https\-proxy +.RS 0 +.IP \(bu 2 +Default: null +.IP \(bu 2 +Type: url + +.RE +.P +A proxy to use for outgoing https requests\. If the \fBHTTPS_PROXY\fP or +\fBhttps_proxy\fP or \fBHTTP_PROXY\fP or \fBhttp_proxy\fP environment variables are set, +proxy settings will be honored by the underlying \fBrequest\fP library\. +.SS if\-present +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +If true, npm will not exit with an error code when \fBrun\-script\fP is invoked for +a script that isn't defined in the \fBscripts\fP section of \fBpackage\.json\fP\|\. This +option can be used when it's desirable to optionally run a script when it's +present and fail if the script fails\. This is useful, for example, when running +scripts that may only apply for some builds in an otherwise generic CI setup\. +.SS ignore\-prepublish +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +If true, npm will not run \fBprepublish\fP scripts\. +.SS ignore\-scripts +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +If true, npm does not run scripts specified in package\.json files\. +.SS init\-module +.RS 0 +.IP \(bu 2 +Default: ~/\.npm\-init\.js +.IP \(bu 2 +Type: path + +.RE +.P +A module that will be loaded by the \fBnpm init\fP command\. See the +documentation for the +init\-package\-json \fIhttps://github\.com/isaacs/init\-package\-json\fR module +for more information, or npm help init\. +.SS init\-author\-name +.RS 0 +.IP \(bu 2 +Default: "" +.IP \(bu 2 +Type: String + +.RE +.P +The value \fBnpm init\fP should use by default for the package author's name\. +.SS init\-author\-email +.RS 0 +.IP \(bu 2 +Default: "" +.IP \(bu 2 +Type: String + +.RE +.P +The value \fBnpm init\fP should use by default for the package author's email\. +.SS init\-author\-url +.RS 0 +.IP \(bu 2 +Default: "" +.IP \(bu 2 +Type: String + +.RE +.P +The value \fBnpm init\fP should use by default for the package author's homepage\. +.SS init\-license +.RS 0 +.IP \(bu 2 +Default: "ISC" +.IP \(bu 2 +Type: String + +.RE +.P +The value \fBnpm init\fP should use by default for the package license\. +.SS init\-version +.RS 0 +.IP \(bu 2 +Default: "1\.0\.0" +.IP \(bu 2 +Type: semver + +.RE +.P +The value that \fBnpm init\fP should use by default for the package +version number, if not already set in package\.json\. +.SS json +.RS 0 +.IP \(bu 2 +Default: false +.IP \(bu 2 +Type: Boolean + +.RE +.P +Whether or not to output JSON data, rather than the normal output\. +.P +This feature is currently experimental, and the output data structures for many +commands is either not implemented in JSON yet, or subject to change\. Only the +output from \fBnpm ls \-\-json\fP and \fBnpm search \-\-json\fP are currently valid\. +.SS key +.RS 0 +.IP \(bu 2 +Default: \fBnull\fP +.IP \(bu 2 +Type: String + +.RE +.P +A client key to pass when accessing the registry\. Values should be in PEM +format with newlines replaced by the string "\\n"\. For example: +.P +.RS 2 +.nf +key="\-\-\-\-\-BEGIN PRIVATE KEY\-\-\-\-\-\\nXXXX\\nXXXX\\n\-\-\-\-\-END PRIVATE KEY\-\-\-\-\-" +.fi +.RE .P It is \fInot\fR the path to a key file (and there is no "keyfile" option)\. .SS legacy\-bundling diff --git a/deps/npm/man/man7/developers.7 b/deps/npm/man/man7/developers.7 index 60fe6234cffd09..a84548af27c641 100644 --- a/deps/npm/man/man7/developers.7 +++ b/deps/npm/man/man7/developers.7 @@ -1,4 +1,4 @@ -.TH "DEVELOPERS" "7" "December 2019" "" "" +.TH "DEVELOPERS" "7" "March 2020" "" "" .SH "NAME" \fBdevelopers\fR \- Developer Guide .SS Description diff --git a/deps/npm/man/man7/disputes.7 b/deps/npm/man/man7/disputes.7 index 53cf2464a9ea8c..a94c70b3d833de 100644 --- a/deps/npm/man/man7/disputes.7 +++ b/deps/npm/man/man7/disputes.7 @@ -1,4 +1,4 @@ -.TH "DISPUTES" "7" "December 2019" "" "" +.TH "DISPUTES" "7" "March 2020" "" "" .SH "NAME" \fBdisputes\fR \- Handling Module Name Disputes .P @@ -116,7 +116,7 @@ language, pornographic content, or harassment\. If you see bad behavior like this, please report it to abuse@npmjs\.com right away\. \fBYou are never expected to resolve abusive behavior on your own\. We are here to help\.\fR -.SS Trademarkss +.SS Trademarks .P If you think another npm publisher is infringing your trademark, such as by using a confusingly similar package name, email abuse@npmjs\.com with a link to diff --git a/deps/npm/man/man7/orgs.7 b/deps/npm/man/man7/orgs.7 index bd3adcaa5eca12..418537ead8c219 100644 --- a/deps/npm/man/man7/orgs.7 +++ b/deps/npm/man/man7/orgs.7 @@ -1,4 +1,4 @@ -.TH "ORGS" "7" "December 2019" "" "" +.TH "ORGS" "7" "March 2020" "" "" .SH "NAME" \fBorgs\fR \- Working with Teams & Orgs .SS Description diff --git a/deps/npm/man/man7/registry.7 b/deps/npm/man/man7/registry.7 index c21d6d6e617817..f22059121e843b 100644 --- a/deps/npm/man/man7/registry.7 +++ b/deps/npm/man/man7/registry.7 @@ -1,4 +1,4 @@ -.TH "REGISTRY" "7" "December 2019" "" "" +.TH "REGISTRY" "7" "March 2020" "" "" .SH "NAME" \fBregistry\fR \- The JavaScript Package Registry .SS Description diff --git a/deps/npm/man/man7/removal.7 b/deps/npm/man/man7/removal.7 index 0a08017f0dcd2b..7b7322628f2c65 100644 --- a/deps/npm/man/man7/removal.7 +++ b/deps/npm/man/man7/removal.7 @@ -1,4 +1,4 @@ -.TH "REMOVAL" "7" "December 2019" "" "" +.TH "REMOVAL" "7" "March 2020" "" "" .SH "NAME" \fBremoval\fR \- Cleaning the Slate .SS Synopsis diff --git a/deps/npm/man/man7/scope.7 b/deps/npm/man/man7/scope.7 index 933e2e23c77430..1884347b8b6ab1 100644 --- a/deps/npm/man/man7/scope.7 +++ b/deps/npm/man/man7/scope.7 @@ -1,4 +1,4 @@ -.TH "SCOPE" "7" "December 2019" "" "" +.TH "SCOPE" "7" "March 2020" "" "" .SH "NAME" \fBscope\fR \- Scoped packages .SS Description diff --git a/deps/npm/man/man7/scripts.7 b/deps/npm/man/man7/scripts.7 index a6756a376c59bd..17b549b05e7c1c 100644 --- a/deps/npm/man/man7/scripts.7 +++ b/deps/npm/man/man7/scripts.7 @@ -1,101 +1,88 @@ -.TH "SCRIPTS" "7" "December 2019" "" "" +.TH "SCRIPTS" "7" "March 2020" "" "" .SH "NAME" \fBscripts\fR \- How npm handles the "scripts" field .SS Description .P -npm supports the "scripts" property of the package\.json file, for the -following scripts: +The \fB"scripts"\fP property of of your \fBpackage\.json\fP file supports a number of built\-in scripts and their preset life cycle events as well as arbitrary scripts\. These all can be executed by running \fBnpm run\-script \fP or \fBnpm run \fP for short\. \fIPre\fR and \fIpost\fR commands with matching names will be run for those as well (e\.g\. \fBpremyscript\fP, \fBmyscript\fP, \fBpostmyscript\fP)\. Scripts from dependencies can be run with \fBnpm explore \-\- npm run \fP\|\. +.SS Pre & Post Scripts +.P +To create "pre" or "post" scripts for any scripts defined in the \fB"scripts"\fP section of the \fBpackage\.json\fP, simply create another script \fIwith a matching name\fR and add "pre" or "post" to the beginning of them\. +.P +.RS 2 +.nf +{ + "scripts": { + "precompress": "{{ executes BEFORE the `compress` script }}", + "compress": "{{ run command to compress files }}", + "postcompress": "{{ executes AFTER `compress` script }}" + } +} +.fi +.RE +.SS Life Cycle Scripts +.P +There are some special life cycle scripts that happen only in certain situations\. These scripts happen in addtion to the "pre" and "post" script\. .RS 0 .IP \(bu 2 -\fBprepublish\fR (\fIas of npm@5, \fBprepublish\fP is deprecated\. Use \fBprepare\fP for build steps and \fBprepublishOnly\fP for upload\-only\.\fR): -Run BEFORE the package is packed and published, as well as on local \fBnpm -install\fP without any arguments\. (See below) -.IP \(bu 2 -\fBprepare\fR: -Run both BEFORE the package is packed and published, on local \fBnpm -install\fP without any arguments, and when installing git dependencies (See -below)\. This is run AFTER \fBprepublish\fP, but BEFORE \fBprepublishOnly\fP\|\. -.IP \(bu 2 -\fBprepublishOnly\fR: -Run BEFORE the package is prepared and packed, ONLY on \fBnpm publish\fP\|\. (See -below\.) -.IP \(bu 2 -\fBprepack\fR: -run BEFORE a tarball is packed (on \fBnpm pack\fP, \fBnpm publish\fP, and when -installing git dependencies) -.IP \(bu 2 -\fBpostpack\fR: -Run AFTER the tarball has been generated and moved to its final destination\. -.IP \(bu 2 -\fBpublish\fR, \fBpostpublish\fR: -Run AFTER the package is published\. -.IP \(bu 2 -\fBpreinstall\fR: -Run BEFORE the package is installed -.IP \(bu 2 -\fBinstall\fR, \fBpostinstall\fR: -Run AFTER the package is installed\. +\fBprepare\fP, \fBprepublish\fP, \fBprepublishOnly\fP, \fBprepack\fP, \fBpostpack\fP + +.RE +.P +\fBprepare\fR (since \fBnpm@4\.0\.0\fP) +.RS 0 .IP \(bu 2 -\fBpreuninstall\fR, \fBuninstall\fR: -Run BEFORE the package is uninstalled\. +Runs BEFORE the package is packed .IP \(bu 2 -\fBpostuninstall\fR: -Run AFTER the package is uninstalled\. +Runs BEFORE the package is published .IP \(bu 2 -\fBpreversion\fR: -Run BEFORE bumping the package version\. +Runs on local \fBnpm install\fP without any arguments .IP \(bu 2 -\fBversion\fR: -Run AFTER bumping the package version, but BEFORE commit\. +Run AFTER \fBprepublish\fP, but BEFORE \fBprepublishOnly\fP .IP \(bu 2 -\fBpostversion\fR: -Run AFTER bumping the package version, and AFTER commit\. +NOTE: If a package being installed through git contains a \fBprepare\fP script, its \fBdependencies\fP and \fBdevDependencies\fP will be installed, and the prepare script will be run, before the package is packaged and installed\. + +.RE +.P +\fBprepublish\fR (DEPRECATED) +.RS 0 .IP \(bu 2 -\fBpretest\fR, \fBtest\fR, \fBposttest\fR: -Run by the \fBnpm test\fP command\. +Same as \fBprepare\fP + +.RE +.P +\fBprepublishOnly\fR +.RS 0 .IP \(bu 2 -\fBprestop\fR, \fBstop\fR, \fBpoststop\fR: -Run by the \fBnpm stop\fP command\. +Runs BEFORE the package is prepared and packed, ONLY on \fBnpm publish\fP\|\. + +.RE +.P +\fBprepack\fR +.RS 0 .IP \(bu 2 -\fBprestart\fR, \fBstart\fR, \fBpoststart\fR: -Run by the \fBnpm start\fP command\. +Runs BEFORE a tarball is packed (on "\fBnpm pack\fP", "\fBnpm publish\fP", and when installing a git dependencies)\. .IP \(bu 2 -\fBprerestart\fR, \fBrestart\fR, \fBpostrestart\fR: -Run by the \fBnpm restart\fP command\. Note: \fBnpm restart\fP will run the -stop and start scripts if no \fBrestart\fP script is provided\. +NOTE: "\fBnpm run pack\fP" is NOT the same as "\fBnpm pack\fP"\. "\fBnpm run pack\fP" is an arbitrary user defined script name, where as, "\fBnpm pack\fP" is a CLI defined command\. + +.RE +.P +\fBpostpack\fR +.RS 0 .IP \(bu 2 -\fBpreshrinkwrap\fR, \fBshrinkwrap\fR, \fBpostshrinkwrap\fR: -Run by the \fBnpm shrinkwrap\fP command\. +Runs AFTER the tarball has been generated and moved to its final destination\. .RE +.SS Prepare and Prepublish .P -Additionally, arbitrary scripts can be executed by running \fBnpm -run\-script \fP\|\. \fIPre\fR and \fIpost\fR commands with matching -names will be run for those as well (e\.g\. \fBpremyscript\fP, \fBmyscript\fP, -\fBpostmyscript\fP)\. Scripts from dependencies can be run with -\fBnpm explore \-\- npm run \fP\|\. -.SS Prepublish and Prepare -.SS Deprecation Note -.P -Since \fBnpm@1\.1\.71\fP, the npm CLI has run the \fBprepublish\fP script for both \fBnpm -publish\fP and \fBnpm install\fP, because it's a convenient way to prepare a package -for use (some common use cases are described in the section below)\. It has -also turned out to be, in practice, very -confusing \fIhttps://github\.com/npm/npm/issues/10074\fR\|\. As of \fBnpm@4\.0\.0\fP, a new -event has been introduced, \fBprepare\fP, that preserves this existing behavior\. A -\fInew\fR event, \fBprepublishOnly\fP has been added as a transitional strategy to -allow users to avoid the confusing behavior of existing npm versions and only -run on \fBnpm publish\fP (for instance, running the tests one last time to ensure -they're in good shape)\. -.P -See https://github\.com/npm/npm/issues/10074 for a much lengthier -justification, with further reading, for this change\. -.SS Use Cases -.P -If you need to perform operations on your package before it is used, in a way -that is not dependent on the operating system or architecture of the -target system, use a \fBprepublish\fP script\. This includes -tasks such as: +\fBDeprecation Note: prepublish\fR +.P +Since \fBnpm@1\.1\.71\fP, the npm CLI has run the \fBprepublish\fP script for both \fBnpm publish\fP and \fBnpm install\fP, because it's a convenient way to prepare a package for use (some common use cases are described in the section below)\. It has also turned out to be, in practice, very confusing \fIhttps://github\.com/npm/npm/issues/10074\fR\|\. As of \fBnpm@4\.0\.0\fP, a new event has been introduced, \fBprepare\fP, that preserves this existing behavior\. A \fInew\fR event, \fBprepublishOnly\fP has been added as a transitional strategy to allow users to avoid the confusing behavior of existing npm versions and only run on \fBnpm publish\fP (for instance, running the tests one last time to ensure they're in good shape)\. +.P +See https://github\.com/npm/npm/issues/10074 for a much lengthier justification, with further reading, for this change\. +.P +\fBUse Cases\fR +.P +If you need to perform operations on your package before it is used, in a way that is not dependent on the operating system or architecture of the target system, use a \fBprepublish\fP script\. This includes tasks such as: .RS 0 .IP \(bu 2 Compiling CoffeeScript source code into JavaScript\. @@ -106,9 +93,7 @@ Fetching remote resources that your package will use\. .RE .P -The advantage of doing these things at \fBprepublish\fP time is that they can be done once, in a -single place, thus reducing complexity and variability\. -Additionally, this means that: +The advantage of doing these things at \fBprepublish\fP time is that they can be done once, in a single place, thus reducing complexity and variability\. Additionally, this means that: .RS 0 .IP \(bu 2 You can depend on \fBcoffee\-script\fP as a \fBdevDependency\fP, and thus @@ -120,6 +105,60 @@ the size for your users\. You don't need to rely on your users having \fBcurl\fP or \fBwget\fP or other system tools on the target machines\. +.RE +.SS Life Cycle Operation Order +.SS npm help \fBpublish\fP +.RS 0 +.IP \(bu 2 +\fBprepublishOnly\fP +.IP \(bu 2 +\fBprepare\fP +.IP \(bu 2 +\fBprepublish\fP +.IP \(bu 2 +\fBpublish\fP +.IP \(bu 2 +\fBpostpublish\fP + +.RE +.SS npm help \fBpack\fP +.RS 0 +.IP \(bu 2 +\fBprepack\fP +.IP \(bu 2 +\fBpostpack\fP + +.RE +.SS npm help \fBinstall\fP +.RS 0 +.IP \(bu 2 +\fBpreinstall\fP +.IP \(bu 2 +\fBinstall\fP +.IP \(bu 2 +\fBpostinstall\fP + +.RE +.P +Also triggers +.RS 0 +.IP \(bu 2 +\fBprepublish\fP (when on local) +.IP \(bu 2 +\fBprepare\fP (when on local) + +.RE +.SS npm help \fBstart\fP +.P +\fBnpm run start\fP has an \fBnpm start\fP shorthand\. +.RS 0 +.IP \(bu 2 +\fBprestart\fP +.IP \(bu 2 +\fBstart\fP +.IP \(bu 2 +\fBpoststart\fP + .RE .SS Default Values .P @@ -230,7 +269,7 @@ For example, if your package\.json contains this: .nf { "scripts" : { "install" : "scripts/install\.js" - , "postinstall" : "scripts/install\.js" + , "postinstall" : "scripts/postinstall\.js" , "uninstall" : "scripts/uninstall\.js" } } diff --git a/deps/npm/man/man7/semver.7 b/deps/npm/man/man7/semver.7 index 23d513d4238b28..419716a83d737a 100644 --- a/deps/npm/man/man7/semver.7 +++ b/deps/npm/man/man7/semver.7 @@ -1,4 +1,4 @@ -.TH "SEMVER" "7" "December 2019" "" "" +.TH "SEMVER" "7" "March 2020" "" "" .SH "NAME" \fBsemver\fR \- The semantic versioner for npm .SH Install diff --git a/deps/npm/node_modules/are-we-there-yet/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/are-we-there-yet/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/are-we-there-yet/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/bcrypt-pbkdf/CONTRIBUTING.md b/deps/npm/node_modules/bcrypt-pbkdf/CONTRIBUTING.md deleted file mode 100644 index 401d34ed5c7a3f..00000000000000 --- a/deps/npm/node_modules/bcrypt-pbkdf/CONTRIBUTING.md +++ /dev/null @@ -1,13 +0,0 @@ -# Contributing - -This repository uses [cr.joyent.us](https://cr.joyent.us) (Gerrit) for new -changes. Anyone can submit changes. To get started, see the [cr.joyent.us user -guide](https://github.com/joyent/joyent-gerrit/blob/master/docs/user/README.md). -This repo does not use GitHub pull requests. - -See the [Joyent Engineering -Guidelines](https://github.com/joyent/eng/blob/master/docs/index.md) for general -best practices expected in this repository. - -If you're changing something non-trivial or user-facing, you may want to submit -an issue first. diff --git a/deps/npm/node_modules/bin-links/CHANGELOG.md b/deps/npm/node_modules/bin-links/CHANGELOG.md index 697e3c53559b40..e7b640c08d13fe 100644 --- a/deps/npm/node_modules/bin-links/CHANGELOG.md +++ b/deps/npm/node_modules/bin-links/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [1.1.7](https://github.com/npm/bin-links/compare/v1.1.6...v1.1.7) (2019-12-26) + + +### Bug Fixes + +* resolve folder that is passed in ([0bbd303](https://github.com/npm/bin-links/commit/0bbd303)) + + + ## [1.1.6](https://github.com/npm/bin-links/compare/v1.1.5...v1.1.6) (2019-12-11) diff --git a/deps/npm/node_modules/bin-links/index.js b/deps/npm/node_modules/bin-links/index.js index 4f6d3c055c02ee..79c2cb585bd73e 100644 --- a/deps/npm/node_modules/bin-links/index.js +++ b/deps/npm/node_modules/bin-links/index.js @@ -18,6 +18,7 @@ module.exports = BB.promisify(binLinks) function binLinks (pkg, folder, global, opts, cb) { pkg = normalize(pkg) + folder = path.resolve(folder) // if it's global, and folder is in {prefix}/node_modules, // then bins are in {prefix}/bin diff --git a/deps/npm/node_modules/bin-links/package.json b/deps/npm/node_modules/bin-links/package.json index a4d2c02226e5f1..45393d11c5fc87 100644 --- a/deps/npm/node_modules/bin-links/package.json +++ b/deps/npm/node_modules/bin-links/package.json @@ -1,19 +1,19 @@ { - "_from": "bin-links@1.1.6", - "_id": "bin-links@1.1.6", + "_from": "bin-links@1.1.7", + "_id": "bin-links@1.1.7", "_inBundle": false, - "_integrity": "sha512-b5rV3uVyrlrJWLI3mawUUf5t2f9mCEQm/TqT5zNj6DPYhYDZaNp0AYaYd/CVASkSEklayNDLliZHVdo2J3niPw==", + "_integrity": "sha512-/eaLaTu7G7/o7PV04QPy1HRT65zf+1tFkPGv0sPTV0tRwufooYBQO3zrcyGgm+ja+ZtBf2GEuKjDRJ2pPG+yqA==", "_location": "/bin-links", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "bin-links@1.1.6", + "raw": "bin-links@1.1.7", "name": "bin-links", "escapedName": "bin-links", - "rawSpec": "1.1.6", + "rawSpec": "1.1.7", "saveSpec": null, - "fetchSpec": "1.1.6" + "fetchSpec": "1.1.7" }, "_requiredBy": [ "#USER", @@ -21,10 +21,10 @@ "/libcipm", "/libnpm" ], - "_resolved": "https://registry.npmjs.org/bin-links/-/bin-links-1.1.6.tgz", - "_shasum": "30d33e810829305e5e61b90cfcb9a3a4f65eb516", - "_spec": "bin-links@1.1.6", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/bin-links/-/bin-links-1.1.7.tgz", + "_shasum": "34b79ea9d0e575d7308afeff0c6b2fc24c793359", + "_spec": "bin-links@1.1.7", + "_where": "/Users/mperrotte/npminc/cli", "author": { "name": "Mike Sherov" }, @@ -77,5 +77,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "1.1.6" + "version": "1.1.7" } diff --git a/deps/npm/node_modules/chownr/chownr.js b/deps/npm/node_modules/chownr/chownr.js index 9f04393b7f498a..0d409321696540 100644 --- a/deps/npm/node_modules/chownr/chownr.js +++ b/deps/npm/node_modules/chownr/chownr.js @@ -7,10 +7,30 @@ const LCHOWN = fs.lchown ? 'lchown' : 'chown' /* istanbul ignore next */ const LCHOWNSYNC = fs.lchownSync ? 'lchownSync' : 'chownSync' +/* istanbul ignore next */ const needEISDIRHandled = fs.lchown && !process.version.match(/v1[1-9]+\./) && !process.version.match(/v10\.[6-9]/) +const lchownSync = (path, uid, gid) => { + try { + return fs[LCHOWNSYNC](path, uid, gid) + } catch (er) { + if (er.code !== 'ENOENT') + throw er + } +} + +/* istanbul ignore next */ +const chownSync = (path, uid, gid) => { + try { + return fs.chownSync(path, uid, gid) + } catch (er) { + if (er.code !== 'ENOENT') + throw er + } +} + /* istanbul ignore next */ const handleEISDIR = needEISDIRHandled ? (path, uid, gid, cb) => er => { @@ -28,14 +48,14 @@ const handleEISDIR = const handleEISDirSync = needEISDIRHandled ? (path, uid, gid) => { try { - return fs[LCHOWNSYNC](path, uid, gid) + return lchownSync(path, uid, gid) } catch (er) { if (er.code !== 'EISDIR') throw er - fs.chownSync(path, uid, gid) + chownSync(path, uid, gid) } } - : (path, uid, gid) => fs[LCHOWNSYNC](path, uid, gid) + : (path, uid, gid) => lchownSync(path, uid, gid) // fs.readdir could only accept an options object as of node v6 const nodeVersion = process.version @@ -45,11 +65,19 @@ let readdirSync = (path, options) => fs.readdirSync(path, options) if (/^v4\./.test(nodeVersion)) readdir = (path, options, cb) => fs.readdir(path, cb) +const chown = (cpath, uid, gid, cb) => { + fs[LCHOWN](cpath, uid, gid, handleEISDIR(cpath, uid, gid, er => { + // Skip ENOENT error + cb(er && er.code !== 'ENOENT' ? er : null) + })) +} + const chownrKid = (p, child, uid, gid, cb) => { if (typeof child === 'string') return fs.lstat(path.resolve(p, child), (er, stats) => { + // Skip ENOENT error if (er) - return cb(er) + return cb(er.code !== 'ENOENT' ? er : null) stats.name = child chownrKid(p, stats, uid, gid, cb) }) @@ -59,11 +87,11 @@ const chownrKid = (p, child, uid, gid, cb) => { if (er) return cb(er) const cpath = path.resolve(p, child.name) - fs[LCHOWN](cpath, uid, gid, handleEISDIR(cpath, uid, gid, cb)) + chown(cpath, uid, gid, cb) }) } else { const cpath = path.resolve(p, child.name) - fs[LCHOWN](cpath, uid, gid, handleEISDIR(cpath, uid, gid, cb)) + chown(cpath, uid, gid, cb) } } @@ -72,10 +100,14 @@ const chownr = (p, uid, gid, cb) => { readdir(p, { withFileTypes: true }, (er, children) => { // any error other than ENOTDIR or ENOTSUP means it's not readable, // or doesn't exist. give up. - if (er && er.code !== 'ENOTDIR' && er.code !== 'ENOTSUP') - return cb(er) + if (er) { + if (er.code === 'ENOENT') + return cb() + else if (er.code !== 'ENOTDIR' && er.code !== 'ENOTSUP') + return cb(er) + } if (er || !children.length) - return fs[LCHOWN](p, uid, gid, handleEISDIR(p, uid, gid, cb)) + return chown(p, uid, gid, cb) let len = children.length let errState = null @@ -85,7 +117,7 @@ const chownr = (p, uid, gid, cb) => { if (er) return cb(errState = er) if (-- len === 0) - return fs[LCHOWN](p, uid, gid, handleEISDIR(p, uid, gid, cb)) + return chown(p, uid, gid, cb) } children.forEach(child => chownrKid(p, child, uid, gid, then)) @@ -94,9 +126,16 @@ const chownr = (p, uid, gid, cb) => { const chownrKidSync = (p, child, uid, gid) => { if (typeof child === 'string') { - const stats = fs.lstatSync(path.resolve(p, child)) - stats.name = child - child = stats + try { + const stats = fs.lstatSync(path.resolve(p, child)) + stats.name = child + child = stats + } catch (er) { + if (er.code === 'ENOENT') + return + else + throw er + } } if (child.isDirectory()) @@ -110,12 +149,15 @@ const chownrSync = (p, uid, gid) => { try { children = readdirSync(p, { withFileTypes: true }) } catch (er) { - if (er && er.code === 'ENOTDIR' && er.code !== 'ENOTSUP') + if (er.code === 'ENOENT') + return + else if (er.code === 'ENOTDIR' || er.code === 'ENOTSUP') return handleEISDirSync(p, uid, gid) - throw er + else + throw er } - if (children.length) + if (children && children.length) children.forEach(child => chownrKidSync(p, child, uid, gid)) return handleEISDirSync(p, uid, gid) diff --git a/deps/npm/node_modules/chownr/package.json b/deps/npm/node_modules/chownr/package.json index cc48dc912cd7ec..5c125f8447b546 100644 --- a/deps/npm/node_modules/chownr/package.json +++ b/deps/npm/node_modules/chownr/package.json @@ -1,19 +1,19 @@ { - "_from": "chownr@1.1.3", - "_id": "chownr@1.1.3", + "_from": "chownr@1.1.4", + "_id": "chownr@1.1.4", "_inBundle": false, - "_integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==", + "_integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "_location": "/chownr", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "chownr@1.1.3", + "raw": "chownr@1.1.4", "name": "chownr", "escapedName": "chownr", - "rawSpec": "1.1.3", + "rawSpec": "1.1.4", "saveSpec": null, - "fetchSpec": "1.1.3" + "fetchSpec": "1.1.4" }, "_requiredBy": [ "#USER", @@ -23,10 +23,10 @@ "/pacote", "/tar" ], - "_resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", - "_shasum": "42d837d5239688d55f303003a508230fa6727142", - "_spec": "chownr@1.1.3", - "_where": "/Users/mperrotte/npminc/cli", + "_resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "_shasum": "6fc9d7b42d32a583596337666e7d08084da2cc6b", + "_spec": "chownr@1.1.4", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -40,8 +40,8 @@ "description": "like `chown -R`", "devDependencies": { "mkdirp": "0.3", - "rimraf": "", - "tap": "^12.0.1" + "rimraf": "^2.7.1", + "tap": "^14.10.6" }, "files": [ "chownr.js" @@ -55,10 +55,13 @@ "url": "git://github.com/isaacs/chownr.git" }, "scripts": { - "postpublish": "git push origin --follow-tags", "postversion": "npm publish", + "prepublishOnly": "git push origin --follow-tags", "preversion": "npm test", - "test": "tap test/*.js --cov" + "test": "tap" }, - "version": "1.1.3" + "tap": { + "check-coverage": true + }, + "version": "1.1.4" } diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/deep-extend/CHANGELOG.md b/deps/npm/node_modules/deep-extend/CHANGELOG.md index 3932f8f024e5ea..dd13ec1311b2b6 100644 --- a/deps/npm/node_modules/deep-extend/CHANGELOG.md +++ b/deps/npm/node_modules/deep-extend/CHANGELOG.md @@ -1,6 +1,14 @@ Changelog ========= +v0.6.0 +------ + +- Updated "devDependencies" versions to fix vulnerability alerts +- Dropped support of io.js and node.js v0.12.x and lower since new versions of + "devDependencies" couldn't work with those old node.js versions + (minimal supported version of node.js now is v4.0.0) + v0.5.1 ------ diff --git a/deps/npm/node_modules/deep-extend/README.md b/deps/npm/node_modules/deep-extend/README.md index cf84f70dedcbe0..67c7fc085903bc 100644 --- a/deps/npm/node_modules/deep-extend/README.md +++ b/deps/npm/node_modules/deep-extend/README.md @@ -7,8 +7,6 @@ Recursive object extending. [![NPM](https://nodei.co/npm/deep-extend.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/deep-extend/) -[![NPM](https://nodei.co/npm-dl/deep-extend.png?height=3)](https://nodei.co/npm/deep-extend/) - Install ------- diff --git a/deps/npm/node_modules/deep-extend/package.json b/deps/npm/node_modules/deep-extend/package.json index 3aaa6742ff9e2b..15386bcffeaafd 100644 --- a/deps/npm/node_modules/deep-extend/package.json +++ b/deps/npm/node_modules/deep-extend/package.json @@ -1,27 +1,27 @@ { - "_from": "deep-extend@^0.5.1", - "_id": "deep-extend@0.5.1", + "_from": "deep-extend@^0.6.0", + "_id": "deep-extend@0.6.0", "_inBundle": false, - "_integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "_integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "_location": "/deep-extend", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "deep-extend@^0.5.1", + "raw": "deep-extend@^0.6.0", "name": "deep-extend", "escapedName": "deep-extend", - "rawSpec": "^0.5.1", + "rawSpec": "^0.6.0", "saveSpec": null, - "fetchSpec": "^0.5.1" + "fetchSpec": "^0.6.0" }, "_requiredBy": [ "/rc" ], - "_resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "_shasum": "b894a9dd90d3023fbf1c55a394fb858eb2066f1f", - "_spec": "deep-extend@^0.5.1", - "_where": "/Users/rebecca/code/npm/node_modules/rc", + "_resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "_shasum": "c4fa7c95404a17a9c3e8ca7e1537312b736330ac", + "_spec": "deep-extend@^0.6.0", + "_where": "/Users/ruyadorno/Documents/workspace/cli/node_modules/rc", "author": { "name": "Viacheslav Lotsmanov", "email": "lotsmanov89@gmail.com" @@ -51,12 +51,11 @@ "deprecated": false, "description": "Recursive object extending", "devDependencies": { - "mocha": "2.2.1", - "should": "5.2.0" + "mocha": "5.2.0", + "should": "13.2.1" }, "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" + "node": ">=4.0.0" }, "files": [ "index.js", @@ -89,5 +88,5 @@ "scripts": { "test": "mocha" }, - "version": "0.5.1" + "version": "0.6.0" } diff --git a/deps/npm/node_modules/duplexify/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/duplexify/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/duplexify/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/env-paths/index.d.ts b/deps/npm/node_modules/env-paths/index.d.ts new file mode 100644 index 00000000000000..e57fa8f661f1ff --- /dev/null +++ b/deps/npm/node_modules/env-paths/index.d.ts @@ -0,0 +1,69 @@ +declare namespace envPaths { + export interface Options { + /** + __Don't use this option unless you really have to!__ + + Suffix appended to the project name to avoid name conflicts with native apps. Pass an empty string to disable it. + + @default 'nodejs' + */ + readonly suffix?: string; + } + + export interface Paths { + /** + Directory for data files. + */ + readonly data: string; + + /** + Directory for data files. + */ + readonly config: string; + + /** + Directory for non-essential data files. + */ + readonly cache: string; + + /** + Directory for log files. + */ + readonly log: string; + + /** + Directory for temporary files. + */ + readonly temp: string; + } +} + +declare const envPaths: { + /** + Get paths for storing things like data, config, cache, etc. + + @param name - Name of your project. Used to generate the paths. + @returns The paths to use for your project on current OS. + + @example + ``` + import envPaths = require('env-paths'); + + const paths = envPaths('MyApp'); + + paths.data; + //=> '/home/sindresorhus/.local/share/MyApp-nodejs' + + paths.config + //=> '/home/sindresorhus/.config/MyApp-nodejs' + ``` + */ + (name: string, options?: envPaths.Options): envPaths.Paths; + + // TODO: Remove this for the next major release, refactor the whole definition to: + // declare function envPaths(name: string, options?: envPaths.Options): envPaths.Paths; + // export = envPaths; + default: typeof envPaths; +}; + +export = envPaths; diff --git a/deps/npm/node_modules/env-paths/index.js b/deps/npm/node_modules/env-paths/index.js index 4a04b712ff8a67..7e7b50baa4416f 100644 --- a/deps/npm/node_modules/env-paths/index.js +++ b/deps/npm/node_modules/env-paths/index.js @@ -4,7 +4,7 @@ const os = require('os'); const homedir = os.homedir(); const tmpdir = os.tmpdir(); -const env = process.env; +const {env} = process; const macos = name => { const library = path.join(homedir, 'Library'); @@ -19,14 +19,15 @@ const macos = name => { }; const windows = name => { - const appData = env.LOCALAPPDATA || path.join(homedir, 'AppData', 'Local'); + const appData = env.APPDATA || path.join(homedir, 'AppData', 'Roaming'); + const localAppData = env.LOCALAPPDATA || path.join(homedir, 'AppData', 'Local'); return { - // data/config/cache/log are invented by me as Windows isn't opinionated about this - data: path.join(appData, name, 'Data'), + // Data/config/cache/log are invented by me as Windows isn't opinionated about this + data: path.join(localAppData, name, 'Data'), config: path.join(appData, name, 'Config'), - cache: path.join(appData, name, 'Cache'), - log: path.join(appData, name, 'Log'), + cache: path.join(localAppData, name, 'Cache'), + log: path.join(localAppData, name, 'Log'), temp: path.join(tmpdir, name) }; }; @@ -45,16 +46,16 @@ const linux = name => { }; }; -module.exports = (name, opts) => { +const envPaths = (name, options) => { if (typeof name !== 'string') { throw new TypeError(`Expected string, got ${typeof name}`); } - opts = Object.assign({suffix: 'nodejs'}, opts); + options = Object.assign({suffix: 'nodejs'}, options); - if (opts.suffix) { - // add suffix to prevent possible conflict with native apps - name += `-${opts.suffix}`; + if (options.suffix) { + // Add suffix to prevent possible conflict with native apps + name += `-${options.suffix}`; } if (process.platform === 'darwin') { @@ -67,3 +68,7 @@ module.exports = (name, opts) => { return linux(name); }; + +module.exports = envPaths; +// TODO: Remove this for the next major release +module.exports.default = envPaths; diff --git a/deps/npm/node_modules/env-paths/license b/deps/npm/node_modules/env-paths/license index 654d0bfe943437..e7af2f77107d73 100644 --- a/deps/npm/node_modules/env-paths/license +++ b/deps/npm/node_modules/env-paths/license @@ -1,21 +1,9 @@ -The MIT License (MIT) +MIT License Copyright (c) Sindre Sorhus (sindresorhus.com) -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: +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 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. +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. diff --git a/deps/npm/node_modules/env-paths/package.json b/deps/npm/node_modules/env-paths/package.json index 3b1dfb74d8041a..6af6711479dff7 100644 --- a/deps/npm/node_modules/env-paths/package.json +++ b/deps/npm/node_modules/env-paths/package.json @@ -1,27 +1,27 @@ { - "_from": "env-paths@^1.0.0", - "_id": "env-paths@1.0.0", + "_from": "env-paths@^2.2.0", + "_id": "env-paths@2.2.0", "_inBundle": false, - "_integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=", + "_integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", "_location": "/env-paths", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "env-paths@^1.0.0", + "raw": "env-paths@^2.2.0", "name": "env-paths", "escapedName": "env-paths", - "rawSpec": "^1.0.0", + "rawSpec": "^2.2.0", "saveSpec": null, - "fetchSpec": "^1.0.0" + "fetchSpec": "^2.2.0" }, "_requiredBy": [ "/node-gyp" ], - "_resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz", - "_shasum": "4168133b42bb05c38a35b1ae4397c8298ab369e0", - "_spec": "env-paths@^1.0.0", - "_where": "/Users/isaacs/dev/npm/cli/node_modules/node-gyp", + "_resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", + "_shasum": "cdca557dc009152917d6166e2febe1f039685e43", + "_spec": "env-paths@^2.2.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/node-gyp", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -34,14 +34,16 @@ "deprecated": false, "description": "Get paths for storing things like data, config, cache, etc", "devDependencies": { - "ava": "*", - "xo": "*" + "ava": "^1.4.1", + "tsd": "^0.7.1", + "xo": "^0.24.0" }, "engines": { - "node": ">=4" + "node": ">=6" }, "files": [ - "index.js" + "index.js", + "index.d.ts" ], "homepage": "https://github.com/sindresorhus/env-paths#readme", "keywords": [ @@ -69,10 +71,7 @@ "url": "git+https://github.com/sindresorhus/env-paths.git" }, "scripts": { - "test": "xo && ava" + "test": "xo && ava && tsd" }, - "version": "1.0.0", - "xo": { - "esnext": true - } + "version": "2.2.0" } diff --git a/deps/npm/node_modules/env-paths/readme.md b/deps/npm/node_modules/env-paths/readme.md index 0bdc2ac1439b70..ec3439316f9a1b 100644 --- a/deps/npm/node_modules/env-paths/readme.md +++ b/deps/npm/node_modules/env-paths/readme.md @@ -2,11 +2,13 @@ > Get paths for storing things like data, config, cache, etc +Uses the correct OS-specific paths. Most developers get this wrong. + ## Install ``` -$ npm install --save env-paths +$ npm install env-paths ``` @@ -14,6 +16,7 @@ $ npm install --save env-paths ```js const envPaths = require('env-paths'); + const paths = envPaths('MyApp'); paths.data; @@ -36,6 +39,8 @@ Name of your project. Used to generate the paths. #### options +Type: `Object` + ##### suffix Type: `string`
    diff --git a/deps/npm/node_modules/flush-write-stream/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/flush-write-stream/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/flush-write-stream/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/from2/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/from2/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/from2/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/fs-write-stream-atomic/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/fs-write-stream-atomic/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/fs-write-stream-atomic/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/get-caller-file/LICENSE.md b/deps/npm/node_modules/get-caller-file/LICENSE.md new file mode 100644 index 00000000000000..bf3e1c071bae44 --- /dev/null +++ b/deps/npm/node_modules/get-caller-file/LICENSE.md @@ -0,0 +1,6 @@ +ISC License (ISC) +Copyright 2018 Stefan Penner + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/deps/npm/node_modules/get-caller-file/README.md b/deps/npm/node_modules/get-caller-file/README.md index c32df54c391352..194492736bc4fe 100644 --- a/deps/npm/node_modules/get-caller-file/README.md +++ b/deps/npm/node_modules/get-caller-file/README.md @@ -1,4 +1,4 @@ # get-caller-file -[![Build Status](https://travis-ci.org/ember-cli/ember-cli.svg?branch=master)](https://travis-ci.org/ember-cli/ember-cli) +[![Build Status](https://travis-ci.org/stefanpenner/get-caller-file.svg?branch=master)](https://travis-ci.org/stefanpenner/get-caller-file) [![Build status](https://ci.appveyor.com/api/projects/status/ol2q94g1932cy14a/branch/master?svg=true)](https://ci.appveyor.com/project/embercli/get-caller-file/branch/master) diff --git a/deps/npm/node_modules/get-caller-file/package.json b/deps/npm/node_modules/get-caller-file/package.json index d5c90d52fca1e5..e853deec1b0563 100644 --- a/deps/npm/node_modules/get-caller-file/package.json +++ b/deps/npm/node_modules/get-caller-file/package.json @@ -1,8 +1,8 @@ { "_from": "get-caller-file@^1.0.1", - "_id": "get-caller-file@1.0.2", + "_id": "get-caller-file@1.0.3", "_inBundle": false, - "_integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "_integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "_location": "/get-caller-file", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/yargs" ], - "_resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "_shasum": "f702e63127e7e231c160a80c1554acb70d5047e5", + "_resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "_shasum": "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a", "_spec": "get-caller-file@^1.0.1", - "_where": "/Users/rebecca/code/npm/node_modules/yargs", + "_where": "/Users/mperrotte/npminc/cli/node_modules/yargs", "author": { "name": "Stefan Penner" }, @@ -30,11 +30,11 @@ }, "bundleDependencies": false, "deprecated": false, - "description": "[![Build Status](https://travis-ci.org/ember-cli/ember-cli.svg?branch=master)](https://travis-ci.org/ember-cli/ember-cli) [![Build status](https://ci.appveyor.com/api/projects/status/ol2q94g1932cy14a/branch/master?svg=true)](https://ci.appveyor.com/project/embercli/get-caller-file/branch/master)", + "description": "[![Build Status](https://travis-ci.org/stefanpenner/get-caller-file.svg?branch=master)](https://travis-ci.org/stefanpenner/get-caller-file) [![Build status](https://ci.appveyor.com/api/projects/status/ol2q94g1932cy14a/branch/master?svg=true)](https://ci.appveyor.com/project/embercli/get-caller-file/branch/master)", "devDependencies": { - "chai": "^3.4.1", + "chai": "^4.1.2", "ensure-posix-path": "^1.0.1", - "mocha": "^2.3.4" + "mocha": "^5.2.0" }, "directories": { "test": "tests" @@ -54,5 +54,5 @@ "test": "mocha test", "test:debug": "mocha test" }, - "version": "1.0.2" + "version": "1.0.3" } diff --git a/deps/npm/node_modules/glob/README.md b/deps/npm/node_modules/glob/README.md index e71b967ea28809..0916a48255cd6f 100644 --- a/deps/npm/node_modules/glob/README.md +++ b/deps/npm/node_modules/glob/README.md @@ -371,3 +371,5 @@ npm run bench # to profile javascript npm run prof ``` + +![](oh-my-glob.gif) diff --git a/deps/npm/node_modules/glob/package.json b/deps/npm/node_modules/glob/package.json index 788801e299e45f..0e1fa5805bccbc 100644 --- a/deps/npm/node_modules/glob/package.json +++ b/deps/npm/node_modules/glob/package.json @@ -1,23 +1,24 @@ { - "_from": "glob@7.1.4", - "_id": "glob@7.1.4", + "_from": "glob@7.1.6", + "_id": "glob@7.1.6", "_inBundle": false, - "_integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "_integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "_location": "/glob", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "glob@7.1.4", + "raw": "glob@7.1.6", "name": "glob", "escapedName": "glob", - "rawSpec": "7.1.4", + "rawSpec": "7.1.6", "saveSpec": null, - "fetchSpec": "7.1.4" + "fetchSpec": "7.1.6" }, "_requiredBy": [ "#USER", "/", + "/cacache", "/deglob", "/eslint", "/init-package-json", @@ -30,10 +31,10 @@ "/tap-mocha-reporter", "/test-exclude" ], - "_resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "_shasum": "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255", - "_spec": "glob@7.1.4", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "_shasum": "141f33b81a7c2492e125594307480c46679278a6", + "_spec": "glob@7.1.6", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -67,6 +68,9 @@ "sync.js", "common.js" ], + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, "homepage": "https://github.com/isaacs/node-glob#readme", "license": "ISC", "main": "glob.js", @@ -84,5 +88,5 @@ "test": "tap test/*.js --cov", "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js" }, - "version": "7.1.4" + "version": "7.1.6" } diff --git a/deps/npm/node_modules/hosted-git-info/CHANGELOG.md b/deps/npm/node_modules/hosted-git-info/CHANGELOG.md index 479f24b6414eb7..4f86601e029e95 100644 --- a/deps/npm/node_modules/hosted-git-info/CHANGELOG.md +++ b/deps/npm/node_modules/hosted-git-info/CHANGELOG.md @@ -2,6 +2,32 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [2.8.8](https://github.com/npm/hosted-git-info/compare/v2.8.7...v2.8.8) (2020-02-29) + + +### Bug Fixes + +* [#61](https://github.com/npm/hosted-git-info/issues/61) & [#65](https://github.com/npm/hosted-git-info/issues/65) addressing issues w/ url.URL implmentation which regressed node 6 support ([5038b18](https://github.com/npm/hosted-git-info/commit/5038b18)), closes [#66](https://github.com/npm/hosted-git-info/issues/66) + + + + +## [2.8.7](https://github.com/npm/hosted-git-info/compare/v2.8.6...v2.8.7) (2020-02-26) + + +### Bug Fixes + +* Do not attempt to use url.URL when unavailable ([2d0bb66](https://github.com/npm/hosted-git-info/commit/2d0bb66)), closes [#61](https://github.com/npm/hosted-git-info/issues/61) [#62](https://github.com/npm/hosted-git-info/issues/62) +* Do not pass scp-style URLs to the WhatWG url.URL ([f2cdfcf](https://github.com/npm/hosted-git-info/commit/f2cdfcf)), closes [#60](https://github.com/npm/hosted-git-info/issues/60) + + + + +## [2.8.6](https://github.com/npm/hosted-git-info/compare/v2.8.5...v2.8.6) (2020-02-25) + + + ## [2.8.5](https://github.com/npm/hosted-git-info/compare/v2.8.4...v2.8.5) (2019-10-07) diff --git a/deps/npm/node_modules/hosted-git-info/index.js b/deps/npm/node_modules/hosted-git-info/index.js index fc959cb0434c82..21e53fe3724be1 100644 --- a/deps/npm/node_modules/hosted-git-info/index.js +++ b/deps/npm/node_modules/hosted-git-info/index.js @@ -47,7 +47,7 @@ function fromUrl (giturl, opts) { var gitHostInfo = gitHosts[gitHostName] var auth = null if (parsed.auth && authProtocols[parsed.protocol]) { - auth = decodeURIComponent(parsed.auth) + auth = parsed.auth } var committish = parsed.hash ? decodeURIComponent(parsed.hash.substr(1)) : null var user = null @@ -106,7 +106,30 @@ function fixupUnqualifiedGist (giturl) { function parseGitUrl (giturl) { var matched = giturl.match(/^([^@]+)@([^:/]+):[/]?((?:[^/]+[/])?[^/]+?)(?:[.]git)?(#.*)?$/) - if (!matched) return url.parse(giturl) + if (!matched) { + var legacy = url.parse(giturl) + // If we don't have url.URL, then sorry, this is just not fixable. + // This affects Node <= 6.12. + if (legacy.auth && typeof url.URL === 'function') { + // git urls can be in the form of scp-style/ssh-connect strings, like + // git+ssh://user@host.com:some/path, which the legacy url parser + // supports, but WhatWG url.URL class does not. However, the legacy + // parser de-urlencodes the username and password, so something like + // https://user%3An%40me:p%40ss%3Aword@x.com/ becomes + // https://user:n@me:p@ss:word@x.com/ which is all kinds of wrong. + // Pull off just the auth and host, so we dont' get the confusing + // scp-style URL, then pass that to the WhatWG parser to get the + // auth properly escaped. + var authmatch = giturl.match(/[^@]+@[^:/]+/) + /* istanbul ignore else - this should be impossible */ + if (authmatch) { + var whatwg = new url.URL(authmatch[0]) + legacy.auth = whatwg.username || '' + if (whatwg.password) legacy.auth += ':' + whatwg.password + } + } + return legacy + } return { protocol: 'git+ssh:', slashes: true, diff --git a/deps/npm/node_modules/hosted-git-info/package.json b/deps/npm/node_modules/hosted-git-info/package.json index 458b323a405189..8d9c2b2046c742 100644 --- a/deps/npm/node_modules/hosted-git-info/package.json +++ b/deps/npm/node_modules/hosted-git-info/package.json @@ -1,19 +1,19 @@ { - "_from": "hosted-git-info@2.8.5", - "_id": "hosted-git-info@2.8.5", + "_from": "hosted-git-info@2.8.8", + "_id": "hosted-git-info@2.8.8", "_inBundle": false, - "_integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", + "_integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", "_location": "/hosted-git-info", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "hosted-git-info@2.8.5", + "raw": "hosted-git-info@2.8.8", "name": "hosted-git-info", "escapedName": "hosted-git-info", - "rawSpec": "2.8.5", + "rawSpec": "2.8.8", "saveSpec": null, - "fetchSpec": "2.8.5" + "fetchSpec": "2.8.8" }, "_requiredBy": [ "#USER", @@ -21,10 +21,10 @@ "/normalize-package-data", "/npm-package-arg" ], - "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", - "_shasum": "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c", - "_spec": "hosted-git-info@2.8.5", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "_shasum": "7539bd4bc1e0e0a895815a2e0262420b12858488", + "_spec": "hosted-git-info@2.8.8", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "author": { "name": "Rebecca Turner", "email": "me@re-becca.org", @@ -62,11 +62,11 @@ }, "scripts": { "postrelease": "npm publish --tag=ancient-legacy-fixes && git push --follow-tags", + "posttest": "standard", "prerelease": "npm t", - "pretest": "standard", "release": "standard-version -s", - "test": "tap -J --100 --no-esm test/*.js", - "test:coverage": "tap --coverage-report=html -J --100 --no-esm test/*.js" + "test": "tap -J --coverage=90 --no-esm test/*.js", + "test:coverage": "tap --coverage-report=html -J --coverage=90 --no-esm test/*.js" }, - "version": "2.8.5" + "version": "2.8.8" } diff --git a/deps/npm/node_modules/invert-kv/index.js b/deps/npm/node_modules/invert-kv/index.js index 61e21961128f71..27f9cbb8eaf281 100644 --- a/deps/npm/node_modules/invert-kv/index.js +++ b/deps/npm/node_modules/invert-kv/index.js @@ -1,14 +1,14 @@ 'use strict'; -module.exports = function (obj) { - if (typeof obj !== 'object') { +module.exports = object => { + if (typeof object !== 'object') { throw new TypeError('Expected an object'); } - var ret = {}; + const ret = {}; - for (var key in obj) { - var val = obj[key]; - ret[val] = key; + for (const key of Object.keys(object)) { + const value = object[key]; + ret[value] = key; } return ret; diff --git a/deps/npm/node_modules/mimic-fn/license b/deps/npm/node_modules/invert-kv/license similarity index 100% rename from deps/npm/node_modules/mimic-fn/license rename to deps/npm/node_modules/invert-kv/license diff --git a/deps/npm/node_modules/invert-kv/package.json b/deps/npm/node_modules/invert-kv/package.json index c38e09e5d91bac..beb77fa37f6fa7 100644 --- a/deps/npm/node_modules/invert-kv/package.json +++ b/deps/npm/node_modules/invert-kv/package.json @@ -1,43 +1,44 @@ { - "_from": "invert-kv@^1.0.0", - "_id": "invert-kv@1.0.0", + "_from": "invert-kv@^2.0.0", + "_id": "invert-kv@2.0.0", "_inBundle": false, - "_integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "_integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "_location": "/invert-kv", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "invert-kv@^1.0.0", + "raw": "invert-kv@^2.0.0", "name": "invert-kv", "escapedName": "invert-kv", - "rawSpec": "^1.0.0", + "rawSpec": "^2.0.0", "saveSpec": null, - "fetchSpec": "^1.0.0" + "fetchSpec": "^2.0.0" }, "_requiredBy": [ "/lcid" ], - "_resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "_shasum": "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6", - "_spec": "invert-kv@^1.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/lcid", + "_resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "_shasum": "7393f5afa59ec9ff5f67a27620d11c226e3eec02", + "_spec": "invert-kv@^2.0.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/lcid", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", - "url": "http://sindresorhus.com" + "url": "sindresorhus.com" }, "bugs": { "url": "https://github.com/sindresorhus/invert-kv/issues" }, "bundleDependencies": false, "deprecated": false, - "description": "Invert the key/value of an object. Example: {foo: 'bar'} → {bar: 'foo'}", + "description": "Invert the key/value of an object. Example: `{foo: 'bar'}` → `{bar: 'foo'}`", "devDependencies": { - "mocha": "*" + "ava": "*", + "xo": "*" }, "engines": { - "node": ">=0.10.0" + "node": ">=4" }, "files": [ "index.js" @@ -45,10 +46,8 @@ "homepage": "https://github.com/sindresorhus/invert-kv#readme", "keywords": [ "object", - "obj", "key", "value", - "val", "kv", "invert" ], @@ -59,7 +58,7 @@ "url": "git+https://github.com/sindresorhus/invert-kv.git" }, "scripts": { - "test": "mocha" + "test": "xo && ava" }, - "version": "1.0.0" + "version": "2.0.0" } diff --git a/deps/npm/node_modules/invert-kv/readme.md b/deps/npm/node_modules/invert-kv/readme.md index 039fc7cfa25b01..365a97997cac3f 100644 --- a/deps/npm/node_modules/invert-kv/readme.md +++ b/deps/npm/node_modules/invert-kv/readme.md @@ -5,15 +5,15 @@ ## Install -```sh -$ npm install --save invert-kv +``` +$ npm install invert-kv ``` ## Usage ```js -var invertKv = require('invert-kv'); +const invertKv = require('invert-kv'); invertKv({foo: 'bar', unicorn: 'rainbow'}); //=> {bar: 'foo', rainbow: 'unicorn'} @@ -22,4 +22,4 @@ invertKv({foo: 'bar', unicorn: 'rainbow'}); ## License -MIT © [Sindre Sorhus](http://sindresorhus.com) +MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/deps/npm/node_modules/is-ci/.travis.yml b/deps/npm/node_modules/is-ci/.travis.yml deleted file mode 100644 index 21f721050948b7..00000000000000 --- a/deps/npm/node_modules/is-ci/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: node_js -node_js: -- '6' -- '5' -- '4' -- '0.12' -- '0.10' diff --git a/deps/npm/node_modules/is-ci/README.md b/deps/npm/node_modules/is-ci/README.md index 0e49db91bbe4ca..bc3840a220cfbd 100644 --- a/deps/npm/node_modules/is-ci/README.md +++ b/deps/npm/node_modules/is-ci/README.md @@ -6,12 +6,13 @@ server. Please [open an issue](https://github.com/watson/is-ci/issues) if your CI server isn't properly detected :) +[![npm](https://img.shields.io/npm/v/is-ci.svg)](https://www.npmjs.com/package/is-ci) [![Build status](https://travis-ci.org/watson/is-ci.svg?branch=master)](https://travis-ci.org/watson/is-ci) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://github.com/feross/standard) ## Installation -``` +```bash npm install is-ci --save ``` @@ -36,34 +37,14 @@ There's a few ways to do that: - Or provide the full path to the executable, e.g. `./node_modules/.bin/is-ci` -``` +```bash is-ci && echo "This is a CI server" ``` ## Supported CI tools -Officially supported CI servers: - -- [Travis CI](http://travis-ci.org) -- [CircleCI](http://circleci.com) -- [Jenkins CI](https://jenkins-ci.org) -- [Hudson](http://hudson-ci.org) -- [Bamboo](https://www.atlassian.com/software/bamboo) -- [TeamCity](https://www.jetbrains.com/teamcity/) -- [Team Foundation Server](https://www.visualstudio.com/en-us/products/tfs-overview-vs.aspx) -- [GitLab CI](https://about.gitlab.com/gitlab-ci/) -- [Codeship](https://codeship.com) -- [Drone.io](https://drone.io) -- [Magnum CI](https://magnum-ci.com) -- [Semaphore](https://semaphoreci.com) -- [AppVeyor](http://www.appveyor.com) -- [Buildkite](https://buildkite.com) -- [TaskCluster](http://docs.taskcluster.net) -- [GoCD](https://www.go.cd/) -- [Bitbucket Pipelines](https://bitbucket.org/product/features/pipelines) - -Other CI tools using environment variables like `BUILD_ID` or `CI` would be detected as well. +Refer to [ci-info](https://github.com/watson/ci-info#supported-ci-tools) docs for all supported CI's ## License -MIT +[MIT](LICENSE) diff --git a/deps/npm/node_modules/is-ci/package.json b/deps/npm/node_modules/is-ci/package.json index e87ba5d7fd903c..344aa2a1f59525 100644 --- a/deps/npm/node_modules/is-ci/package.json +++ b/deps/npm/node_modules/is-ci/package.json @@ -1,8 +1,8 @@ { "_from": "is-ci@^1.0.10", - "_id": "is-ci@1.1.0", + "_id": "is-ci@1.2.1", "_inBundle": false, - "_integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "_integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", "_location": "/is-ci", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/update-notifier" ], - "_resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", - "_shasum": "247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5", + "_resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", + "_shasum": "e3779c8ee17fccf428488f6e281187f2e632841c", "_spec": "is-ci@^1.0.10", - "_where": "/Users/rebecca/code/npm/node_modules/update-notifier", + "_where": "/Users/ruyadorno/Documents/workspace/cli/node_modules/update-notifier", "author": { "name": "Thomas Watson Steen", "email": "w@tson.dk", @@ -35,17 +35,17 @@ }, "bundleDependencies": false, "coordinates": [ - 56.0093252, - 11.9592058 + 55.778255, + 12.593033 ], "dependencies": { - "ci-info": "^1.0.0" + "ci-info": "^1.5.0" }, "deprecated": false, - "description": "Detect if your code is running on a CI server", + "description": "Detect if the current environment is a CI server", "devDependencies": { "clear-require": "^1.0.1", - "standard": "^10.0.3" + "standard": "^11.0.1" }, "homepage": "https://github.com/watson/is-ci", "keywords": [ @@ -65,5 +65,5 @@ "scripts": { "test": "standard && node test.js" }, - "version": "1.1.0" + "version": "1.2.1" } diff --git a/deps/npm/node_modules/is-ci/test.js b/deps/npm/node_modules/is-ci/test.js deleted file mode 100644 index a9938bbdb8ecfc..00000000000000 --- a/deps/npm/node_modules/is-ci/test.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict' - -var assert = require('assert') -var clearRequire = require('clear-require') - -process.env.CI = 'true' - -var isCI = require('./') -assert(isCI) - -delete process.env.CI -delete process.env.CONTINUOUS_INTEGRATION -delete process.env.BUILD_NUMBER -delete process.env.TRAVIS - -clearRequire('./') -clearRequire('ci-info') -isCI = require('./') -assert(!isCI) diff --git a/deps/npm/node_modules/is-retry-allowed/index.js b/deps/npm/node_modules/is-retry-allowed/index.js index 663ee338fce94c..3bab6c16b26b9b 100644 --- a/deps/npm/node_modules/is-retry-allowed/index.js +++ b/deps/npm/node_modules/is-retry-allowed/index.js @@ -6,7 +6,9 @@ var WHITELIST = [ 'EADDRINUSE', 'ESOCKETTIMEDOUT', 'ECONNREFUSED', - 'EPIPE' + 'EPIPE', + 'EHOSTUNREACH', + 'EAI_AGAIN' ]; var BLACKLIST = [ diff --git a/deps/npm/node_modules/is-retry-allowed/package.json b/deps/npm/node_modules/is-retry-allowed/package.json index e494bb3f7841af..7bae1606a740c7 100644 --- a/deps/npm/node_modules/is-retry-allowed/package.json +++ b/deps/npm/node_modules/is-retry-allowed/package.json @@ -1,8 +1,8 @@ { "_from": "is-retry-allowed@^1.0.0", - "_id": "is-retry-allowed@1.1.0", + "_id": "is-retry-allowed@1.2.0", "_inBundle": false, - "_integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", + "_integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", "_location": "/is-retry-allowed", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/got" ], - "_resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "_shasum": "11a060568b67339444033d0125a61a20d564fb34", + "_resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "_shasum": "d778488bd0a4666a3be8a1482b9f2baafedea8b4", "_spec": "is-retry-allowed@^1.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/got", + "_where": "/Users/ruyadorno/Documents/workspace/cli/node_modules/got", "author": { "name": "Vsevolod Strukchinsky", "email": "floatdrop@gmail.com", @@ -33,7 +33,7 @@ "bundleDependencies": false, "dependencies": {}, "deprecated": false, - "description": "My prime module", + "description": "Is retry allowed for Error?", "devDependencies": { "ava": "^0.8.0", "xo": "^0.12.1" @@ -55,5 +55,5 @@ "scripts": { "test": "xo && ava" }, - "version": "1.1.0" + "version": "1.2.0" } diff --git a/deps/npm/node_modules/jsprim/CONTRIBUTING.md b/deps/npm/node_modules/jsprim/CONTRIBUTING.md deleted file mode 100644 index 750cef8dfd54a6..00000000000000 --- a/deps/npm/node_modules/jsprim/CONTRIBUTING.md +++ /dev/null @@ -1,19 +0,0 @@ -# Contributing - -This repository uses [cr.joyent.us](https://cr.joyent.us) (Gerrit) for new -changes. Anyone can submit changes. To get started, see the [cr.joyent.us user -guide](https://github.com/joyent/joyent-gerrit/blob/master/docs/user/README.md). -This repo does not use GitHub pull requests. - -See the [Joyent Engineering -Guidelines](https://github.com/joyent/eng/blob/master/docs/index.md) for general -best practices expected in this repository. - -Contributions should be "make prepush" clean. The "prepush" target runs the -"check" target, which requires these separate tools: - -* https://github.com/davepacheco/jsstyle -* https://github.com/davepacheco/javascriptlint - -If you're changing something non-trivial or user-facing, you may want to submit -an issue first. diff --git a/deps/npm/node_modules/lcid/index.js b/deps/npm/node_modules/lcid/index.js index 69bd3d231e0594..b666ef00a4504c 100644 --- a/deps/npm/node_modules/lcid/index.js +++ b/deps/npm/node_modules/lcid/index.js @@ -1,9 +1,10 @@ 'use strict'; -var invertKv = require('invert-kv'); -var all = require('./lcid.json'); -var inverted = invertKv(all); +const invertKv = require('invert-kv'); +const all = require('./lcid.json'); -exports.from = function (lcidCode) { +const inverted = invertKv(all); + +exports.from = lcidCode => { if (typeof lcidCode !== 'number') { throw new TypeError('Expected a number'); } @@ -11,7 +12,7 @@ exports.from = function (lcidCode) { return inverted[lcidCode]; }; -exports.to = function (localeId) { +exports.to = localeId => { if (typeof localeId !== 'string') { throw new TypeError('Expected a string'); } diff --git a/deps/npm/node_modules/lcid/license b/deps/npm/node_modules/lcid/license index 654d0bfe943437..e7af2f77107d73 100644 --- a/deps/npm/node_modules/lcid/license +++ b/deps/npm/node_modules/lcid/license @@ -1,21 +1,9 @@ -The MIT License (MIT) +MIT License Copyright (c) Sindre Sorhus (sindresorhus.com) -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: +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 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. +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. diff --git a/deps/npm/node_modules/lcid/package.json b/deps/npm/node_modules/lcid/package.json index 6ab09a0881309b..3de023722441e6 100644 --- a/deps/npm/node_modules/lcid/package.json +++ b/deps/npm/node_modules/lcid/package.json @@ -1,28 +1,27 @@ { - "_from": "lcid@^1.0.0", - "_id": "lcid@1.0.0", + "_from": "lcid@^2.0.0", + "_id": "lcid@2.0.0", "_inBundle": false, - "_integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "_integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "_location": "/lcid", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "lcid@^1.0.0", + "raw": "lcid@^2.0.0", "name": "lcid", "escapedName": "lcid", - "rawSpec": "^1.0.0", + "rawSpec": "^2.0.0", "saveSpec": null, - "fetchSpec": "^1.0.0" + "fetchSpec": "^2.0.0" }, "_requiredBy": [ - "/os-locale", - "/tacks/os-locale" + "/os-locale" ], - "_resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "_shasum": "308accafa0bc483a3867b4b6f2b9506251d1b835", - "_spec": "lcid@^1.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/os-locale", + "_resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "_shasum": "6ef5d2df60e52f82eb228a4c373e8d1f397253cf", + "_spec": "lcid@^2.0.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/os-locale", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -33,15 +32,16 @@ }, "bundleDependencies": false, "dependencies": { - "invert-kv": "^1.0.0" + "invert-kv": "^2.0.0" }, "deprecated": false, "description": "Mapping between standard locale identifiers and Windows locale identifiers (LCID)", "devDependencies": { - "ava": "0.0.4" + "ava": "*", + "xo": "*" }, "engines": { - "node": ">=0.10.0" + "node": ">=6" }, "files": [ "index.js", @@ -73,7 +73,7 @@ "url": "git+https://github.com/sindresorhus/lcid.git" }, "scripts": { - "test": "node test.js" + "test": "xo && ava" }, - "version": "1.0.0" + "version": "2.0.0" } diff --git a/deps/npm/node_modules/lcid/readme.md b/deps/npm/node_modules/lcid/readme.md index bee4a701669788..2b1aa798b69301 100644 --- a/deps/npm/node_modules/lcid/readme.md +++ b/deps/npm/node_modules/lcid/readme.md @@ -1,8 +1,8 @@ # lcid [![Build Status](https://travis-ci.org/sindresorhus/lcid.svg?branch=master)](https://travis-ci.org/sindresorhus/lcid) -> Mapping between [standard locale identifiers](http://en.wikipedia.org/wiki/Locale) and [Windows locale identifiers (LCID)](http://en.wikipedia.org/wiki/Locale#Specifics_for_Microsoft_platforms) +> Mapping between [standard locale identifiers](https://en.wikipedia.org/wiki/Locale_(computer_software)) and [Windows locale identifiers (LCID)](http://en.wikipedia.org/wiki/Locale#Specifics_for_Microsoft_platforms) -Based on the [mapping](https://github.com/python/cpython/blob/be2a1a76fa43bb1ea1b3577bb5bdd506a2e90e37/Lib/locale.py#L1395-L1604) used in the Python standard library. +Based on the [mapping](https://github.com/python/cpython/blob/8f7bb100d0fa7fb2714f3953b5b627878277c7c6/Lib/locale.py#L1465-L1674) used in the Python standard library. The mapping itself is just a [JSON file](lcid.json) and can be used wherever. @@ -10,14 +10,14 @@ The mapping itself is just a [JSON file](lcid.json) and can be used wherever. ## Install ``` -$ npm install --save lcid +$ npm install lcid ``` ## Usage ```js -var lcid = require('lcid'); +const lcid = require('lcid'); lcid.from(1044); //=> 'nb_NO' @@ -32,4 +32,4 @@ lcid.all; ## License -MIT © [Sindre Sorhus](http://sindresorhus.com) +MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/deps/npm/node_modules/libnpmaccess/CODE_OF_CONDUCT.md b/deps/npm/node_modules/libnpmaccess/CODE_OF_CONDUCT.md deleted file mode 100644 index aeb72f598dcb45..00000000000000 --- a/deps/npm/node_modules/libnpmaccess/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,151 +0,0 @@ -# Code of Conduct - -## When Something Happens - -If you see a Code of Conduct violation, follow these steps: - -1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their message(s) or commits. -2. That person should immediately stop the behavior and correct the issue. -3. If this doesn’t happen, or if you're uncomfortable speaking up, [contact the maintainers](#contacting-maintainers). -4. As soon as available, a maintainer will look into the issue, and take [further action (see below)](#further-enforcement), starting with a warning, then temporary block, then long-term repo or organization ban. - -When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation. - -**The maintainer team will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator.** See [some examples below](#enforcement-examples). - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers of this project pledge to making participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, technical preferences, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - - * Using welcoming and inclusive language. - * Being respectful of differing viewpoints and experiences. - * Gracefully accepting constructive feedback. - * Focusing on what is best for the community. - * Showing empathy and kindness towards other community members. - * Encouraging and raising up your peers in the project so you can all bask in hacks and glory. - -Examples of unacceptable behavior by participants include: - - * The use of sexualized language or imagery and unwelcome sexual attention or advances, including when simulated online. The only exception to sexual topics is channels/spaces specifically for topics of sexual identity. - * Casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology. - * Making light of/making mocking comments about trigger warnings and content warnings. - * Trolling, insulting/derogatory comments, and personal or political attacks. - * Public or private harassment, deliberate intimidation, or threats. - * Publishing others' private information, such as a physical or electronic address, without explicit permission. This includes any sort of "outing" of any aspect of someone's identity without their consent. - * Publishing private screenshots or quotes of interactions in the context of this project without all quoted users' *explicit* consent. - * Publishing of private communication that doesn't have to do with reporting harrassment. - * Any of the above even when [presented as "ironic" or "joking"](https://en.wikipedia.org/wiki/Hipster_racism). - * Any attempt to present "reverse-ism" versions of the above as violations. Examples of reverse-isms are "reverse racism", "reverse sexism", "heterophobia", and "cisphobia". - * Unsolicited explanations under the assumption that someone doesn't already know it. Ask before you teach! Don't assume what people's knowledge gaps are. - * [Feigning or exaggerating surprise](https://www.recurse.com/manual#no-feigned-surprise) when someone admits to not knowing something. - * "[Well-actuallies](https://www.recurse.com/manual#no-well-actuallys)" - * Other conduct which could reasonably be considered inappropriate in a professional or community setting. - -## Scope - -This Code of Conduct applies both within spaces involving this project and in other spaces involving community members. This includes the repository, its Pull Requests and Issue tracker, its Twitter community, private email communications in the context of the project, and any events where members of the project are participating, as well as adjacent communities and venues affecting the project's members. - -Depending on the violation, the maintainers may decide that violations of this code of conduct that have happened outside of the scope of the community may deem an individual unwelcome, and take appropriate action to maintain the comfort and safety of its members. - -### Other Community Standards - -As a project on GitHub, this project is additionally covered by the [GitHub Community Guidelines](https://help.github.com/articles/github-community-guidelines/). - -Additionally, as a project hosted on npm, is is covered by [npm, Inc's Code of Conduct](https://www.npmjs.com/policies/conduct). - -Enforcement of those guidelines after violations overlapping with the above are the responsibility of the entities, and enforcement may happen in any or all of the services/communities. - -## Maintainer Enforcement Process - -Once the maintainers get involved, they will follow a documented series of steps and do their best to preserve the well-being of project members. This section covers actual concrete steps. - -### Contacting Maintainers - -You may get in touch with the maintainer team through any of the following methods: - - * Through email: - * [kzm@zkat.tech](mailto:kzm@zkat.tech) (Kat Marchán) - - * Through Twitter: - * [@maybekatz](https://twitter.com/maybekatz) (Kat Marchán) - -### Further Enforcement - -If you've already followed the [initial enforcement steps](#enforcement), these are the steps maintainers will take for further enforcement, as needed: - - 1. Repeat the request to stop. - 2. If the person doubles down, they will have offending messages removed or edited by a maintainers given an official warning. The PR or Issue may be locked. - 3. If the behavior continues or is repeated later, the person will be blocked from participating for 24 hours. - 4. If the behavior continues or is repeated after the temporary block, a long-term (6-12mo) ban will be used. - -On top of this, maintainers may remove any offending messages, images, contributions, etc, as they deem necessary. - -Maintainers reserve full rights to skip any of these steps, at their discretion, if the violation is considered to be a serious and/or immediate threat to the health and well-being of members of the community. These include any threats, serious physical or verbal attacks, and other such behavior that would be completely unacceptable in any social setting that puts our members at risk. - -Members expelled from events or venues with any sort of paid attendance will not be refunded. - -### Who Watches the Watchers? - -Maintainers and other leaders who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. These may include anything from removal from the maintainer team to a permanent ban from the community. - -Additionally, as a project hosted on both GitHub and npm, [their own Codes of Conducts may be applied against maintainers of this project](#other-community-standards), externally of this project's procedures. - -### Enforcement Examples - -#### The Best Case - -The vast majority of situations work out like this. This interaction is common, and generally positive. - -> Alex: "Yeah I used X and it was really crazy!" - -> Patt (not a maintainer): "Hey, could you not use that word? What about 'ridiculous' instead?" - -> Alex: "oh sorry, sure." -> edits old comment to say "it was really confusing!" - -#### The Maintainer Case - -Sometimes, though, you need to get maintainers involved. Maintainers will do their best to resolve conflicts, but people who were harmed by something **will take priority**. - -> Patt: "Honestly, sometimes I just really hate using $library and anyone who uses it probably sucks at their job." - -> Alex: "Whoa there, could you dial it back a bit? There's a CoC thing about attacking folks' tech use like that." - -> Patt: "I'm not attacking anyone, what's your problem?" - -> Alex: "@maintainers hey uh. Can someone look at this issue? Patt is getting a bit aggro. I tried to nudge them about it, but nope." - -> KeeperOfCommitBits: (on issue) "Hey Patt, maintainer here. Could you tone it down? This sort of attack is really not okay in this space." - -> Patt: "Leave me alone I haven't said anything bad wtf is wrong with you." - -> KeeperOfCommitBits: (deletes user's comment), "@patt I mean it. Please refer to the CoC over at (URL to this CoC) if you have questions, but you can consider this an actual warning. I'd appreciate it if you reworded your messages in this thread, since they made folks there uncomfortable. Let's try and be kind, yeah?" - -> Patt: "@keeperofbits Okay sorry. I'm just frustrated and I'm kinda burnt out and I guess I got carried away. I'll DM Alex a note apologizing and edit my messages. Sorry for the trouble." - -> KeeperOfCommitBits: "@patt Thanks for that. I hear you on the stress. Burnout sucks :/. Have a good one!" - -#### The Nope Case - -> PepeTheFrog🐸: "Hi, I am a literal actual nazi and I think white supremacists are quite fashionable." - -> Patt: "NOOOOPE. OH NOPE NOPE." - -> Alex: "JFC NO. NOPE. @keeperofbits NOPE NOPE LOOK HERE" - -> KeeperOfCommitBits: "👀 Nope. NOPE NOPE NOPE. 🔥" - -> PepeTheFrog🐸 has been banned from all organization or user repositories belonging to KeeperOfCommitBits. - -## Attribution - -This Code of Conduct was generated using [WeAllJS Code of Conduct Generator](https://npm.im/weallbehave), which is based on the [WeAllJS Code of -Conduct](https://wealljs.org/code-of-conduct), which is itself based on -[Contributor Covenant](http://contributor-covenant.org), version 1.4, available -at -[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4), -and the LGBTQ in Technology Slack [Code of -Conduct](http://lgbtq.technology/coc.html). diff --git a/deps/npm/node_modules/libnpmaccess/CONTRIBUTING.md b/deps/npm/node_modules/libnpmaccess/CONTRIBUTING.md deleted file mode 100644 index e13356ea444974..00000000000000 --- a/deps/npm/node_modules/libnpmaccess/CONTRIBUTING.md +++ /dev/null @@ -1,256 +0,0 @@ -# Contributing - -## How do I... - -* [Use This Guide](#introduction)? -* Ask or Say Something? 🤔🐛😱 - * [Request Support](#request-support) - * [Report an Error or Bug](#report-an-error-or-bug) - * [Request a Feature](#request-a-feature) -* Make Something? 🤓👩🏽‍💻📜🍳 - * [Project Setup](#project-setup) - * [Contribute Documentation](#contribute-documentation) - * [Contribute Code](#contribute-code) -* Manage Something ✅🙆🏼💃👔 - * [Provide Support on Issues](#provide-support-on-issues) - * [Label Issues](#label-issues) - * [Clean Up Issues and PRs](#clean-up-issues-and-prs) - * [Review Pull Requests](#review-pull-requests) - * [Merge Pull Requests](#merge-pull-requests) - * [Tag a Release](#tag-a-release) - * [Join the Project Team](#join-the-project-team) -* Add a Guide Like This One [To My Project](#attribution)? 🤖😻👻 - -## Introduction - -Thank you so much for your interest in contributing!. All types of contributions are encouraged and valued. See the [table of contents](#toc) for different ways to help and details about how this project handles them!📝 - -Please make sure to read the relevant section before making your contribution! It will make it a lot easier for us maintainers to make the most of it and smooth out the experience for all involved. 💚 - -The [Project Team](#join-the-project-team) looks forward to your contributions. 🙌🏾✨ - -## Request Support - -If you have a question about this project, how to use it, or just need clarification about something: - -* Open an Issue at https://github.com/npm/libnpmaccess/issues -* Provide as much context as you can about what you're running into. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* Someone will try to have a response soon. -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. - -## Report an Error or Bug - -If you run into an error or bug with the project: - -* Open an Issue at https://github.com/npm/libnpmaccess/issues -* Include *reproduction steps* that someone else can follow to recreate the bug or error on their own. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* A team member will try to reproduce the issue with your provided steps. If there are no repro steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced. -* If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#contribute-code). -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. -* `critical` issues may be left open, depending on perceived immediacy and severity, even past the 30 day deadline. - -## Request a Feature - -If the project doesn't do something you need or want it to do: - -* Open an Issue at https://github.com/npm/libnpmaccess/issues -* Provide as much context as you can about what you're running into. -* Please try and be clear about why existing features and alternatives would not work for you. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* The project team will evaluate the feature request, possibly asking you more questions to understand its purpose and any relevant requirements. If the issue is closed, the team will convey their reasoning and suggest an alternative path forward. -* If the feature request is accepted, it will be marked for implementation with `feature-accepted`, which can then be done by either by a core team member or by anyone in the community who wants to [contribute code](#contribute-code). - -Note: The team is unlikely to be able to accept every single feature request that is filed. Please understand if they need to say no. - -## Project Setup - -So you wanna contribute some code! That's great! This project uses GitHub Pull Requests to manage contributions, so [read up on how to fork a GitHub project and file a PR](https://guides.github.com/activities/forking) if you've never done it before. - -If this seems like a lot or you aren't able to do all this setup, you might also be able to [edit the files directly](https://help.github.com/articles/editing-files-in-another-user-s-repository/) without having to do any of this setup. Yes, [even code](#contribute-code). - -If you want to go the usual route and run the project locally, though: - -* [Install Node.js](https://nodejs.org/en/download/) -* [Fork the project](https://guides.github.com/activities/forking/#fork) - -Then in your terminal: -* `cd path/to/your/clone` -* `npm install` -* `npm test` - -And you should be ready to go! - -## Contribute Documentation - -Documentation is a super important, critical part of this project. Docs are how we keep track of what we're doing, how, and why. It's how we stay on the same page about our policies. And it's how we tell others everything they need in order to be able to use this project -- or contribute to it. So thank you in advance. - -Documentation contributions of any size are welcome! Feel free to file a PR even if you're just rewording a sentence to be more clear, or fixing a spelling mistake! - -To contribute documentation: - -* [Set up the project](#project-setup). -* Edit or add any relevant documentation. -* Make sure your changes are formatted correctly and consistently with the rest of the documentation. -* Re-read what you wrote, and run a spellchecker on it to make sure you didn't miss anything. -* In your commit message(s), begin the first line with `docs: `. For example: `docs: Adding a doc contrib section to CONTRIBUTING.md`. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). Documentation commits should use `docs(): `. -* Go to https://github.com/npm/libnpmaccess/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Contribute Code - -We like code commits a lot! They're super handy, and they keep the project going and doing the work it needs to do to be useful to others. - -Code contributions of just about any size are acceptable! - -The main difference between code contributions and documentation contributions is that contributing code requires inclusion of relevant tests for the code being added or changed. Contributions without accompanying tests will be held off until a test is added, unless the maintainers consider the specific tests to be either impossible, or way too much of a burden for such a contribution. - -To contribute code: - -* [Set up the project](#project-setup). -* Make any necessary changes to the source code. -* Include any [additional documentation](#contribute-documentation) the changes might need. -* Write tests that verify that your contribution works as expected. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). -* Dependency updates, additions, or removals must be in individual commits, and the message must use the format: `(deps): PKG@VERSION`, where `` is any of the usual `conventional-changelog` prefixes, at your discretion. -* Go to https://github.com/npm/libnpmaccess/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* Barring special circumstances, maintainers will not review PRs until all checks pass (Travis, AppVeyor, etc). -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. Additional tags (such as `needs-tests`) will be added depending on the review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Provide Support on Issues - -[Needs Collaborator](#join-the-project-team): none - -Helping out other users with their questions is a really awesome way of contributing to any community. It's not uncommon for most of the issues on an open source projects being support-related questions by users trying to understand something they ran into, or find their way around a known bug. - -Sometimes, the `support` label will be added to things that turn out to actually be other things, like bugs or feature requests. In that case, suss out the details with the person who filed the original issue, add a comment explaining what the bug is, and change the label from `support` to `bug` or `feature`. If you can't do this yourself, @mention a maintainer so they can do it. - -In order to help other folks out with their questions: - -* Go to the issue tracker and [filter open issues by the `support` label](https://github.com/npm/libnpmaccess/issues?q=is%3Aopen+is%3Aissue+label%3Asupport). -* Read through the list until you find something that you're familiar enough with to give an answer to. -* Respond to the issue with whatever details are needed to clarify the question, or get more details about what's going on. -* Once the discussion wraps up and things are clarified, either close the issue, or ask the original issue filer (or a maintainer) to close it for you. - -Some notes on picking up support issues: - -* Avoid responding to issues you don't know you can answer accurately. -* As much as possible, try to refer to past issues with accepted answers. Link to them from your replies with the `#123` format. -* Be kind and patient with users -- often, folks who have run into confusing things might be upset or impatient. This is ok. Try to understand where they're coming from, and if you're too uncomfortable with the tone, feel free to stay away or withdraw from the issue. (note: if the user is outright hostile or is violating the CoC, [refer to the Code of Conduct](CODE_OF_CONDUCT.md) to resolve the conflict). - -## Label Issues - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -One of the most important tasks in handling issues is labeling them usefully and accurately. All other tasks involving issues ultimately rely on the issue being classified in such a way that relevant parties looking to do their own tasks can find them quickly and easily. - -In order to label issues, [open up the list of unlabeled issues](https://github.com/npm/libnpmaccess/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and, **from newest to oldest**, read through each one and apply issue labels according to the table below. If you're unsure about what label to apply, skip the issue and try the next one: don't feel obligated to label each and every issue yourself! - -Label | Apply When | Notes ---- | --- | --- -`bug` | Cases where the code (or documentation) is behaving in a way it wasn't intended to. | If something is happening that surprises the *user* but does not go against the way the code is designed, it should use the `enhancement` label. -`critical` | Added to `bug` issues if the problem described makes the code completely unusable in a common situation. | -`documentation` | Added to issues or pull requests that affect any of the documentation for the project. | Can be combined with other labels, such as `bug` or `enhancement`. -`duplicate` | Added to issues or PRs that refer to the exact same issue as another one that's been previously labeled. | Duplicate issues should be marked and closed right away, with a message referencing the issue it's a duplicate of (with `#123`) -`enhancement` | Added to [feature requests](#request-a-feature), PRs, or documentation issues that are purely additive: the code or docs currently work as expected, but a change is being requested or suggested. | -`help wanted` | Applied by [Committers](#join-the-project-team) to issues and PRs that they would like to get outside help for. Generally, this means it's lower priority for the maintainer team to itself implement, but that the community is encouraged to pick up if they so desire | Never applied on first-pass labeling. -`in-progress` | Applied by [Committers](#join-the-project-team) to PRs that are pending some work before they're ready for review. | The original PR submitter should @mention the team member that applied the label once the PR is complete. -`performance` | This issue or PR is directly related to improving performance. | -`refactor` | Added to issues or PRs that deal with cleaning up or modifying the project for the betterment of it. | -`starter` | Applied by [Committers](#join-the-project-team) to issues that they consider good introductions to the project for people who have not contributed before. These are not necessarily "easy", but rather focused around how much context is necessary in order to understand what needs to be done for this project in particular. | Existing project members are expected to stay away from these unless they increase in priority. -`support` | This issue is either asking a question about how to use the project, clarifying the reason for unexpected behavior, or possibly reporting a `bug` but does not have enough detail yet to determine whether it would count as such. | The label should be switched to `bug` if reliable reproduction steps are provided. Issues primarily with unintended configurations of a user's environment are not considered bugs, even if they cause crashes. -`tests` | This issue or PR either requests or adds primarily tests to the project. | If a PR is pending tests, that will be handled through the [PR review process](#review-pull-requests) -`wontfix` | Labelers may apply this label to issues that clearly have nothing at all to do with the project or are otherwise entirely outside of its scope/sphere of influence. [Committers](#join-the-project-team) may apply this label and close an issue or PR if they decide to pass on an otherwise relevant issue. | The issue or PR should be closed as soon as the label is applied, and a clear explanation provided of why the label was used. Contributors are free to contest the labeling, but the decision ultimately falls on committers as to whether to accept something or not. - -## Clean Up Issues and PRs - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -Issues and PRs can go stale after a while. Maybe they're abandoned. Maybe the team will just plain not have time to address them any time soon. - -In these cases, they should be closed until they're brought up again or the interaction starts over. - -To clean up issues and PRs: - -* Search the issue tracker for issues or PRs, and add the term `updated:<=YYYY-MM-DD`, where the date is 30 days before today. -* Go through each issue *from oldest to newest*, and close them if **all of the following are true**: - * not opened by a maintainer - * not marked as `critical` - * not marked as `starter` or `help wanted` (these might stick around for a while, in general, as they're intended to be available) - * no explicit messages in the comments asking for it to be left open - * does not belong to a milestone -* Leave a message when closing saying "Cleaning up stale issue. Please reopen or ping us if and when you're ready to resume this. See https://github.com/npm/libnpmaccess/blob/latest/CONTRIBUTING.md#clean-up-issues-and-prs for more details." - -## Review Pull Requests - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -While anyone can comment on a PR, add feedback, etc, PRs are only *approved* by team members with Issue Tracker or higher permissions. - -PR reviews use [GitHub's own review feature](https://help.github.com/articles/about-pull-request-reviews/), which manages comments, approval, and review iteration. - -Some notes: - -* You may ask for minor changes ("nitpicks"), but consider whether they are really blockers to merging: try to err on the side of "approve, with comments". -* *ALL PULL REQUESTS* should be covered by a test: either by a previously-failing test, an existing test that covers the entire functionality of the submitted code, or new tests to verify any new/changed behavior. All tests must also pass and follow established conventions. Test coverage should not drop, unless the specific case is considered reasonable by maintainers. -* Please make sure you're familiar with the code or documentation being updated, unless it's a minor change (spellchecking, minor formatting, etc). You may @mention another project member who you think is better suited for the review, but still provide a non-approving review of your own. -* Be extra kind: people who submit code/doc contributions are putting themselves in a pretty vulnerable position, and have put time and care into what they've done (even if that's not obvious to you!) -- always respond with respect, be understanding, but don't feel like you need to sacrifice your standards for their sake, either. Just don't be a jerk about it? - -## Merge Pull Requests - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. - -## Tag A Release - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. The most important bit here is probably that all tests must pass, and tags must use [semver](https://semver.org). - -## Join the Project Team - -### Ways to Join - -There are many ways to contribute! Most of them don't require any official status unless otherwise noted. That said, there's a couple of positions that grant special repository abilities, and this section describes how they're granted and what they do. - -All of the below positions are granted based on the project team's needs, as well as their consensus opinion about whether they would like to work with the person and think that they would fit well into that position. The process is relatively informal, and it's likely that people who express interest in participating can just be granted the permissions they'd like. - -You can spot a collaborator on the repo by looking for the `[Collaborator]` or `[Owner]` tags next to their names. - -Permission | Description ---- | --- -Issue Tracker | Granted to contributors who express a strong interest in spending time on the project's issue tracker. These tasks are mainly [labeling issues](#label-issues), [cleaning up old ones](#clean-up-issues-and-prs), and [reviewing pull requests](#review-pull-requests), as well as all the usual things non-team-member contributors can do. Issue handlers should not merge pull requests, tag releases, or directly commit code themselves: that should still be done through the usual pull request process. Becoming an Issue Handler means the project team trusts you to understand enough of the team's process and context to implement it on the issue tracker. -Committer | Granted to contributors who want to handle the actual pull request merges, tagging new versions, etc. Committers should have a good level of familiarity with the codebase, and enough context to understand the implications of various changes, as well as a good sense of the will and expectations of the project team. -Admin/Owner | Granted to people ultimately responsible for the project, its community, etc. - -## Attribution - -This guide was generated using the WeAllJS `CONTRIBUTING.md` generator. [Make your own](https://npm.im/weallcontribute)! diff --git a/deps/npm/node_modules/libnpmconfig/CODE_OF_CONDUCT.md b/deps/npm/node_modules/libnpmconfig/CODE_OF_CONDUCT.md deleted file mode 100644 index aeb72f598dcb45..00000000000000 --- a/deps/npm/node_modules/libnpmconfig/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,151 +0,0 @@ -# Code of Conduct - -## When Something Happens - -If you see a Code of Conduct violation, follow these steps: - -1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their message(s) or commits. -2. That person should immediately stop the behavior and correct the issue. -3. If this doesn’t happen, or if you're uncomfortable speaking up, [contact the maintainers](#contacting-maintainers). -4. As soon as available, a maintainer will look into the issue, and take [further action (see below)](#further-enforcement), starting with a warning, then temporary block, then long-term repo or organization ban. - -When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation. - -**The maintainer team will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator.** See [some examples below](#enforcement-examples). - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers of this project pledge to making participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, technical preferences, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - - * Using welcoming and inclusive language. - * Being respectful of differing viewpoints and experiences. - * Gracefully accepting constructive feedback. - * Focusing on what is best for the community. - * Showing empathy and kindness towards other community members. - * Encouraging and raising up your peers in the project so you can all bask in hacks and glory. - -Examples of unacceptable behavior by participants include: - - * The use of sexualized language or imagery and unwelcome sexual attention or advances, including when simulated online. The only exception to sexual topics is channels/spaces specifically for topics of sexual identity. - * Casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology. - * Making light of/making mocking comments about trigger warnings and content warnings. - * Trolling, insulting/derogatory comments, and personal or political attacks. - * Public or private harassment, deliberate intimidation, or threats. - * Publishing others' private information, such as a physical or electronic address, without explicit permission. This includes any sort of "outing" of any aspect of someone's identity without their consent. - * Publishing private screenshots or quotes of interactions in the context of this project without all quoted users' *explicit* consent. - * Publishing of private communication that doesn't have to do with reporting harrassment. - * Any of the above even when [presented as "ironic" or "joking"](https://en.wikipedia.org/wiki/Hipster_racism). - * Any attempt to present "reverse-ism" versions of the above as violations. Examples of reverse-isms are "reverse racism", "reverse sexism", "heterophobia", and "cisphobia". - * Unsolicited explanations under the assumption that someone doesn't already know it. Ask before you teach! Don't assume what people's knowledge gaps are. - * [Feigning or exaggerating surprise](https://www.recurse.com/manual#no-feigned-surprise) when someone admits to not knowing something. - * "[Well-actuallies](https://www.recurse.com/manual#no-well-actuallys)" - * Other conduct which could reasonably be considered inappropriate in a professional or community setting. - -## Scope - -This Code of Conduct applies both within spaces involving this project and in other spaces involving community members. This includes the repository, its Pull Requests and Issue tracker, its Twitter community, private email communications in the context of the project, and any events where members of the project are participating, as well as adjacent communities and venues affecting the project's members. - -Depending on the violation, the maintainers may decide that violations of this code of conduct that have happened outside of the scope of the community may deem an individual unwelcome, and take appropriate action to maintain the comfort and safety of its members. - -### Other Community Standards - -As a project on GitHub, this project is additionally covered by the [GitHub Community Guidelines](https://help.github.com/articles/github-community-guidelines/). - -Additionally, as a project hosted on npm, is is covered by [npm, Inc's Code of Conduct](https://www.npmjs.com/policies/conduct). - -Enforcement of those guidelines after violations overlapping with the above are the responsibility of the entities, and enforcement may happen in any or all of the services/communities. - -## Maintainer Enforcement Process - -Once the maintainers get involved, they will follow a documented series of steps and do their best to preserve the well-being of project members. This section covers actual concrete steps. - -### Contacting Maintainers - -You may get in touch with the maintainer team through any of the following methods: - - * Through email: - * [kzm@zkat.tech](mailto:kzm@zkat.tech) (Kat Marchán) - - * Through Twitter: - * [@maybekatz](https://twitter.com/maybekatz) (Kat Marchán) - -### Further Enforcement - -If you've already followed the [initial enforcement steps](#enforcement), these are the steps maintainers will take for further enforcement, as needed: - - 1. Repeat the request to stop. - 2. If the person doubles down, they will have offending messages removed or edited by a maintainers given an official warning. The PR or Issue may be locked. - 3. If the behavior continues or is repeated later, the person will be blocked from participating for 24 hours. - 4. If the behavior continues or is repeated after the temporary block, a long-term (6-12mo) ban will be used. - -On top of this, maintainers may remove any offending messages, images, contributions, etc, as they deem necessary. - -Maintainers reserve full rights to skip any of these steps, at their discretion, if the violation is considered to be a serious and/or immediate threat to the health and well-being of members of the community. These include any threats, serious physical or verbal attacks, and other such behavior that would be completely unacceptable in any social setting that puts our members at risk. - -Members expelled from events or venues with any sort of paid attendance will not be refunded. - -### Who Watches the Watchers? - -Maintainers and other leaders who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. These may include anything from removal from the maintainer team to a permanent ban from the community. - -Additionally, as a project hosted on both GitHub and npm, [their own Codes of Conducts may be applied against maintainers of this project](#other-community-standards), externally of this project's procedures. - -### Enforcement Examples - -#### The Best Case - -The vast majority of situations work out like this. This interaction is common, and generally positive. - -> Alex: "Yeah I used X and it was really crazy!" - -> Patt (not a maintainer): "Hey, could you not use that word? What about 'ridiculous' instead?" - -> Alex: "oh sorry, sure." -> edits old comment to say "it was really confusing!" - -#### The Maintainer Case - -Sometimes, though, you need to get maintainers involved. Maintainers will do their best to resolve conflicts, but people who were harmed by something **will take priority**. - -> Patt: "Honestly, sometimes I just really hate using $library and anyone who uses it probably sucks at their job." - -> Alex: "Whoa there, could you dial it back a bit? There's a CoC thing about attacking folks' tech use like that." - -> Patt: "I'm not attacking anyone, what's your problem?" - -> Alex: "@maintainers hey uh. Can someone look at this issue? Patt is getting a bit aggro. I tried to nudge them about it, but nope." - -> KeeperOfCommitBits: (on issue) "Hey Patt, maintainer here. Could you tone it down? This sort of attack is really not okay in this space." - -> Patt: "Leave me alone I haven't said anything bad wtf is wrong with you." - -> KeeperOfCommitBits: (deletes user's comment), "@patt I mean it. Please refer to the CoC over at (URL to this CoC) if you have questions, but you can consider this an actual warning. I'd appreciate it if you reworded your messages in this thread, since they made folks there uncomfortable. Let's try and be kind, yeah?" - -> Patt: "@keeperofbits Okay sorry. I'm just frustrated and I'm kinda burnt out and I guess I got carried away. I'll DM Alex a note apologizing and edit my messages. Sorry for the trouble." - -> KeeperOfCommitBits: "@patt Thanks for that. I hear you on the stress. Burnout sucks :/. Have a good one!" - -#### The Nope Case - -> PepeTheFrog🐸: "Hi, I am a literal actual nazi and I think white supremacists are quite fashionable." - -> Patt: "NOOOOPE. OH NOPE NOPE." - -> Alex: "JFC NO. NOPE. @keeperofbits NOPE NOPE LOOK HERE" - -> KeeperOfCommitBits: "👀 Nope. NOPE NOPE NOPE. 🔥" - -> PepeTheFrog🐸 has been banned from all organization or user repositories belonging to KeeperOfCommitBits. - -## Attribution - -This Code of Conduct was generated using [WeAllJS Code of Conduct Generator](https://npm.im/weallbehave), which is based on the [WeAllJS Code of -Conduct](https://wealljs.org/code-of-conduct), which is itself based on -[Contributor Covenant](http://contributor-covenant.org), version 1.4, available -at -[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4), -and the LGBTQ in Technology Slack [Code of -Conduct](http://lgbtq.technology/coc.html). diff --git a/deps/npm/node_modules/libnpmconfig/CONTRIBUTING.md b/deps/npm/node_modules/libnpmconfig/CONTRIBUTING.md deleted file mode 100644 index 970c1cf43aca08..00000000000000 --- a/deps/npm/node_modules/libnpmconfig/CONTRIBUTING.md +++ /dev/null @@ -1,256 +0,0 @@ -# Contributing - -## How do I... - -* [Use This Guide](#introduction)? -* Ask or Say Something? 🤔🐛😱 - * [Request Support](#request-support) - * [Report an Error or Bug](#report-an-error-or-bug) - * [Request a Feature](#request-a-feature) -* Make Something? 🤓👩🏽‍💻📜🍳 - * [Project Setup](#project-setup) - * [Contribute Documentation](#contribute-documentation) - * [Contribute Code](#contribute-code) -* Manage Something ✅🙆🏼💃👔 - * [Provide Support on Issues](#provide-support-on-issues) - * [Label Issues](#label-issues) - * [Clean Up Issues and PRs](#clean-up-issues-and-prs) - * [Review Pull Requests](#review-pull-requests) - * [Merge Pull Requests](#merge-pull-requests) - * [Tag a Release](#tag-a-release) - * [Join the Project Team](#join-the-project-team) -* Add a Guide Like This One [To My Project](#attribution)? 🤖😻👻 - -## Introduction - -Thank you so much for your interest in contributing!. All types of contributions are encouraged and valued. See the [table of contents](#toc) for different ways to help and details about how this project handles them!📝 - -Please make sure to read the relevant section before making your contribution! It will make it a lot easier for us maintainers to make the most of it and smooth out the experience for all involved. 💚 - -The [Project Team](#join-the-project-team) looks forward to your contributions. 🙌🏾✨ - -## Request Support - -If you have a question about this project, how to use it, or just need clarification about something: - -* Open an Issue at https://github.com/npm/libnpmconfig/issues -* Provide as much context as you can about what you're running into. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* Someone will try to have a response soon. -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. - -## Report an Error or Bug - -If you run into an error or bug with the project: - -* Open an Issue at https://github.com/npm/libnpmconfig/issues -* Include *reproduction steps* that someone else can follow to recreate the bug or error on their own. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* A team member will try to reproduce the issue with your provided steps. If there are no repro steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced. -* If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#contribute-code). -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. -* `critical` issues may be left open, depending on perceived immediacy and severity, even past the 30 day deadline. - -## Request a Feature - -If the project doesn't do something you need or want it to do: - -* Open an Issue at https://github.com/npm/libnpmconfig/issues -* Provide as much context as you can about what you're running into. -* Please try and be clear about why existing features and alternatives would not work for you. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* The project team will evaluate the feature request, possibly asking you more questions to understand its purpose and any relevant requirements. If the issue is closed, the team will convey their reasoning and suggest an alternative path forward. -* If the feature request is accepted, it will be marked for implementation with `feature-accepted`, which can then be done by either by a core team member or by anyone in the community who wants to [contribute code](#contribute-code). - -Note: The team is unlikely to be able to accept every single feature request that is filed. Please understand if they need to say no. - -## Project Setup - -So you wanna contribute some code! That's great! This project uses GitHub Pull Requests to manage contributions, so [read up on how to fork a GitHub project and file a PR](https://guides.github.com/activities/forking) if you've never done it before. - -If this seems like a lot or you aren't able to do all this setup, you might also be able to [edit the files directly](https://help.github.com/articles/editing-files-in-another-user-s-repository/) without having to do any of this setup. Yes, [even code](#contribute-code). - -If you want to go the usual route and run the project locally, though: - -* [Install Node.js](https://nodejs.org/en/download/) -* [Fork the project](https://guides.github.com/activities/forking/#fork) - -Then in your terminal: -* `cd path/to/your/clone` -* `npm install` -* `npm test` - -And you should be ready to go! - -## Contribute Documentation - -Documentation is a super important, critical part of this project. Docs are how we keep track of what we're doing, how, and why. It's how we stay on the same page about our policies. And it's how we tell others everything they need in order to be able to use this project -- or contribute to it. So thank you in advance. - -Documentation contributions of any size are welcome! Feel free to file a PR even if you're just rewording a sentence to be more clear, or fixing a spelling mistake! - -To contribute documentation: - -* [Set up the project](#project-setup). -* Edit or add any relevant documentation. -* Make sure your changes are formatted correctly and consistently with the rest of the documentation. -* Re-read what you wrote, and run a spellchecker on it to make sure you didn't miss anything. -* In your commit message(s), begin the first line with `docs: `. For example: `docs: Adding a doc contrib section to CONTRIBUTING.md`. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). Documentation commits should use `docs(): `. -* Go to https://github.com/npm/libnpmconfig/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Contribute Code - -We like code commits a lot! They're super handy, and they keep the project going and doing the work it needs to do to be useful to others. - -Code contributions of just about any size are acceptable! - -The main difference between code contributions and documentation contributions is that contributing code requires inclusion of relevant tests for the code being added or changed. Contributions without accompanying tests will be held off until a test is added, unless the maintainers consider the specific tests to be either impossible, or way too much of a burden for such a contribution. - -To contribute code: - -* [Set up the project](#project-setup). -* Make any necessary changes to the source code. -* Include any [additional documentation](#contribute-documentation) the changes might need. -* Write tests that verify that your contribution works as expected. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). -* Dependency updates, additions, or removals must be in individual commits, and the message must use the format: `(deps): PKG@VERSION`, where `` is any of the usual `conventional-changelog` prefixes, at your discretion. -* Go to https://github.com/npm/libnpmconfig/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* Barring special circumstances, maintainers will not review PRs until all checks pass (Travis, AppVeyor, etc). -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. Additional tags (such as `needs-tests`) will be added depending on the review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Provide Support on Issues - -[Needs Collaborator](#join-the-project-team): none - -Helping out other users with their questions is a really awesome way of contributing to any community. It's not uncommon for most of the issues on an open source projects being support-related questions by users trying to understand something they ran into, or find their way around a known bug. - -Sometimes, the `support` label will be added to things that turn out to actually be other things, like bugs or feature requests. In that case, suss out the details with the person who filed the original issue, add a comment explaining what the bug is, and change the label from `support` to `bug` or `feature`. If you can't do this yourself, @mention a maintainer so they can do it. - -In order to help other folks out with their questions: - -* Go to the issue tracker and [filter open issues by the `support` label](https://github.com/npm/libnpmconfig/issues?q=is%3Aopen+is%3Aissue+label%3Asupport). -* Read through the list until you find something that you're familiar enough with to give an answer to. -* Respond to the issue with whatever details are needed to clarify the question, or get more details about what's going on. -* Once the discussion wraps up and things are clarified, either close the issue, or ask the original issue filer (or a maintainer) to close it for you. - -Some notes on picking up support issues: - -* Avoid responding to issues you don't know you can answer accurately. -* As much as possible, try to refer to past issues with accepted answers. Link to them from your replies with the `#123` format. -* Be kind and patient with users -- often, folks who have run into confusing things might be upset or impatient. This is ok. Try to understand where they're coming from, and if you're too uncomfortable with the tone, feel free to stay away or withdraw from the issue. (note: if the user is outright hostile or is violating the CoC, [refer to the Code of Conduct](CODE_OF_CONDUCT.md) to resolve the conflict). - -## Label Issues - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -One of the most important tasks in handling issues is labeling them usefully and accurately. All other tasks involving issues ultimately rely on the issue being classified in such a way that relevant parties looking to do their own tasks can find them quickly and easily. - -In order to label issues, [open up the list of unlabeled issues](https://github.com/npm/libnpmconfig/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and, **from newest to oldest**, read through each one and apply issue labels according to the table below. If you're unsure about what label to apply, skip the issue and try the next one: don't feel obligated to label each and every issue yourself! - -Label | Apply When | Notes ---- | --- | --- -`bug` | Cases where the code (or documentation) is behaving in a way it wasn't intended to. | If something is happening that surprises the *user* but does not go against the way the code is designed, it should use the `enhancement` label. -`critical` | Added to `bug` issues if the problem described makes the code completely unusable in a common situation. | -`documentation` | Added to issues or pull requests that affect any of the documentation for the project. | Can be combined with other labels, such as `bug` or `enhancement`. -`duplicate` | Added to issues or PRs that refer to the exact same issue as another one that's been previously labeled. | Duplicate issues should be marked and closed right away, with a message referencing the issue it's a duplicate of (with `#123`) -`enhancement` | Added to [feature requests](#request-a-feature), PRs, or documentation issues that are purely additive: the code or docs currently work as expected, but a change is being requested or suggested. | -`help wanted` | Applied by [Committers](#join-the-project-team) to issues and PRs that they would like to get outside help for. Generally, this means it's lower priority for the maintainer team to itself implement, but that the community is encouraged to pick up if they so desire | Never applied on first-pass labeling. -`in-progress` | Applied by [Committers](#join-the-project-team) to PRs that are pending some work before they're ready for review. | The original PR submitter should @mention the team member that applied the label once the PR is complete. -`performance` | This issue or PR is directly related to improving performance. | -`refactor` | Added to issues or PRs that deal with cleaning up or modifying the project for the betterment of it. | -`starter` | Applied by [Committers](#join-the-project-team) to issues that they consider good introductions to the project for people who have not contributed before. These are not necessarily "easy", but rather focused around how much context is necessary in order to understand what needs to be done for this project in particular. | Existing project members are expected to stay away from these unless they increase in priority. -`support` | This issue is either asking a question about how to use the project, clarifying the reason for unexpected behavior, or possibly reporting a `bug` but does not have enough detail yet to determine whether it would count as such. | The label should be switched to `bug` if reliable reproduction steps are provided. Issues primarily with unintended configurations of a user's environment are not considered bugs, even if they cause crashes. -`tests` | This issue or PR either requests or adds primarily tests to the project. | If a PR is pending tests, that will be handled through the [PR review process](#review-pull-requests) -`wontfix` | Labelers may apply this label to issues that clearly have nothing at all to do with the project or are otherwise entirely outside of its scope/sphere of influence. [Committers](#join-the-project-team) may apply this label and close an issue or PR if they decide to pass on an otherwise relevant issue. | The issue or PR should be closed as soon as the label is applied, and a clear explanation provided of why the label was used. Contributors are free to contest the labeling, but the decision ultimately falls on committers as to whether to accept something or not. - -## Clean Up Issues and PRs - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -Issues and PRs can go stale after a while. Maybe they're abandoned. Maybe the team will just plain not have time to address them any time soon. - -In these cases, they should be closed until they're brought up again or the interaction starts over. - -To clean up issues and PRs: - -* Search the issue tracker for issues or PRs, and add the term `updated:<=YYYY-MM-DD`, where the date is 30 days before today. -* Go through each issue *from oldest to newest*, and close them if **all of the following are true**: - * not opened by a maintainer - * not marked as `critical` - * not marked as `starter` or `help wanted` (these might stick around for a while, in general, as they're intended to be available) - * no explicit messages in the comments asking for it to be left open - * does not belong to a milestone -* Leave a message when closing saying "Cleaning up stale issue. Please reopen or ping us if and when you're ready to resume this. See https://github.com/npm/libnpmconfig/blob/latest/CONTRIBUTING.md#clean-up-issues-and-prs for more details." - -## Review Pull Requests - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -While anyone can comment on a PR, add feedback, etc, PRs are only *approved* by team members with Issue Tracker or higher permissions. - -PR reviews use [GitHub's own review feature](https://help.github.com/articles/about-pull-request-reviews/), which manages comments, approval, and review iteration. - -Some notes: - -* You may ask for minor changes ("nitpicks"), but consider whether they are really blockers to merging: try to err on the side of "approve, with comments". -* *ALL PULL REQUESTS* should be covered by a test: either by a previously-failing test, an existing test that covers the entire functionality of the submitted code, or new tests to verify any new/changed behavior. All tests must also pass and follow established conventions. Test coverage should not drop, unless the specific case is considered reasonable by maintainers. -* Please make sure you're familiar with the code or documentation being updated, unless it's a minor change (spellchecking, minor formatting, etc). You may @mention another project member who you think is better suited for the review, but still provide a non-approving review of your own. -* Be extra kind: people who submit code/doc contributions are putting themselves in a pretty vulnerable position, and have put time and care into what they've done (even if that's not obvious to you!) -- always respond with respect, be understanding, but don't feel like you need to sacrifice your standards for their sake, either. Just don't be a jerk about it? - -## Merge Pull Requests - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. - -## Tag A Release - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. The most important bit here is probably that all tests must pass, and tags must use [semver](https://semver.org). - -## Join the Project Team - -### Ways to Join - -There are many ways to contribute! Most of them don't require any official status unless otherwise noted. That said, there's a couple of positions that grant special repository abilities, and this section describes how they're granted and what they do. - -All of the below positions are granted based on the project team's needs, as well as their consensus opinion about whether they would like to work with the person and think that they would fit well into that position. The process is relatively informal, and it's likely that people who express interest in participating can just be granted the permissions they'd like. - -You can spot a collaborator on the repo by looking for the `[Collaborator]` or `[Owner]` tags next to their names. - -Permission | Description ---- | --- -Issue Tracker | Granted to contributors who express a strong interest in spending time on the project's issue tracker. These tasks are mainly [labeling issues](#label-issues), [cleaning up old ones](#clean-up-issues-and-prs), and [reviewing pull requests](#review-pull-requests), as well as all the usual things non-team-member contributors can do. Issue handlers should not merge pull requests, tag releases, or directly commit code themselves: that should still be done through the usual pull request process. Becoming an Issue Handler means the project team trusts you to understand enough of the team's process and context to implement it on the issue tracker. -Committer | Granted to contributors who want to handle the actual pull request merges, tagging new versions, etc. Committers should have a good level of familiarity with the codebase, and enough context to understand the implications of various changes, as well as a good sense of the will and expectations of the project team. -Admin/Owner | Granted to people ultimately responsible for the project, its community, etc. - -## Attribution - -This guide was generated using the WeAllJS `CONTRIBUTING.md` generator. [Make your own](https://npm.im/weallcontribute)! diff --git a/deps/npm/node_modules/libnpmorg/CODE_OF_CONDUCT.md b/deps/npm/node_modules/libnpmorg/CODE_OF_CONDUCT.md deleted file mode 100644 index aeb72f598dcb45..00000000000000 --- a/deps/npm/node_modules/libnpmorg/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,151 +0,0 @@ -# Code of Conduct - -## When Something Happens - -If you see a Code of Conduct violation, follow these steps: - -1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their message(s) or commits. -2. That person should immediately stop the behavior and correct the issue. -3. If this doesn’t happen, or if you're uncomfortable speaking up, [contact the maintainers](#contacting-maintainers). -4. As soon as available, a maintainer will look into the issue, and take [further action (see below)](#further-enforcement), starting with a warning, then temporary block, then long-term repo or organization ban. - -When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation. - -**The maintainer team will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator.** See [some examples below](#enforcement-examples). - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers of this project pledge to making participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, technical preferences, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - - * Using welcoming and inclusive language. - * Being respectful of differing viewpoints and experiences. - * Gracefully accepting constructive feedback. - * Focusing on what is best for the community. - * Showing empathy and kindness towards other community members. - * Encouraging and raising up your peers in the project so you can all bask in hacks and glory. - -Examples of unacceptable behavior by participants include: - - * The use of sexualized language or imagery and unwelcome sexual attention or advances, including when simulated online. The only exception to sexual topics is channels/spaces specifically for topics of sexual identity. - * Casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology. - * Making light of/making mocking comments about trigger warnings and content warnings. - * Trolling, insulting/derogatory comments, and personal or political attacks. - * Public or private harassment, deliberate intimidation, or threats. - * Publishing others' private information, such as a physical or electronic address, without explicit permission. This includes any sort of "outing" of any aspect of someone's identity without their consent. - * Publishing private screenshots or quotes of interactions in the context of this project without all quoted users' *explicit* consent. - * Publishing of private communication that doesn't have to do with reporting harrassment. - * Any of the above even when [presented as "ironic" or "joking"](https://en.wikipedia.org/wiki/Hipster_racism). - * Any attempt to present "reverse-ism" versions of the above as violations. Examples of reverse-isms are "reverse racism", "reverse sexism", "heterophobia", and "cisphobia". - * Unsolicited explanations under the assumption that someone doesn't already know it. Ask before you teach! Don't assume what people's knowledge gaps are. - * [Feigning or exaggerating surprise](https://www.recurse.com/manual#no-feigned-surprise) when someone admits to not knowing something. - * "[Well-actuallies](https://www.recurse.com/manual#no-well-actuallys)" - * Other conduct which could reasonably be considered inappropriate in a professional or community setting. - -## Scope - -This Code of Conduct applies both within spaces involving this project and in other spaces involving community members. This includes the repository, its Pull Requests and Issue tracker, its Twitter community, private email communications in the context of the project, and any events where members of the project are participating, as well as adjacent communities and venues affecting the project's members. - -Depending on the violation, the maintainers may decide that violations of this code of conduct that have happened outside of the scope of the community may deem an individual unwelcome, and take appropriate action to maintain the comfort and safety of its members. - -### Other Community Standards - -As a project on GitHub, this project is additionally covered by the [GitHub Community Guidelines](https://help.github.com/articles/github-community-guidelines/). - -Additionally, as a project hosted on npm, is is covered by [npm, Inc's Code of Conduct](https://www.npmjs.com/policies/conduct). - -Enforcement of those guidelines after violations overlapping with the above are the responsibility of the entities, and enforcement may happen in any or all of the services/communities. - -## Maintainer Enforcement Process - -Once the maintainers get involved, they will follow a documented series of steps and do their best to preserve the well-being of project members. This section covers actual concrete steps. - -### Contacting Maintainers - -You may get in touch with the maintainer team through any of the following methods: - - * Through email: - * [kzm@zkat.tech](mailto:kzm@zkat.tech) (Kat Marchán) - - * Through Twitter: - * [@maybekatz](https://twitter.com/maybekatz) (Kat Marchán) - -### Further Enforcement - -If you've already followed the [initial enforcement steps](#enforcement), these are the steps maintainers will take for further enforcement, as needed: - - 1. Repeat the request to stop. - 2. If the person doubles down, they will have offending messages removed or edited by a maintainers given an official warning. The PR or Issue may be locked. - 3. If the behavior continues or is repeated later, the person will be blocked from participating for 24 hours. - 4. If the behavior continues or is repeated after the temporary block, a long-term (6-12mo) ban will be used. - -On top of this, maintainers may remove any offending messages, images, contributions, etc, as they deem necessary. - -Maintainers reserve full rights to skip any of these steps, at their discretion, if the violation is considered to be a serious and/or immediate threat to the health and well-being of members of the community. These include any threats, serious physical or verbal attacks, and other such behavior that would be completely unacceptable in any social setting that puts our members at risk. - -Members expelled from events or venues with any sort of paid attendance will not be refunded. - -### Who Watches the Watchers? - -Maintainers and other leaders who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. These may include anything from removal from the maintainer team to a permanent ban from the community. - -Additionally, as a project hosted on both GitHub and npm, [their own Codes of Conducts may be applied against maintainers of this project](#other-community-standards), externally of this project's procedures. - -### Enforcement Examples - -#### The Best Case - -The vast majority of situations work out like this. This interaction is common, and generally positive. - -> Alex: "Yeah I used X and it was really crazy!" - -> Patt (not a maintainer): "Hey, could you not use that word? What about 'ridiculous' instead?" - -> Alex: "oh sorry, sure." -> edits old comment to say "it was really confusing!" - -#### The Maintainer Case - -Sometimes, though, you need to get maintainers involved. Maintainers will do their best to resolve conflicts, but people who were harmed by something **will take priority**. - -> Patt: "Honestly, sometimes I just really hate using $library and anyone who uses it probably sucks at their job." - -> Alex: "Whoa there, could you dial it back a bit? There's a CoC thing about attacking folks' tech use like that." - -> Patt: "I'm not attacking anyone, what's your problem?" - -> Alex: "@maintainers hey uh. Can someone look at this issue? Patt is getting a bit aggro. I tried to nudge them about it, but nope." - -> KeeperOfCommitBits: (on issue) "Hey Patt, maintainer here. Could you tone it down? This sort of attack is really not okay in this space." - -> Patt: "Leave me alone I haven't said anything bad wtf is wrong with you." - -> KeeperOfCommitBits: (deletes user's comment), "@patt I mean it. Please refer to the CoC over at (URL to this CoC) if you have questions, but you can consider this an actual warning. I'd appreciate it if you reworded your messages in this thread, since they made folks there uncomfortable. Let's try and be kind, yeah?" - -> Patt: "@keeperofbits Okay sorry. I'm just frustrated and I'm kinda burnt out and I guess I got carried away. I'll DM Alex a note apologizing and edit my messages. Sorry for the trouble." - -> KeeperOfCommitBits: "@patt Thanks for that. I hear you on the stress. Burnout sucks :/. Have a good one!" - -#### The Nope Case - -> PepeTheFrog🐸: "Hi, I am a literal actual nazi and I think white supremacists are quite fashionable." - -> Patt: "NOOOOPE. OH NOPE NOPE." - -> Alex: "JFC NO. NOPE. @keeperofbits NOPE NOPE LOOK HERE" - -> KeeperOfCommitBits: "👀 Nope. NOPE NOPE NOPE. 🔥" - -> PepeTheFrog🐸 has been banned from all organization or user repositories belonging to KeeperOfCommitBits. - -## Attribution - -This Code of Conduct was generated using [WeAllJS Code of Conduct Generator](https://npm.im/weallbehave), which is based on the [WeAllJS Code of -Conduct](https://wealljs.org/code-of-conduct), which is itself based on -[Contributor Covenant](http://contributor-covenant.org), version 1.4, available -at -[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4), -and the LGBTQ in Technology Slack [Code of -Conduct](http://lgbtq.technology/coc.html). diff --git a/deps/npm/node_modules/libnpmorg/CONTRIBUTING.md b/deps/npm/node_modules/libnpmorg/CONTRIBUTING.md deleted file mode 100644 index eb4b58b03ef1a8..00000000000000 --- a/deps/npm/node_modules/libnpmorg/CONTRIBUTING.md +++ /dev/null @@ -1,256 +0,0 @@ -# Contributing - -## How do I... - -* [Use This Guide](#introduction)? -* Ask or Say Something? 🤔🐛😱 - * [Request Support](#request-support) - * [Report an Error or Bug](#report-an-error-or-bug) - * [Request a Feature](#request-a-feature) -* Make Something? 🤓👩🏽‍💻📜🍳 - * [Project Setup](#project-setup) - * [Contribute Documentation](#contribute-documentation) - * [Contribute Code](#contribute-code) -* Manage Something ✅🙆🏼💃👔 - * [Provide Support on Issues](#provide-support-on-issues) - * [Label Issues](#label-issues) - * [Clean Up Issues and PRs](#clean-up-issues-and-prs) - * [Review Pull Requests](#review-pull-requests) - * [Merge Pull Requests](#merge-pull-requests) - * [Tag a Release](#tag-a-release) - * [Join the Project Team](#join-the-project-team) -* Add a Guide Like This One [To My Project](#attribution)? 🤖😻👻 - -## Introduction - -Thank you so much for your interest in contributing!. All types of contributions are encouraged and valued. See the [table of contents](#toc) for different ways to help and details about how this project handles them!📝 - -Please make sure to read the relevant section before making your contribution! It will make it a lot easier for us maintainers to make the most of it and smooth out the experience for all involved. 💚 - -The [Project Team](#join-the-project-team) looks forward to your contributions. 🙌🏾✨ - -## Request Support - -If you have a question about this project, how to use it, or just need clarification about something: - -* Open an Issue at https://github.com/npm/libnpmorg/issues -* Provide as much context as you can about what you're running into. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* Someone will try to have a response soon. -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. - -## Report an Error or Bug - -If you run into an error or bug with the project: - -* Open an Issue at https://github.com/npm/libnpmorg/issues -* Include *reproduction steps* that someone else can follow to recreate the bug or error on their own. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* A team member will try to reproduce the issue with your provided steps. If there are no repro steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced. -* If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#contribute-code). -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. -* `critical` issues may be left open, depending on perceived immediacy and severity, even past the 30 day deadline. - -## Request a Feature - -If the project doesn't do something you need or want it to do: - -* Open an Issue at https://github.com/npm/libnpmorg/issues -* Provide as much context as you can about what you're running into. -* Please try and be clear about why existing features and alternatives would not work for you. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* The project team will evaluate the feature request, possibly asking you more questions to understand its purpose and any relevant requirements. If the issue is closed, the team will convey their reasoning and suggest an alternative path forward. -* If the feature request is accepted, it will be marked for implementation with `feature-accepted`, which can then be done by either by a core team member or by anyone in the community who wants to [contribute code](#contribute-code). - -Note: The team is unlikely to be able to accept every single feature request that is filed. Please understand if they need to say no. - -## Project Setup - -So you wanna contribute some code! That's great! This project uses GitHub Pull Requests to manage contributions, so [read up on how to fork a GitHub project and file a PR](https://guides.github.com/activities/forking) if you've never done it before. - -If this seems like a lot or you aren't able to do all this setup, you might also be able to [edit the files directly](https://help.github.com/articles/editing-files-in-another-user-s-repository/) without having to do any of this setup. Yes, [even code](#contribute-code). - -If you want to go the usual route and run the project locally, though: - -* [Install Node.js](https://nodejs.org/en/download/) -* [Fork the project](https://guides.github.com/activities/forking/#fork) - -Then in your terminal: -* `cd path/to/your/clone` -* `npm install` -* `npm test` - -And you should be ready to go! - -## Contribute Documentation - -Documentation is a super important, critical part of this project. Docs are how we keep track of what we're doing, how, and why. It's how we stay on the same page about our policies. And it's how we tell others everything they need in order to be able to use this project -- or contribute to it. So thank you in advance. - -Documentation contributions of any size are welcome! Feel free to file a PR even if you're just rewording a sentence to be more clear, or fixing a spelling mistake! - -To contribute documentation: - -* [Set up the project](#project-setup). -* Edit or add any relevant documentation. -* Make sure your changes are formatted correctly and consistently with the rest of the documentation. -* Re-read what you wrote, and run a spellchecker on it to make sure you didn't miss anything. -* In your commit message(s), begin the first line with `docs: `. For example: `docs: Adding a doc contrib section to CONTRIBUTING.md`. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). Documentation commits should use `docs(): `. -* Go to https://github.com/npm/libnpmorg/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Contribute Code - -We like code commits a lot! They're super handy, and they keep the project going and doing the work it needs to do to be useful to others. - -Code contributions of just about any size are acceptable! - -The main difference between code contributions and documentation contributions is that contributing code requires inclusion of relevant tests for the code being added or changed. Contributions without accompanying tests will be held off until a test is added, unless the maintainers consider the specific tests to be either impossible, or way too much of a burden for such a contribution. - -To contribute code: - -* [Set up the project](#project-setup). -* Make any necessary changes to the source code. -* Include any [additional documentation](#contribute-documentation) the changes might need. -* Write tests that verify that your contribution works as expected. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). -* Dependency updates, additions, or removals must be in individual commits, and the message must use the format: `(deps): PKG@VERSION`, where `` is any of the usual `conventional-changelog` prefixes, at your discretion. -* Go to https://github.com/npm/libnpmorg/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* Barring special circumstances, maintainers will not review PRs until all checks pass (Travis, AppVeyor, etc). -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. Additional tags (such as `needs-tests`) will be added depending on the review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Provide Support on Issues - -[Needs Collaborator](#join-the-project-team): none - -Helping out other users with their questions is a really awesome way of contributing to any community. It's not uncommon for most of the issues on an open source projects being support-related questions by users trying to understand something they ran into, or find their way around a known bug. - -Sometimes, the `support` label will be added to things that turn out to actually be other things, like bugs or feature requests. In that case, suss out the details with the person who filed the original issue, add a comment explaining what the bug is, and change the label from `support` to `bug` or `feature`. If you can't do this yourself, @mention a maintainer so they can do it. - -In order to help other folks out with their questions: - -* Go to the issue tracker and [filter open issues by the `support` label](https://github.com/npm/libnpmorg/issues?q=is%3Aopen+is%3Aissue+label%3Asupport). -* Read through the list until you find something that you're familiar enough with to give an answer to. -* Respond to the issue with whatever details are needed to clarify the question, or get more details about what's going on. -* Once the discussion wraps up and things are clarified, either close the issue, or ask the original issue filer (or a maintainer) to close it for you. - -Some notes on picking up support issues: - -* Avoid responding to issues you don't know you can answer accurately. -* As much as possible, try to refer to past issues with accepted answers. Link to them from your replies with the `#123` format. -* Be kind and patient with users -- often, folks who have run into confusing things might be upset or impatient. This is ok. Try to understand where they're coming from, and if you're too uncomfortable with the tone, feel free to stay away or withdraw from the issue. (note: if the user is outright hostile or is violating the CoC, [refer to the Code of Conduct](CODE_OF_CONDUCT.md) to resolve the conflict). - -## Label Issues - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -One of the most important tasks in handling issues is labeling them usefully and accurately. All other tasks involving issues ultimately rely on the issue being classified in such a way that relevant parties looking to do their own tasks can find them quickly and easily. - -In order to label issues, [open up the list of unlabeled issues](https://github.com/npm/libnpmorg/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and, **from newest to oldest**, read through each one and apply issue labels according to the table below. If you're unsure about what label to apply, skip the issue and try the next one: don't feel obligated to label each and every issue yourself! - -Label | Apply When | Notes ---- | --- | --- -`bug` | Cases where the code (or documentation) is behaving in a way it wasn't intended to. | If something is happening that surprises the *user* but does not go against the way the code is designed, it should use the `enhancement` label. -`critical` | Added to `bug` issues if the problem described makes the code completely unusable in a common situation. | -`documentation` | Added to issues or pull requests that affect any of the documentation for the project. | Can be combined with other labels, such as `bug` or `enhancement`. -`duplicate` | Added to issues or PRs that refer to the exact same issue as another one that's been previously labeled. | Duplicate issues should be marked and closed right away, with a message referencing the issue it's a duplicate of (with `#123`) -`enhancement` | Added to [feature requests](#request-a-feature), PRs, or documentation issues that are purely additive: the code or docs currently work as expected, but a change is being requested or suggested. | -`help wanted` | Applied by [Committers](#join-the-project-team) to issues and PRs that they would like to get outside help for. Generally, this means it's lower priority for the maintainer team to itself implement, but that the community is encouraged to pick up if they so desire | Never applied on first-pass labeling. -`in-progress` | Applied by [Committers](#join-the-project-team) to PRs that are pending some work before they're ready for review. | The original PR submitter should @mention the team member that applied the label once the PR is complete. -`performance` | This issue or PR is directly related to improving performance. | -`refactor` | Added to issues or PRs that deal with cleaning up or modifying the project for the betterment of it. | -`starter` | Applied by [Committers](#join-the-project-team) to issues that they consider good introductions to the project for people who have not contributed before. These are not necessarily "easy", but rather focused around how much context is necessary in order to understand what needs to be done for this project in particular. | Existing project members are expected to stay away from these unless they increase in priority. -`support` | This issue is either asking a question about how to use the project, clarifying the reason for unexpected behavior, or possibly reporting a `bug` but does not have enough detail yet to determine whether it would count as such. | The label should be switched to `bug` if reliable reproduction steps are provided. Issues primarily with unintended configurations of a user's environment are not considered bugs, even if they cause crashes. -`tests` | This issue or PR either requests or adds primarily tests to the project. | If a PR is pending tests, that will be handled through the [PR review process](#review-pull-requests) -`wontfix` | Labelers may apply this label to issues that clearly have nothing at all to do with the project or are otherwise entirely outside of its scope/sphere of influence. [Committers](#join-the-project-team) may apply this label and close an issue or PR if they decide to pass on an otherwise relevant issue. | The issue or PR should be closed as soon as the label is applied, and a clear explanation provided of why the label was used. Contributors are free to contest the labeling, but the decision ultimately falls on committers as to whether to accept something or not. - -## Clean Up Issues and PRs - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -Issues and PRs can go stale after a while. Maybe they're abandoned. Maybe the team will just plain not have time to address them any time soon. - -In these cases, they should be closed until they're brought up again or the interaction starts over. - -To clean up issues and PRs: - -* Search the issue tracker for issues or PRs, and add the term `updated:<=YYYY-MM-DD`, where the date is 30 days before today. -* Go through each issue *from oldest to newest*, and close them if **all of the following are true**: - * not opened by a maintainer - * not marked as `critical` - * not marked as `starter` or `help wanted` (these might stick around for a while, in general, as they're intended to be available) - * no explicit messages in the comments asking for it to be left open - * does not belong to a milestone -* Leave a message when closing saying "Cleaning up stale issue. Please reopen or ping us if and when you're ready to resume this. See https://github.com/npm/libnpmorg/blob/latest/CONTRIBUTING.md#clean-up-issues-and-prs for more details." - -## Review Pull Requests - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -While anyone can comment on a PR, add feedback, etc, PRs are only *approved* by team members with Issue Tracker or higher permissions. - -PR reviews use [GitHub's own review feature](https://help.github.com/articles/about-pull-request-reviews/), which manages comments, approval, and review iteration. - -Some notes: - -* You may ask for minor changes ("nitpicks"), but consider whether they are really blockers to merging: try to err on the side of "approve, with comments". -* *ALL PULL REQUESTS* should be covered by a test: either by a previously-failing test, an existing test that covers the entire functionality of the submitted code, or new tests to verify any new/changed behavior. All tests must also pass and follow established conventions. Test coverage should not drop, unless the specific case is considered reasonable by maintainers. -* Please make sure you're familiar with the code or documentation being updated, unless it's a minor change (spellchecking, minor formatting, etc). You may @mention another project member who you think is better suited for the review, but still provide a non-approving review of your own. -* Be extra kind: people who submit code/doc contributions are putting themselves in a pretty vulnerable position, and have put time and care into what they've done (even if that's not obvious to you!) -- always respond with respect, be understanding, but don't feel like you need to sacrifice your standards for their sake, either. Just don't be a jerk about it? - -## Merge Pull Requests - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. - -## Tag A Release - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. The most important bit here is probably that all tests must pass, and tags must use [semver](https://semver.org). - -## Join the Project Team - -### Ways to Join - -There are many ways to contribute! Most of them don't require any official status unless otherwise noted. That said, there's a couple of positions that grant special repository abilities, and this section describes how they're granted and what they do. - -All of the below positions are granted based on the project team's needs, as well as their consensus opinion about whether they would like to work with the person and think that they would fit well into that position. The process is relatively informal, and it's likely that people who express interest in participating can just be granted the permissions they'd like. - -You can spot a collaborator on the repo by looking for the `[Collaborator]` or `[Owner]` tags next to their names. - -Permission | Description ---- | --- -Issue Tracker | Granted to contributors who express a strong interest in spending time on the project's issue tracker. These tasks are mainly [labeling issues](#label-issues), [cleaning up old ones](#clean-up-issues-and-prs), and [reviewing pull requests](#review-pull-requests), as well as all the usual things non-team-member contributors can do. Issue handlers should not merge pull requests, tag releases, or directly commit code themselves: that should still be done through the usual pull request process. Becoming an Issue Handler means the project team trusts you to understand enough of the team's process and context to implement it on the issue tracker. -Committer | Granted to contributors who want to handle the actual pull request merges, tagging new versions, etc. Committers should have a good level of familiarity with the codebase, and enough context to understand the implications of various changes, as well as a good sense of the will and expectations of the project team. -Admin/Owner | Granted to people ultimately responsible for the project, its community, etc. - -## Attribution - -This guide was generated using the WeAllJS `CONTRIBUTING.md` generator. [Make your own](https://npm.im/weallcontribute)! diff --git a/deps/npm/node_modules/libnpmpublish/CODE_OF_CONDUCT.md b/deps/npm/node_modules/libnpmpublish/CODE_OF_CONDUCT.md deleted file mode 100644 index aeb72f598dcb45..00000000000000 --- a/deps/npm/node_modules/libnpmpublish/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,151 +0,0 @@ -# Code of Conduct - -## When Something Happens - -If you see a Code of Conduct violation, follow these steps: - -1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their message(s) or commits. -2. That person should immediately stop the behavior and correct the issue. -3. If this doesn’t happen, or if you're uncomfortable speaking up, [contact the maintainers](#contacting-maintainers). -4. As soon as available, a maintainer will look into the issue, and take [further action (see below)](#further-enforcement), starting with a warning, then temporary block, then long-term repo or organization ban. - -When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation. - -**The maintainer team will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator.** See [some examples below](#enforcement-examples). - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers of this project pledge to making participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, technical preferences, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - - * Using welcoming and inclusive language. - * Being respectful of differing viewpoints and experiences. - * Gracefully accepting constructive feedback. - * Focusing on what is best for the community. - * Showing empathy and kindness towards other community members. - * Encouraging and raising up your peers in the project so you can all bask in hacks and glory. - -Examples of unacceptable behavior by participants include: - - * The use of sexualized language or imagery and unwelcome sexual attention or advances, including when simulated online. The only exception to sexual topics is channels/spaces specifically for topics of sexual identity. - * Casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology. - * Making light of/making mocking comments about trigger warnings and content warnings. - * Trolling, insulting/derogatory comments, and personal or political attacks. - * Public or private harassment, deliberate intimidation, or threats. - * Publishing others' private information, such as a physical or electronic address, without explicit permission. This includes any sort of "outing" of any aspect of someone's identity without their consent. - * Publishing private screenshots or quotes of interactions in the context of this project without all quoted users' *explicit* consent. - * Publishing of private communication that doesn't have to do with reporting harrassment. - * Any of the above even when [presented as "ironic" or "joking"](https://en.wikipedia.org/wiki/Hipster_racism). - * Any attempt to present "reverse-ism" versions of the above as violations. Examples of reverse-isms are "reverse racism", "reverse sexism", "heterophobia", and "cisphobia". - * Unsolicited explanations under the assumption that someone doesn't already know it. Ask before you teach! Don't assume what people's knowledge gaps are. - * [Feigning or exaggerating surprise](https://www.recurse.com/manual#no-feigned-surprise) when someone admits to not knowing something. - * "[Well-actuallies](https://www.recurse.com/manual#no-well-actuallys)" - * Other conduct which could reasonably be considered inappropriate in a professional or community setting. - -## Scope - -This Code of Conduct applies both within spaces involving this project and in other spaces involving community members. This includes the repository, its Pull Requests and Issue tracker, its Twitter community, private email communications in the context of the project, and any events where members of the project are participating, as well as adjacent communities and venues affecting the project's members. - -Depending on the violation, the maintainers may decide that violations of this code of conduct that have happened outside of the scope of the community may deem an individual unwelcome, and take appropriate action to maintain the comfort and safety of its members. - -### Other Community Standards - -As a project on GitHub, this project is additionally covered by the [GitHub Community Guidelines](https://help.github.com/articles/github-community-guidelines/). - -Additionally, as a project hosted on npm, is is covered by [npm, Inc's Code of Conduct](https://www.npmjs.com/policies/conduct). - -Enforcement of those guidelines after violations overlapping with the above are the responsibility of the entities, and enforcement may happen in any or all of the services/communities. - -## Maintainer Enforcement Process - -Once the maintainers get involved, they will follow a documented series of steps and do their best to preserve the well-being of project members. This section covers actual concrete steps. - -### Contacting Maintainers - -You may get in touch with the maintainer team through any of the following methods: - - * Through email: - * [kzm@zkat.tech](mailto:kzm@zkat.tech) (Kat Marchán) - - * Through Twitter: - * [@maybekatz](https://twitter.com/maybekatz) (Kat Marchán) - -### Further Enforcement - -If you've already followed the [initial enforcement steps](#enforcement), these are the steps maintainers will take for further enforcement, as needed: - - 1. Repeat the request to stop. - 2. If the person doubles down, they will have offending messages removed or edited by a maintainers given an official warning. The PR or Issue may be locked. - 3. If the behavior continues or is repeated later, the person will be blocked from participating for 24 hours. - 4. If the behavior continues or is repeated after the temporary block, a long-term (6-12mo) ban will be used. - -On top of this, maintainers may remove any offending messages, images, contributions, etc, as they deem necessary. - -Maintainers reserve full rights to skip any of these steps, at their discretion, if the violation is considered to be a serious and/or immediate threat to the health and well-being of members of the community. These include any threats, serious physical or verbal attacks, and other such behavior that would be completely unacceptable in any social setting that puts our members at risk. - -Members expelled from events or venues with any sort of paid attendance will not be refunded. - -### Who Watches the Watchers? - -Maintainers and other leaders who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. These may include anything from removal from the maintainer team to a permanent ban from the community. - -Additionally, as a project hosted on both GitHub and npm, [their own Codes of Conducts may be applied against maintainers of this project](#other-community-standards), externally of this project's procedures. - -### Enforcement Examples - -#### The Best Case - -The vast majority of situations work out like this. This interaction is common, and generally positive. - -> Alex: "Yeah I used X and it was really crazy!" - -> Patt (not a maintainer): "Hey, could you not use that word? What about 'ridiculous' instead?" - -> Alex: "oh sorry, sure." -> edits old comment to say "it was really confusing!" - -#### The Maintainer Case - -Sometimes, though, you need to get maintainers involved. Maintainers will do their best to resolve conflicts, but people who were harmed by something **will take priority**. - -> Patt: "Honestly, sometimes I just really hate using $library and anyone who uses it probably sucks at their job." - -> Alex: "Whoa there, could you dial it back a bit? There's a CoC thing about attacking folks' tech use like that." - -> Patt: "I'm not attacking anyone, what's your problem?" - -> Alex: "@maintainers hey uh. Can someone look at this issue? Patt is getting a bit aggro. I tried to nudge them about it, but nope." - -> KeeperOfCommitBits: (on issue) "Hey Patt, maintainer here. Could you tone it down? This sort of attack is really not okay in this space." - -> Patt: "Leave me alone I haven't said anything bad wtf is wrong with you." - -> KeeperOfCommitBits: (deletes user's comment), "@patt I mean it. Please refer to the CoC over at (URL to this CoC) if you have questions, but you can consider this an actual warning. I'd appreciate it if you reworded your messages in this thread, since they made folks there uncomfortable. Let's try and be kind, yeah?" - -> Patt: "@keeperofbits Okay sorry. I'm just frustrated and I'm kinda burnt out and I guess I got carried away. I'll DM Alex a note apologizing and edit my messages. Sorry for the trouble." - -> KeeperOfCommitBits: "@patt Thanks for that. I hear you on the stress. Burnout sucks :/. Have a good one!" - -#### The Nope Case - -> PepeTheFrog🐸: "Hi, I am a literal actual nazi and I think white supremacists are quite fashionable." - -> Patt: "NOOOOPE. OH NOPE NOPE." - -> Alex: "JFC NO. NOPE. @keeperofbits NOPE NOPE LOOK HERE" - -> KeeperOfCommitBits: "👀 Nope. NOPE NOPE NOPE. 🔥" - -> PepeTheFrog🐸 has been banned from all organization or user repositories belonging to KeeperOfCommitBits. - -## Attribution - -This Code of Conduct was generated using [WeAllJS Code of Conduct Generator](https://npm.im/weallbehave), which is based on the [WeAllJS Code of -Conduct](https://wealljs.org/code-of-conduct), which is itself based on -[Contributor Covenant](http://contributor-covenant.org), version 1.4, available -at -[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4), -and the LGBTQ in Technology Slack [Code of -Conduct](http://lgbtq.technology/coc.html). diff --git a/deps/npm/node_modules/libnpmpublish/CONTRIBUTING.md b/deps/npm/node_modules/libnpmpublish/CONTRIBUTING.md deleted file mode 100644 index 780044ffcc0f36..00000000000000 --- a/deps/npm/node_modules/libnpmpublish/CONTRIBUTING.md +++ /dev/null @@ -1,256 +0,0 @@ -# Contributing - -## How do I... - -* [Use This Guide](#introduction)? -* Ask or Say Something? 🤔🐛😱 - * [Request Support](#request-support) - * [Report an Error or Bug](#report-an-error-or-bug) - * [Request a Feature](#request-a-feature) -* Make Something? 🤓👩🏽‍💻📜🍳 - * [Project Setup](#project-setup) - * [Contribute Documentation](#contribute-documentation) - * [Contribute Code](#contribute-code) -* Manage Something ✅🙆🏼💃👔 - * [Provide Support on Issues](#provide-support-on-issues) - * [Label Issues](#label-issues) - * [Clean Up Issues and PRs](#clean-up-issues-and-prs) - * [Review Pull Requests](#review-pull-requests) - * [Merge Pull Requests](#merge-pull-requests) - * [Tag a Release](#tag-a-release) - * [Join the Project Team](#join-the-project-team) -* Add a Guide Like This One [To My Project](#attribution)? 🤖😻👻 - -## Introduction - -Thank you so much for your interest in contributing!. All types of contributions are encouraged and valued. See the [table of contents](#toc) for different ways to help and details about how this project handles them!📝 - -Please make sure to read the relevant section before making your contribution! It will make it a lot easier for us maintainers to make the most of it and smooth out the experience for all involved. 💚 - -The [Project Team](#join-the-project-team) looks forward to your contributions. 🙌🏾✨ - -## Request Support - -If you have a question about this project, how to use it, or just need clarification about something: - -* Open an Issue at https://github.com/npm/libnpmpublish/issues -* Provide as much context as you can about what you're running into. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* Someone will try to have a response soon. -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. - -## Report an Error or Bug - -If you run into an error or bug with the project: - -* Open an Issue at https://github.com/npm/libnpmpublish/issues -* Include *reproduction steps* that someone else can follow to recreate the bug or error on their own. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* A team member will try to reproduce the issue with your provided steps. If there are no repro steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced. -* If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#contribute-code). -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. -* `critical` issues may be left open, depending on perceived immediacy and severity, even past the 30 day deadline. - -## Request a Feature - -If the project doesn't do something you need or want it to do: - -* Open an Issue at https://github.com/npm/libnpmpublish/issues -* Provide as much context as you can about what you're running into. -* Please try and be clear about why existing features and alternatives would not work for you. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* The project team will evaluate the feature request, possibly asking you more questions to understand its purpose and any relevant requirements. If the issue is closed, the team will convey their reasoning and suggest an alternative path forward. -* If the feature request is accepted, it will be marked for implementation with `feature-accepted`, which can then be done by either by a core team member or by anyone in the community who wants to [contribute code](#contribute-code). - -Note: The team is unlikely to be able to accept every single feature request that is filed. Please understand if they need to say no. - -## Project Setup - -So you wanna contribute some code! That's great! This project uses GitHub Pull Requests to manage contributions, so [read up on how to fork a GitHub project and file a PR](https://guides.github.com/activities/forking) if you've never done it before. - -If this seems like a lot or you aren't able to do all this setup, you might also be able to [edit the files directly](https://help.github.com/articles/editing-files-in-another-user-s-repository/) without having to do any of this setup. Yes, [even code](#contribute-code). - -If you want to go the usual route and run the project locally, though: - -* [Install Node.js](https://nodejs.org/en/download/) -* [Fork the project](https://guides.github.com/activities/forking/#fork) - -Then in your terminal: -* `cd path/to/your/clone` -* `npm install` -* `npm test` - -And you should be ready to go! - -## Contribute Documentation - -Documentation is a super important, critical part of this project. Docs are how we keep track of what we're doing, how, and why. It's how we stay on the same page about our policies. And it's how we tell others everything they need in order to be able to use this project -- or contribute to it. So thank you in advance. - -Documentation contributions of any size are welcome! Feel free to file a PR even if you're just rewording a sentence to be more clear, or fixing a spelling mistake! - -To contribute documentation: - -* [Set up the project](#project-setup). -* Edit or add any relevant documentation. -* Make sure your changes are formatted correctly and consistently with the rest of the documentation. -* Re-read what you wrote, and run a spellchecker on it to make sure you didn't miss anything. -* In your commit message(s), begin the first line with `docs: `. For example: `docs: Adding a doc contrib section to CONTRIBUTING.md`. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). Documentation commits should use `docs(): `. -* Go to https://github.com/npm/libnpmpublish/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Contribute Code - -We like code commits a lot! They're super handy, and they keep the project going and doing the work it needs to do to be useful to others. - -Code contributions of just about any size are acceptable! - -The main difference between code contributions and documentation contributions is that contributing code requires inclusion of relevant tests for the code being added or changed. Contributions without accompanying tests will be held off until a test is added, unless the maintainers consider the specific tests to be either impossible, or way too much of a burden for such a contribution. - -To contribute code: - -* [Set up the project](#project-setup). -* Make any necessary changes to the source code. -* Include any [additional documentation](#contribute-documentation) the changes might need. -* Write tests that verify that your contribution works as expected. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). -* Dependency updates, additions, or removals must be in individual commits, and the message must use the format: `(deps): PKG@VERSION`, where `` is any of the usual `conventional-changelog` prefixes, at your discretion. -* Go to https://github.com/npm/libnpmpublish/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* Barring special circumstances, maintainers will not review PRs until all checks pass (Travis, AppVeyor, etc). -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. Additional tags (such as `needs-tests`) will be added depending on the review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Provide Support on Issues - -[Needs Collaborator](#join-the-project-team): none - -Helping out other users with their questions is a really awesome way of contributing to any community. It's not uncommon for most of the issues on an open source projects being support-related questions by users trying to understand something they ran into, or find their way around a known bug. - -Sometimes, the `support` label will be added to things that turn out to actually be other things, like bugs or feature requests. In that case, suss out the details with the person who filed the original issue, add a comment explaining what the bug is, and change the label from `support` to `bug` or `feature`. If you can't do this yourself, @mention a maintainer so they can do it. - -In order to help other folks out with their questions: - -* Go to the issue tracker and [filter open issues by the `support` label](https://github.com/npm/libnpmpublish/issues?q=is%3Aopen+is%3Aissue+label%3Asupport). -* Read through the list until you find something that you're familiar enough with to give an answer to. -* Respond to the issue with whatever details are needed to clarify the question, or get more details about what's going on. -* Once the discussion wraps up and things are clarified, either close the issue, or ask the original issue filer (or a maintainer) to close it for you. - -Some notes on picking up support issues: - -* Avoid responding to issues you don't know you can answer accurately. -* As much as possible, try to refer to past issues with accepted answers. Link to them from your replies with the `#123` format. -* Be kind and patient with users -- often, folks who have run into confusing things might be upset or impatient. This is ok. Try to understand where they're coming from, and if you're too uncomfortable with the tone, feel free to stay away or withdraw from the issue. (note: if the user is outright hostile or is violating the CoC, [refer to the Code of Conduct](CODE_OF_CONDUCT.md) to resolve the conflict). - -## Label Issues - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -One of the most important tasks in handling issues is labeling them usefully and accurately. All other tasks involving issues ultimately rely on the issue being classified in such a way that relevant parties looking to do their own tasks can find them quickly and easily. - -In order to label issues, [open up the list of unlabeled issues](https://github.com/npm/libnpmpublish/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and, **from newest to oldest**, read through each one and apply issue labels according to the table below. If you're unsure about what label to apply, skip the issue and try the next one: don't feel obligated to label each and every issue yourself! - -Label | Apply When | Notes ---- | --- | --- -`bug` | Cases where the code (or documentation) is behaving in a way it wasn't intended to. | If something is happening that surprises the *user* but does not go against the way the code is designed, it should use the `enhancement` label. -`critical` | Added to `bug` issues if the problem described makes the code completely unusable in a common situation. | -`documentation` | Added to issues or pull requests that affect any of the documentation for the project. | Can be combined with other labels, such as `bug` or `enhancement`. -`duplicate` | Added to issues or PRs that refer to the exact same issue as another one that's been previously labeled. | Duplicate issues should be marked and closed right away, with a message referencing the issue it's a duplicate of (with `#123`) -`enhancement` | Added to [feature requests](#request-a-feature), PRs, or documentation issues that are purely additive: the code or docs currently work as expected, but a change is being requested or suggested. | -`help wanted` | Applied by [Committers](#join-the-project-team) to issues and PRs that they would like to get outside help for. Generally, this means it's lower priority for the maintainer team to itself implement, but that the community is encouraged to pick up if they so desire | Never applied on first-pass labeling. -`in-progress` | Applied by [Committers](#join-the-project-team) to PRs that are pending some work before they're ready for review. | The original PR submitter should @mention the team member that applied the label once the PR is complete. -`performance` | This issue or PR is directly related to improving performance. | -`refactor` | Added to issues or PRs that deal with cleaning up or modifying the project for the betterment of it. | -`starter` | Applied by [Committers](#join-the-project-team) to issues that they consider good introductions to the project for people who have not contributed before. These are not necessarily "easy", but rather focused around how much context is necessary in order to understand what needs to be done for this project in particular. | Existing project members are expected to stay away from these unless they increase in priority. -`support` | This issue is either asking a question about how to use the project, clarifying the reason for unexpected behavior, or possibly reporting a `bug` but does not have enough detail yet to determine whether it would count as such. | The label should be switched to `bug` if reliable reproduction steps are provided. Issues primarily with unintended configurations of a user's environment are not considered bugs, even if they cause crashes. -`tests` | This issue or PR either requests or adds primarily tests to the project. | If a PR is pending tests, that will be handled through the [PR review process](#review-pull-requests) -`wontfix` | Labelers may apply this label to issues that clearly have nothing at all to do with the project or are otherwise entirely outside of its scope/sphere of influence. [Committers](#join-the-project-team) may apply this label and close an issue or PR if they decide to pass on an otherwise relevant issue. | The issue or PR should be closed as soon as the label is applied, and a clear explanation provided of why the label was used. Contributors are free to contest the labeling, but the decision ultimately falls on committers as to whether to accept something or not. - -## Clean Up Issues and PRs - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -Issues and PRs can go stale after a while. Maybe they're abandoned. Maybe the team will just plain not have time to address them any time soon. - -In these cases, they should be closed until they're brought up again or the interaction starts over. - -To clean up issues and PRs: - -* Search the issue tracker for issues or PRs, and add the term `updated:<=YYYY-MM-DD`, where the date is 30 days before today. -* Go through each issue *from oldest to newest*, and close them if **all of the following are true**: - * not opened by a maintainer - * not marked as `critical` - * not marked as `starter` or `help wanted` (these might stick around for a while, in general, as they're intended to be available) - * no explicit messages in the comments asking for it to be left open - * does not belong to a milestone -* Leave a message when closing saying "Cleaning up stale issue. Please reopen or ping us if and when you're ready to resume this. See https://github.com/npm/libnpmpublish/blob/latest/CONTRIBUTING.md#clean-up-issues-and-prs for more details." - -## Review Pull Requests - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -While anyone can comment on a PR, add feedback, etc, PRs are only *approved* by team members with Issue Tracker or higher permissions. - -PR reviews use [GitHub's own review feature](https://help.github.com/articles/about-pull-request-reviews/), which manages comments, approval, and review iteration. - -Some notes: - -* You may ask for minor changes ("nitpicks"), but consider whether they are really blockers to merging: try to err on the side of "approve, with comments". -* *ALL PULL REQUESTS* should be covered by a test: either by a previously-failing test, an existing test that covers the entire functionality of the submitted code, or new tests to verify any new/changed behavior. All tests must also pass and follow established conventions. Test coverage should not drop, unless the specific case is considered reasonable by maintainers. -* Please make sure you're familiar with the code or documentation being updated, unless it's a minor change (spellchecking, minor formatting, etc). You may @mention another project member who you think is better suited for the review, but still provide a non-approving review of your own. -* Be extra kind: people who submit code/doc contributions are putting themselves in a pretty vulnerable position, and have put time and care into what they've done (even if that's not obvious to you!) -- always respond with respect, be understanding, but don't feel like you need to sacrifice your standards for their sake, either. Just don't be a jerk about it? - -## Merge Pull Requests - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. - -## Tag A Release - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. The most important bit here is probably that all tests must pass, and tags must use [semver](https://semver.org). - -## Join the Project Team - -### Ways to Join - -There are many ways to contribute! Most of them don't require any official status unless otherwise noted. That said, there's a couple of positions that grant special repository abilities, and this section describes how they're granted and what they do. - -All of the below positions are granted based on the project team's needs, as well as their consensus opinion about whether they would like to work with the person and think that they would fit well into that position. The process is relatively informal, and it's likely that people who express interest in participating can just be granted the permissions they'd like. - -You can spot a collaborator on the repo by looking for the `[Collaborator]` or `[Owner]` tags next to their names. - -Permission | Description ---- | --- -Issue Tracker | Granted to contributors who express a strong interest in spending time on the project's issue tracker. These tasks are mainly [labeling issues](#label-issues), [cleaning up old ones](#clean-up-issues-and-prs), and [reviewing pull requests](#review-pull-requests), as well as all the usual things non-team-member contributors can do. Issue handlers should not merge pull requests, tag releases, or directly commit code themselves: that should still be done through the usual pull request process. Becoming an Issue Handler means the project team trusts you to understand enough of the team's process and context to implement it on the issue tracker. -Committer | Granted to contributors who want to handle the actual pull request merges, tagging new versions, etc. Committers should have a good level of familiarity with the codebase, and enough context to understand the implications of various changes, as well as a good sense of the will and expectations of the project team. -Admin/Owner | Granted to people ultimately responsible for the project, its community, etc. - -## Attribution - -This guide was generated using the WeAllJS `CONTRIBUTING.md` generator. [Make your own](https://npm.im/weallcontribute)! diff --git a/deps/npm/node_modules/libnpmsearch/CODE_OF_CONDUCT.md b/deps/npm/node_modules/libnpmsearch/CODE_OF_CONDUCT.md deleted file mode 100644 index aeb72f598dcb45..00000000000000 --- a/deps/npm/node_modules/libnpmsearch/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,151 +0,0 @@ -# Code of Conduct - -## When Something Happens - -If you see a Code of Conduct violation, follow these steps: - -1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their message(s) or commits. -2. That person should immediately stop the behavior and correct the issue. -3. If this doesn’t happen, or if you're uncomfortable speaking up, [contact the maintainers](#contacting-maintainers). -4. As soon as available, a maintainer will look into the issue, and take [further action (see below)](#further-enforcement), starting with a warning, then temporary block, then long-term repo or organization ban. - -When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation. - -**The maintainer team will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator.** See [some examples below](#enforcement-examples). - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers of this project pledge to making participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, technical preferences, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - - * Using welcoming and inclusive language. - * Being respectful of differing viewpoints and experiences. - * Gracefully accepting constructive feedback. - * Focusing on what is best for the community. - * Showing empathy and kindness towards other community members. - * Encouraging and raising up your peers in the project so you can all bask in hacks and glory. - -Examples of unacceptable behavior by participants include: - - * The use of sexualized language or imagery and unwelcome sexual attention or advances, including when simulated online. The only exception to sexual topics is channels/spaces specifically for topics of sexual identity. - * Casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology. - * Making light of/making mocking comments about trigger warnings and content warnings. - * Trolling, insulting/derogatory comments, and personal or political attacks. - * Public or private harassment, deliberate intimidation, or threats. - * Publishing others' private information, such as a physical or electronic address, without explicit permission. This includes any sort of "outing" of any aspect of someone's identity without their consent. - * Publishing private screenshots or quotes of interactions in the context of this project without all quoted users' *explicit* consent. - * Publishing of private communication that doesn't have to do with reporting harrassment. - * Any of the above even when [presented as "ironic" or "joking"](https://en.wikipedia.org/wiki/Hipster_racism). - * Any attempt to present "reverse-ism" versions of the above as violations. Examples of reverse-isms are "reverse racism", "reverse sexism", "heterophobia", and "cisphobia". - * Unsolicited explanations under the assumption that someone doesn't already know it. Ask before you teach! Don't assume what people's knowledge gaps are. - * [Feigning or exaggerating surprise](https://www.recurse.com/manual#no-feigned-surprise) when someone admits to not knowing something. - * "[Well-actuallies](https://www.recurse.com/manual#no-well-actuallys)" - * Other conduct which could reasonably be considered inappropriate in a professional or community setting. - -## Scope - -This Code of Conduct applies both within spaces involving this project and in other spaces involving community members. This includes the repository, its Pull Requests and Issue tracker, its Twitter community, private email communications in the context of the project, and any events where members of the project are participating, as well as adjacent communities and venues affecting the project's members. - -Depending on the violation, the maintainers may decide that violations of this code of conduct that have happened outside of the scope of the community may deem an individual unwelcome, and take appropriate action to maintain the comfort and safety of its members. - -### Other Community Standards - -As a project on GitHub, this project is additionally covered by the [GitHub Community Guidelines](https://help.github.com/articles/github-community-guidelines/). - -Additionally, as a project hosted on npm, is is covered by [npm, Inc's Code of Conduct](https://www.npmjs.com/policies/conduct). - -Enforcement of those guidelines after violations overlapping with the above are the responsibility of the entities, and enforcement may happen in any or all of the services/communities. - -## Maintainer Enforcement Process - -Once the maintainers get involved, they will follow a documented series of steps and do their best to preserve the well-being of project members. This section covers actual concrete steps. - -### Contacting Maintainers - -You may get in touch with the maintainer team through any of the following methods: - - * Through email: - * [kzm@zkat.tech](mailto:kzm@zkat.tech) (Kat Marchán) - - * Through Twitter: - * [@maybekatz](https://twitter.com/maybekatz) (Kat Marchán) - -### Further Enforcement - -If you've already followed the [initial enforcement steps](#enforcement), these are the steps maintainers will take for further enforcement, as needed: - - 1. Repeat the request to stop. - 2. If the person doubles down, they will have offending messages removed or edited by a maintainers given an official warning. The PR or Issue may be locked. - 3. If the behavior continues or is repeated later, the person will be blocked from participating for 24 hours. - 4. If the behavior continues or is repeated after the temporary block, a long-term (6-12mo) ban will be used. - -On top of this, maintainers may remove any offending messages, images, contributions, etc, as they deem necessary. - -Maintainers reserve full rights to skip any of these steps, at their discretion, if the violation is considered to be a serious and/or immediate threat to the health and well-being of members of the community. These include any threats, serious physical or verbal attacks, and other such behavior that would be completely unacceptable in any social setting that puts our members at risk. - -Members expelled from events or venues with any sort of paid attendance will not be refunded. - -### Who Watches the Watchers? - -Maintainers and other leaders who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. These may include anything from removal from the maintainer team to a permanent ban from the community. - -Additionally, as a project hosted on both GitHub and npm, [their own Codes of Conducts may be applied against maintainers of this project](#other-community-standards), externally of this project's procedures. - -### Enforcement Examples - -#### The Best Case - -The vast majority of situations work out like this. This interaction is common, and generally positive. - -> Alex: "Yeah I used X and it was really crazy!" - -> Patt (not a maintainer): "Hey, could you not use that word? What about 'ridiculous' instead?" - -> Alex: "oh sorry, sure." -> edits old comment to say "it was really confusing!" - -#### The Maintainer Case - -Sometimes, though, you need to get maintainers involved. Maintainers will do their best to resolve conflicts, but people who were harmed by something **will take priority**. - -> Patt: "Honestly, sometimes I just really hate using $library and anyone who uses it probably sucks at their job." - -> Alex: "Whoa there, could you dial it back a bit? There's a CoC thing about attacking folks' tech use like that." - -> Patt: "I'm not attacking anyone, what's your problem?" - -> Alex: "@maintainers hey uh. Can someone look at this issue? Patt is getting a bit aggro. I tried to nudge them about it, but nope." - -> KeeperOfCommitBits: (on issue) "Hey Patt, maintainer here. Could you tone it down? This sort of attack is really not okay in this space." - -> Patt: "Leave me alone I haven't said anything bad wtf is wrong with you." - -> KeeperOfCommitBits: (deletes user's comment), "@patt I mean it. Please refer to the CoC over at (URL to this CoC) if you have questions, but you can consider this an actual warning. I'd appreciate it if you reworded your messages in this thread, since they made folks there uncomfortable. Let's try and be kind, yeah?" - -> Patt: "@keeperofbits Okay sorry. I'm just frustrated and I'm kinda burnt out and I guess I got carried away. I'll DM Alex a note apologizing and edit my messages. Sorry for the trouble." - -> KeeperOfCommitBits: "@patt Thanks for that. I hear you on the stress. Burnout sucks :/. Have a good one!" - -#### The Nope Case - -> PepeTheFrog🐸: "Hi, I am a literal actual nazi and I think white supremacists are quite fashionable." - -> Patt: "NOOOOPE. OH NOPE NOPE." - -> Alex: "JFC NO. NOPE. @keeperofbits NOPE NOPE LOOK HERE" - -> KeeperOfCommitBits: "👀 Nope. NOPE NOPE NOPE. 🔥" - -> PepeTheFrog🐸 has been banned from all organization or user repositories belonging to KeeperOfCommitBits. - -## Attribution - -This Code of Conduct was generated using [WeAllJS Code of Conduct Generator](https://npm.im/weallbehave), which is based on the [WeAllJS Code of -Conduct](https://wealljs.org/code-of-conduct), which is itself based on -[Contributor Covenant](http://contributor-covenant.org), version 1.4, available -at -[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4), -and the LGBTQ in Technology Slack [Code of -Conduct](http://lgbtq.technology/coc.html). diff --git a/deps/npm/node_modules/libnpmsearch/CONTRIBUTING.md b/deps/npm/node_modules/libnpmsearch/CONTRIBUTING.md deleted file mode 100644 index 1a61601a16dbab..00000000000000 --- a/deps/npm/node_modules/libnpmsearch/CONTRIBUTING.md +++ /dev/null @@ -1,256 +0,0 @@ -# Contributing - -## How do I... - -* [Use This Guide](#introduction)? -* Ask or Say Something? 🤔🐛😱 - * [Request Support](#request-support) - * [Report an Error or Bug](#report-an-error-or-bug) - * [Request a Feature](#request-a-feature) -* Make Something? 🤓👩🏽‍💻📜🍳 - * [Project Setup](#project-setup) - * [Contribute Documentation](#contribute-documentation) - * [Contribute Code](#contribute-code) -* Manage Something ✅🙆🏼💃👔 - * [Provide Support on Issues](#provide-support-on-issues) - * [Label Issues](#label-issues) - * [Clean Up Issues and PRs](#clean-up-issues-and-prs) - * [Review Pull Requests](#review-pull-requests) - * [Merge Pull Requests](#merge-pull-requests) - * [Tag a Release](#tag-a-release) - * [Join the Project Team](#join-the-project-team) -* Add a Guide Like This One [To My Project](#attribution)? 🤖😻👻 - -## Introduction - -Thank you so much for your interest in contributing!. All types of contributions are encouraged and valued. See the [table of contents](#toc) for different ways to help and details about how this project handles them!📝 - -Please make sure to read the relevant section before making your contribution! It will make it a lot easier for us maintainers to make the most of it and smooth out the experience for all involved. 💚 - -The [Project Team](#join-the-project-team) looks forward to your contributions. 🙌🏾✨ - -## Request Support - -If you have a question about this project, how to use it, or just need clarification about something: - -* Open an Issue at https://github.com/npm/libnpmsearch/issues -* Provide as much context as you can about what you're running into. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* Someone will try to have a response soon. -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. - -## Report an Error or Bug - -If you run into an error or bug with the project: - -* Open an Issue at https://github.com/npm/libnpmsearch/issues -* Include *reproduction steps* that someone else can follow to recreate the bug or error on their own. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* A team member will try to reproduce the issue with your provided steps. If there are no repro steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced. -* If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#contribute-code). -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. -* `critical` issues may be left open, depending on perceived immediacy and severity, even past the 30 day deadline. - -## Request a Feature - -If the project doesn't do something you need or want it to do: - -* Open an Issue at https://github.com/npm/libnpmsearch/issues -* Provide as much context as you can about what you're running into. -* Please try and be clear about why existing features and alternatives would not work for you. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* The project team will evaluate the feature request, possibly asking you more questions to understand its purpose and any relevant requirements. If the issue is closed, the team will convey their reasoning and suggest an alternative path forward. -* If the feature request is accepted, it will be marked for implementation with `feature-accepted`, which can then be done by either by a core team member or by anyone in the community who wants to [contribute code](#contribute-code). - -Note: The team is unlikely to be able to accept every single feature request that is filed. Please understand if they need to say no. - -## Project Setup - -So you wanna contribute some code! That's great! This project uses GitHub Pull Requests to manage contributions, so [read up on how to fork a GitHub project and file a PR](https://guides.github.com/activities/forking) if you've never done it before. - -If this seems like a lot or you aren't able to do all this setup, you might also be able to [edit the files directly](https://help.github.com/articles/editing-files-in-another-user-s-repository/) without having to do any of this setup. Yes, [even code](#contribute-code). - -If you want to go the usual route and run the project locally, though: - -* [Install Node.js](https://nodejs.org/en/download/) -* [Fork the project](https://guides.github.com/activities/forking/#fork) - -Then in your terminal: -* `cd path/to/your/clone` -* `npm install` -* `npm test` - -And you should be ready to go! - -## Contribute Documentation - -Documentation is a super important, critical part of this project. Docs are how we keep track of what we're doing, how, and why. It's how we stay on the same page about our policies. And it's how we tell others everything they need in order to be able to use this project -- or contribute to it. So thank you in advance. - -Documentation contributions of any size are welcome! Feel free to file a PR even if you're just rewording a sentence to be more clear, or fixing a spelling mistake! - -To contribute documentation: - -* [Set up the project](#project-setup). -* Edit or add any relevant documentation. -* Make sure your changes are formatted correctly and consistently with the rest of the documentation. -* Re-read what you wrote, and run a spellchecker on it to make sure you didn't miss anything. -* In your commit message(s), begin the first line with `docs: `. For example: `docs: Adding a doc contrib section to CONTRIBUTING.md`. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). Documentation commits should use `docs(): `. -* Go to https://github.com/npm/libnpmsearch/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Contribute Code - -We like code commits a lot! They're super handy, and they keep the project going and doing the work it needs to do to be useful to others. - -Code contributions of just about any size are acceptable! - -The main difference between code contributions and documentation contributions is that contributing code requires inclusion of relevant tests for the code being added or changed. Contributions without accompanying tests will be held off until a test is added, unless the maintainers consider the specific tests to be either impossible, or way too much of a burden for such a contribution. - -To contribute code: - -* [Set up the project](#project-setup). -* Make any necessary changes to the source code. -* Include any [additional documentation](#contribute-documentation) the changes might need. -* Write tests that verify that your contribution works as expected. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). -* Dependency updates, additions, or removals must be in individual commits, and the message must use the format: `(deps): PKG@VERSION`, where `` is any of the usual `conventional-changelog` prefixes, at your discretion. -* Go to https://github.com/npm/libnpmsearch/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* Barring special circumstances, maintainers will not review PRs until all checks pass (Travis, AppVeyor, etc). -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. Additional tags (such as `needs-tests`) will be added depending on the review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Provide Support on Issues - -[Needs Collaborator](#join-the-project-team): none - -Helping out other users with their questions is a really awesome way of contributing to any community. It's not uncommon for most of the issues on an open source projects being support-related questions by users trying to understand something they ran into, or find their way around a known bug. - -Sometimes, the `support` label will be added to things that turn out to actually be other things, like bugs or feature requests. In that case, suss out the details with the person who filed the original issue, add a comment explaining what the bug is, and change the label from `support` to `bug` or `feature`. If you can't do this yourself, @mention a maintainer so they can do it. - -In order to help other folks out with their questions: - -* Go to the issue tracker and [filter open issues by the `support` label](https://github.com/npm/libnpmsearch/issues?q=is%3Aopen+is%3Aissue+label%3Asupport). -* Read through the list until you find something that you're familiar enough with to give an answer to. -* Respond to the issue with whatever details are needed to clarify the question, or get more details about what's going on. -* Once the discussion wraps up and things are clarified, either close the issue, or ask the original issue filer (or a maintainer) to close it for you. - -Some notes on picking up support issues: - -* Avoid responding to issues you don't know you can answer accurately. -* As much as possible, try to refer to past issues with accepted answers. Link to them from your replies with the `#123` format. -* Be kind and patient with users -- often, folks who have run into confusing things might be upset or impatient. This is ok. Try to understand where they're coming from, and if you're too uncomfortable with the tone, feel free to stay away or withdraw from the issue. (note: if the user is outright hostile or is violating the CoC, [refer to the Code of Conduct](CODE_OF_CONDUCT.md) to resolve the conflict). - -## Label Issues - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -One of the most important tasks in handling issues is labeling them usefully and accurately. All other tasks involving issues ultimately rely on the issue being classified in such a way that relevant parties looking to do their own tasks can find them quickly and easily. - -In order to label issues, [open up the list of unlabeled issues](https://github.com/npm/libnpmsearch/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and, **from newest to oldest**, read through each one and apply issue labels according to the table below. If you're unsure about what label to apply, skip the issue and try the next one: don't feel obligated to label each and every issue yourself! - -Label | Apply When | Notes ---- | --- | --- -`bug` | Cases where the code (or documentation) is behaving in a way it wasn't intended to. | If something is happening that surprises the *user* but does not go against the way the code is designed, it should use the `enhancement` label. -`critical` | Added to `bug` issues if the problem described makes the code completely unusable in a common situation. | -`documentation` | Added to issues or pull requests that affect any of the documentation for the project. | Can be combined with other labels, such as `bug` or `enhancement`. -`duplicate` | Added to issues or PRs that refer to the exact same issue as another one that's been previously labeled. | Duplicate issues should be marked and closed right away, with a message referencing the issue it's a duplicate of (with `#123`) -`enhancement` | Added to [feature requests](#request-a-feature), PRs, or documentation issues that are purely additive: the code or docs currently work as expected, but a change is being requested or suggested. | -`help wanted` | Applied by [Committers](#join-the-project-team) to issues and PRs that they would like to get outside help for. Generally, this means it's lower priority for the maintainer team to itself implement, but that the community is encouraged to pick up if they so desire | Never applied on first-pass labeling. -`in-progress` | Applied by [Committers](#join-the-project-team) to PRs that are pending some work before they're ready for review. | The original PR submitter should @mention the team member that applied the label once the PR is complete. -`performance` | This issue or PR is directly related to improving performance. | -`refactor` | Added to issues or PRs that deal with cleaning up or modifying the project for the betterment of it. | -`starter` | Applied by [Committers](#join-the-project-team) to issues that they consider good introductions to the project for people who have not contributed before. These are not necessarily "easy", but rather focused around how much context is necessary in order to understand what needs to be done for this project in particular. | Existing project members are expected to stay away from these unless they increase in priority. -`support` | This issue is either asking a question about how to use the project, clarifying the reason for unexpected behavior, or possibly reporting a `bug` but does not have enough detail yet to determine whether it would count as such. | The label should be switched to `bug` if reliable reproduction steps are provided. Issues primarily with unintended configurations of a user's environment are not considered bugs, even if they cause crashes. -`tests` | This issue or PR either requests or adds primarily tests to the project. | If a PR is pending tests, that will be handled through the [PR review process](#review-pull-requests) -`wontfix` | Labelers may apply this label to issues that clearly have nothing at all to do with the project or are otherwise entirely outside of its scope/sphere of influence. [Committers](#join-the-project-team) may apply this label and close an issue or PR if they decide to pass on an otherwise relevant issue. | The issue or PR should be closed as soon as the label is applied, and a clear explanation provided of why the label was used. Contributors are free to contest the labeling, but the decision ultimately falls on committers as to whether to accept something or not. - -## Clean Up Issues and PRs - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -Issues and PRs can go stale after a while. Maybe they're abandoned. Maybe the team will just plain not have time to address them any time soon. - -In these cases, they should be closed until they're brought up again or the interaction starts over. - -To clean up issues and PRs: - -* Search the issue tracker for issues or PRs, and add the term `updated:<=YYYY-MM-DD`, where the date is 30 days before today. -* Go through each issue *from oldest to newest*, and close them if **all of the following are true**: - * not opened by a maintainer - * not marked as `critical` - * not marked as `starter` or `help wanted` (these might stick around for a while, in general, as they're intended to be available) - * no explicit messages in the comments asking for it to be left open - * does not belong to a milestone -* Leave a message when closing saying "Cleaning up stale issue. Please reopen or ping us if and when you're ready to resume this. See https://github.com/npm/libnpmsearch/blob/latest/CONTRIBUTING.md#clean-up-issues-and-prs for more details." - -## Review Pull Requests - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -While anyone can comment on a PR, add feedback, etc, PRs are only *approved* by team members with Issue Tracker or higher permissions. - -PR reviews use [GitHub's own review feature](https://help.github.com/articles/about-pull-request-reviews/), which manages comments, approval, and review iteration. - -Some notes: - -* You may ask for minor changes ("nitpicks"), but consider whether they are really blockers to merging: try to err on the side of "approve, with comments". -* *ALL PULL REQUESTS* should be covered by a test: either by a previously-failing test, an existing test that covers the entire functionality of the submitted code, or new tests to verify any new/changed behavior. All tests must also pass and follow established conventions. Test coverage should not drop, unless the specific case is considered reasonable by maintainers. -* Please make sure you're familiar with the code or documentation being updated, unless it's a minor change (spellchecking, minor formatting, etc). You may @mention another project member who you think is better suited for the review, but still provide a non-approving review of your own. -* Be extra kind: people who submit code/doc contributions are putting themselves in a pretty vulnerable position, and have put time and care into what they've done (even if that's not obvious to you!) -- always respond with respect, be understanding, but don't feel like you need to sacrifice your standards for their sake, either. Just don't be a jerk about it? - -## Merge Pull Requests - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. - -## Tag A Release - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. The most important bit here is probably that all tests must pass, and tags must use [semver](https://semver.org). - -## Join the Project Team - -### Ways to Join - -There are many ways to contribute! Most of them don't require any official status unless otherwise noted. That said, there's a couple of positions that grant special repository abilities, and this section describes how they're granted and what they do. - -All of the below positions are granted based on the project team's needs, as well as their consensus opinion about whether they would like to work with the person and think that they would fit well into that position. The process is relatively informal, and it's likely that people who express interest in participating can just be granted the permissions they'd like. - -You can spot a collaborator on the repo by looking for the `[Collaborator]` or `[Owner]` tags next to their names. - -Permission | Description ---- | --- -Issue Tracker | Granted to contributors who express a strong interest in spending time on the project's issue tracker. These tasks are mainly [labeling issues](#label-issues), [cleaning up old ones](#clean-up-issues-and-prs), and [reviewing pull requests](#review-pull-requests), as well as all the usual things non-team-member contributors can do. Issue handlers should not merge pull requests, tag releases, or directly commit code themselves: that should still be done through the usual pull request process. Becoming an Issue Handler means the project team trusts you to understand enough of the team's process and context to implement it on the issue tracker. -Committer | Granted to contributors who want to handle the actual pull request merges, tagging new versions, etc. Committers should have a good level of familiarity with the codebase, and enough context to understand the implications of various changes, as well as a good sense of the will and expectations of the project team. -Admin/Owner | Granted to people ultimately responsible for the project, its community, etc. - -## Attribution - -This guide was generated using the WeAllJS `CONTRIBUTING.md` generator. [Make your own](https://npm.im/weallcontribute)! diff --git a/deps/npm/node_modules/libnpmteam/CODE_OF_CONDUCT.md b/deps/npm/node_modules/libnpmteam/CODE_OF_CONDUCT.md deleted file mode 100644 index aeb72f598dcb45..00000000000000 --- a/deps/npm/node_modules/libnpmteam/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,151 +0,0 @@ -# Code of Conduct - -## When Something Happens - -If you see a Code of Conduct violation, follow these steps: - -1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their message(s) or commits. -2. That person should immediately stop the behavior and correct the issue. -3. If this doesn’t happen, or if you're uncomfortable speaking up, [contact the maintainers](#contacting-maintainers). -4. As soon as available, a maintainer will look into the issue, and take [further action (see below)](#further-enforcement), starting with a warning, then temporary block, then long-term repo or organization ban. - -When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation. - -**The maintainer team will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator.** See [some examples below](#enforcement-examples). - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers of this project pledge to making participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, technical preferences, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - - * Using welcoming and inclusive language. - * Being respectful of differing viewpoints and experiences. - * Gracefully accepting constructive feedback. - * Focusing on what is best for the community. - * Showing empathy and kindness towards other community members. - * Encouraging and raising up your peers in the project so you can all bask in hacks and glory. - -Examples of unacceptable behavior by participants include: - - * The use of sexualized language or imagery and unwelcome sexual attention or advances, including when simulated online. The only exception to sexual topics is channels/spaces specifically for topics of sexual identity. - * Casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology. - * Making light of/making mocking comments about trigger warnings and content warnings. - * Trolling, insulting/derogatory comments, and personal or political attacks. - * Public or private harassment, deliberate intimidation, or threats. - * Publishing others' private information, such as a physical or electronic address, without explicit permission. This includes any sort of "outing" of any aspect of someone's identity without their consent. - * Publishing private screenshots or quotes of interactions in the context of this project without all quoted users' *explicit* consent. - * Publishing of private communication that doesn't have to do with reporting harrassment. - * Any of the above even when [presented as "ironic" or "joking"](https://en.wikipedia.org/wiki/Hipster_racism). - * Any attempt to present "reverse-ism" versions of the above as violations. Examples of reverse-isms are "reverse racism", "reverse sexism", "heterophobia", and "cisphobia". - * Unsolicited explanations under the assumption that someone doesn't already know it. Ask before you teach! Don't assume what people's knowledge gaps are. - * [Feigning or exaggerating surprise](https://www.recurse.com/manual#no-feigned-surprise) when someone admits to not knowing something. - * "[Well-actuallies](https://www.recurse.com/manual#no-well-actuallys)" - * Other conduct which could reasonably be considered inappropriate in a professional or community setting. - -## Scope - -This Code of Conduct applies both within spaces involving this project and in other spaces involving community members. This includes the repository, its Pull Requests and Issue tracker, its Twitter community, private email communications in the context of the project, and any events where members of the project are participating, as well as adjacent communities and venues affecting the project's members. - -Depending on the violation, the maintainers may decide that violations of this code of conduct that have happened outside of the scope of the community may deem an individual unwelcome, and take appropriate action to maintain the comfort and safety of its members. - -### Other Community Standards - -As a project on GitHub, this project is additionally covered by the [GitHub Community Guidelines](https://help.github.com/articles/github-community-guidelines/). - -Additionally, as a project hosted on npm, is is covered by [npm, Inc's Code of Conduct](https://www.npmjs.com/policies/conduct). - -Enforcement of those guidelines after violations overlapping with the above are the responsibility of the entities, and enforcement may happen in any or all of the services/communities. - -## Maintainer Enforcement Process - -Once the maintainers get involved, they will follow a documented series of steps and do their best to preserve the well-being of project members. This section covers actual concrete steps. - -### Contacting Maintainers - -You may get in touch with the maintainer team through any of the following methods: - - * Through email: - * [kzm@zkat.tech](mailto:kzm@zkat.tech) (Kat Marchán) - - * Through Twitter: - * [@maybekatz](https://twitter.com/maybekatz) (Kat Marchán) - -### Further Enforcement - -If you've already followed the [initial enforcement steps](#enforcement), these are the steps maintainers will take for further enforcement, as needed: - - 1. Repeat the request to stop. - 2. If the person doubles down, they will have offending messages removed or edited by a maintainers given an official warning. The PR or Issue may be locked. - 3. If the behavior continues or is repeated later, the person will be blocked from participating for 24 hours. - 4. If the behavior continues or is repeated after the temporary block, a long-term (6-12mo) ban will be used. - -On top of this, maintainers may remove any offending messages, images, contributions, etc, as they deem necessary. - -Maintainers reserve full rights to skip any of these steps, at their discretion, if the violation is considered to be a serious and/or immediate threat to the health and well-being of members of the community. These include any threats, serious physical or verbal attacks, and other such behavior that would be completely unacceptable in any social setting that puts our members at risk. - -Members expelled from events or venues with any sort of paid attendance will not be refunded. - -### Who Watches the Watchers? - -Maintainers and other leaders who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. These may include anything from removal from the maintainer team to a permanent ban from the community. - -Additionally, as a project hosted on both GitHub and npm, [their own Codes of Conducts may be applied against maintainers of this project](#other-community-standards), externally of this project's procedures. - -### Enforcement Examples - -#### The Best Case - -The vast majority of situations work out like this. This interaction is common, and generally positive. - -> Alex: "Yeah I used X and it was really crazy!" - -> Patt (not a maintainer): "Hey, could you not use that word? What about 'ridiculous' instead?" - -> Alex: "oh sorry, sure." -> edits old comment to say "it was really confusing!" - -#### The Maintainer Case - -Sometimes, though, you need to get maintainers involved. Maintainers will do their best to resolve conflicts, but people who were harmed by something **will take priority**. - -> Patt: "Honestly, sometimes I just really hate using $library and anyone who uses it probably sucks at their job." - -> Alex: "Whoa there, could you dial it back a bit? There's a CoC thing about attacking folks' tech use like that." - -> Patt: "I'm not attacking anyone, what's your problem?" - -> Alex: "@maintainers hey uh. Can someone look at this issue? Patt is getting a bit aggro. I tried to nudge them about it, but nope." - -> KeeperOfCommitBits: (on issue) "Hey Patt, maintainer here. Could you tone it down? This sort of attack is really not okay in this space." - -> Patt: "Leave me alone I haven't said anything bad wtf is wrong with you." - -> KeeperOfCommitBits: (deletes user's comment), "@patt I mean it. Please refer to the CoC over at (URL to this CoC) if you have questions, but you can consider this an actual warning. I'd appreciate it if you reworded your messages in this thread, since they made folks there uncomfortable. Let's try and be kind, yeah?" - -> Patt: "@keeperofbits Okay sorry. I'm just frustrated and I'm kinda burnt out and I guess I got carried away. I'll DM Alex a note apologizing and edit my messages. Sorry for the trouble." - -> KeeperOfCommitBits: "@patt Thanks for that. I hear you on the stress. Burnout sucks :/. Have a good one!" - -#### The Nope Case - -> PepeTheFrog🐸: "Hi, I am a literal actual nazi and I think white supremacists are quite fashionable." - -> Patt: "NOOOOPE. OH NOPE NOPE." - -> Alex: "JFC NO. NOPE. @keeperofbits NOPE NOPE LOOK HERE" - -> KeeperOfCommitBits: "👀 Nope. NOPE NOPE NOPE. 🔥" - -> PepeTheFrog🐸 has been banned from all organization or user repositories belonging to KeeperOfCommitBits. - -## Attribution - -This Code of Conduct was generated using [WeAllJS Code of Conduct Generator](https://npm.im/weallbehave), which is based on the [WeAllJS Code of -Conduct](https://wealljs.org/code-of-conduct), which is itself based on -[Contributor Covenant](http://contributor-covenant.org), version 1.4, available -at -[http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4), -and the LGBTQ in Technology Slack [Code of -Conduct](http://lgbtq.technology/coc.html). diff --git a/deps/npm/node_modules/libnpmteam/CONTRIBUTING.md b/deps/npm/node_modules/libnpmteam/CONTRIBUTING.md deleted file mode 100644 index 3fd40076caae85..00000000000000 --- a/deps/npm/node_modules/libnpmteam/CONTRIBUTING.md +++ /dev/null @@ -1,256 +0,0 @@ -# Contributing - -## How do I... - -* [Use This Guide](#introduction)? -* Ask or Say Something? 🤔🐛😱 - * [Request Support](#request-support) - * [Report an Error or Bug](#report-an-error-or-bug) - * [Request a Feature](#request-a-feature) -* Make Something? 🤓👩🏽‍💻📜🍳 - * [Project Setup](#project-setup) - * [Contribute Documentation](#contribute-documentation) - * [Contribute Code](#contribute-code) -* Manage Something ✅🙆🏼💃👔 - * [Provide Support on Issues](#provide-support-on-issues) - * [Label Issues](#label-issues) - * [Clean Up Issues and PRs](#clean-up-issues-and-prs) - * [Review Pull Requests](#review-pull-requests) - * [Merge Pull Requests](#merge-pull-requests) - * [Tag a Release](#tag-a-release) - * [Join the Project Team](#join-the-project-team) -* Add a Guide Like This One [To My Project](#attribution)? 🤖😻👻 - -## Introduction - -Thank you so much for your interest in contributing!. All types of contributions are encouraged and valued. See the [table of contents](#toc) for different ways to help and details about how this project handles them!📝 - -Please make sure to read the relevant section before making your contribution! It will make it a lot easier for us maintainers to make the most of it and smooth out the experience for all involved. 💚 - -The [Project Team](#join-the-project-team) looks forward to your contributions. 🙌🏾✨ - -## Request Support - -If you have a question about this project, how to use it, or just need clarification about something: - -* Open an Issue at https://github.com/npm/libnpmteam/issues -* Provide as much context as you can about what you're running into. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* Someone will try to have a response soon. -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. - -## Report an Error or Bug - -If you run into an error or bug with the project: - -* Open an Issue at https://github.com/npm/libnpmteam/issues -* Include *reproduction steps* that someone else can follow to recreate the bug or error on their own. -* Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant. If not, please be ready to provide that information if maintainers ask for it. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* A team member will try to reproduce the issue with your provided steps. If there are no repro steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced. -* If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#contribute-code). -* If you or the maintainers don't respond to an issue for 30 days, the [issue will be closed](#clean-up-issues-and-prs). If you want to come back to it, reply (once, please), and we'll reopen the existing issue. Please avoid filing new issues as extensions of one you already made. -* `critical` issues may be left open, depending on perceived immediacy and severity, even past the 30 day deadline. - -## Request a Feature - -If the project doesn't do something you need or want it to do: - -* Open an Issue at https://github.com/npm/libnpmteam/issues -* Provide as much context as you can about what you're running into. -* Please try and be clear about why existing features and alternatives would not work for you. - -Once it's filed: - -* The project team will [label the issue](#label-issues). -* The project team will evaluate the feature request, possibly asking you more questions to understand its purpose and any relevant requirements. If the issue is closed, the team will convey their reasoning and suggest an alternative path forward. -* If the feature request is accepted, it will be marked for implementation with `feature-accepted`, which can then be done by either by a core team member or by anyone in the community who wants to [contribute code](#contribute-code). - -Note: The team is unlikely to be able to accept every single feature request that is filed. Please understand if they need to say no. - -## Project Setup - -So you wanna contribute some code! That's great! This project uses GitHub Pull Requests to manage contributions, so [read up on how to fork a GitHub project and file a PR](https://guides.github.com/activities/forking) if you've never done it before. - -If this seems like a lot or you aren't able to do all this setup, you might also be able to [edit the files directly](https://help.github.com/articles/editing-files-in-another-user-s-repository/) without having to do any of this setup. Yes, [even code](#contribute-code). - -If you want to go the usual route and run the project locally, though: - -* [Install Node.js](https://nodejs.org/en/download/) -* [Fork the project](https://guides.github.com/activities/forking/#fork) - -Then in your terminal: -* `cd path/to/your/clone` -* `npm install` -* `npm test` - -And you should be ready to go! - -## Contribute Documentation - -Documentation is a super important, critical part of this project. Docs are how we keep track of what we're doing, how, and why. It's how we stay on the same page about our policies. And it's how we tell others everything they need in order to be able to use this project -- or contribute to it. So thank you in advance. - -Documentation contributions of any size are welcome! Feel free to file a PR even if you're just rewording a sentence to be more clear, or fixing a spelling mistake! - -To contribute documentation: - -* [Set up the project](#project-setup). -* Edit or add any relevant documentation. -* Make sure your changes are formatted correctly and consistently with the rest of the documentation. -* Re-read what you wrote, and run a spellchecker on it to make sure you didn't miss anything. -* In your commit message(s), begin the first line with `docs: `. For example: `docs: Adding a doc contrib section to CONTRIBUTING.md`. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). Documentation commits should use `docs(): `. -* Go to https://github.com/npm/libnpmteam/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Contribute Code - -We like code commits a lot! They're super handy, and they keep the project going and doing the work it needs to do to be useful to others. - -Code contributions of just about any size are acceptable! - -The main difference between code contributions and documentation contributions is that contributing code requires inclusion of relevant tests for the code being added or changed. Contributions without accompanying tests will be held off until a test is added, unless the maintainers consider the specific tests to be either impossible, or way too much of a burden for such a contribution. - -To contribute code: - -* [Set up the project](#project-setup). -* Make any necessary changes to the source code. -* Include any [additional documentation](#contribute-documentation) the changes might need. -* Write tests that verify that your contribution works as expected. -* Write clear, concise commit message(s) using [conventional-changelog format](https://github.com/conventional-changelog/conventional-changelog-angular/blob/master/convention.md). -* Dependency updates, additions, or removals must be in individual commits, and the message must use the format: `(deps): PKG@VERSION`, where `` is any of the usual `conventional-changelog` prefixes, at your discretion. -* Go to https://github.com/npm/libnpmteam/pulls and open a new pull request with your changes. -* If your PR is connected to an open issue, add a line in your PR's description that says `Fixes: #123`, where `#123` is the number of the issue you're fixing. - -Once you've filed the PR: - -* Barring special circumstances, maintainers will not review PRs until all checks pass (Travis, AppVeyor, etc). -* One or more maintainers will use GitHub's review feature to review your PR. -* If the maintainer asks for any changes, edit your changes, push, and ask for another review. Additional tags (such as `needs-tests`) will be added depending on the review. -* If the maintainer decides to pass on your PR, they will thank you for the contribution and explain why they won't be accepting the changes. That's ok! We still really appreciate you taking the time to do it, and we don't take that lightly. 💚 -* If your PR gets accepted, it will be marked as such, and merged into the `latest` branch soon after. Your contribution will be distributed to the masses next time the maintainers [tag a release](#tag-a-release) - -## Provide Support on Issues - -[Needs Collaborator](#join-the-project-team): none - -Helping out other users with their questions is a really awesome way of contributing to any community. It's not uncommon for most of the issues on an open source projects being support-related questions by users trying to understand something they ran into, or find their way around a known bug. - -Sometimes, the `support` label will be added to things that turn out to actually be other things, like bugs or feature requests. In that case, suss out the details with the person who filed the original issue, add a comment explaining what the bug is, and change the label from `support` to `bug` or `feature`. If you can't do this yourself, @mention a maintainer so they can do it. - -In order to help other folks out with their questions: - -* Go to the issue tracker and [filter open issues by the `support` label](https://github.com/npm/libnpmteam/issues?q=is%3Aopen+is%3Aissue+label%3Asupport). -* Read through the list until you find something that you're familiar enough with to give an answer to. -* Respond to the issue with whatever details are needed to clarify the question, or get more details about what's going on. -* Once the discussion wraps up and things are clarified, either close the issue, or ask the original issue filer (or a maintainer) to close it for you. - -Some notes on picking up support issues: - -* Avoid responding to issues you don't know you can answer accurately. -* As much as possible, try to refer to past issues with accepted answers. Link to them from your replies with the `#123` format. -* Be kind and patient with users -- often, folks who have run into confusing things might be upset or impatient. This is ok. Try to understand where they're coming from, and if you're too uncomfortable with the tone, feel free to stay away or withdraw from the issue. (note: if the user is outright hostile or is violating the CoC, [refer to the Code of Conduct](CODE_OF_CONDUCT.md) to resolve the conflict). - -## Label Issues - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -One of the most important tasks in handling issues is labeling them usefully and accurately. All other tasks involving issues ultimately rely on the issue being classified in such a way that relevant parties looking to do their own tasks can find them quickly and easily. - -In order to label issues, [open up the list of unlabeled issues](https://github.com/npm/libnpmteam/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and, **from newest to oldest**, read through each one and apply issue labels according to the table below. If you're unsure about what label to apply, skip the issue and try the next one: don't feel obligated to label each and every issue yourself! - -Label | Apply When | Notes ---- | --- | --- -`bug` | Cases where the code (or documentation) is behaving in a way it wasn't intended to. | If something is happening that surprises the *user* but does not go against the way the code is designed, it should use the `enhancement` label. -`critical` | Added to `bug` issues if the problem described makes the code completely unusable in a common situation. | -`documentation` | Added to issues or pull requests that affect any of the documentation for the project. | Can be combined with other labels, such as `bug` or `enhancement`. -`duplicate` | Added to issues or PRs that refer to the exact same issue as another one that's been previously labeled. | Duplicate issues should be marked and closed right away, with a message referencing the issue it's a duplicate of (with `#123`) -`enhancement` | Added to [feature requests](#request-a-feature), PRs, or documentation issues that are purely additive: the code or docs currently work as expected, but a change is being requested or suggested. | -`help wanted` | Applied by [Committers](#join-the-project-team) to issues and PRs that they would like to get outside help for. Generally, this means it's lower priority for the maintainer team to itself implement, but that the community is encouraged to pick up if they so desire | Never applied on first-pass labeling. -`in-progress` | Applied by [Committers](#join-the-project-team) to PRs that are pending some work before they're ready for review. | The original PR submitter should @mention the team member that applied the label once the PR is complete. -`performance` | This issue or PR is directly related to improving performance. | -`refactor` | Added to issues or PRs that deal with cleaning up or modifying the project for the betterment of it. | -`starter` | Applied by [Committers](#join-the-project-team) to issues that they consider good introductions to the project for people who have not contributed before. These are not necessarily "easy", but rather focused around how much context is necessary in order to understand what needs to be done for this project in particular. | Existing project members are expected to stay away from these unless they increase in priority. -`support` | This issue is either asking a question about how to use the project, clarifying the reason for unexpected behavior, or possibly reporting a `bug` but does not have enough detail yet to determine whether it would count as such. | The label should be switched to `bug` if reliable reproduction steps are provided. Issues primarily with unintended configurations of a user's environment are not considered bugs, even if they cause crashes. -`tests` | This issue or PR either requests or adds primarily tests to the project. | If a PR is pending tests, that will be handled through the [PR review process](#review-pull-requests) -`wontfix` | Labelers may apply this label to issues that clearly have nothing at all to do with the project or are otherwise entirely outside of its scope/sphere of influence. [Committers](#join-the-project-team) may apply this label and close an issue or PR if they decide to pass on an otherwise relevant issue. | The issue or PR should be closed as soon as the label is applied, and a clear explanation provided of why the label was used. Contributors are free to contest the labeling, but the decision ultimately falls on committers as to whether to accept something or not. - -## Clean Up Issues and PRs - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -Issues and PRs can go stale after a while. Maybe they're abandoned. Maybe the team will just plain not have time to address them any time soon. - -In these cases, they should be closed until they're brought up again or the interaction starts over. - -To clean up issues and PRs: - -* Search the issue tracker for issues or PRs, and add the term `updated:<=YYYY-MM-DD`, where the date is 30 days before today. -* Go through each issue *from oldest to newest*, and close them if **all of the following are true**: - * not opened by a maintainer - * not marked as `critical` - * not marked as `starter` or `help wanted` (these might stick around for a while, in general, as they're intended to be available) - * no explicit messages in the comments asking for it to be left open - * does not belong to a milestone -* Leave a message when closing saying "Cleaning up stale issue. Please reopen or ping us if and when you're ready to resume this. See https://github.com/npm/libnpmteam/blob/latest/CONTRIBUTING.md#clean-up-issues-and-prs for more details." - -## Review Pull Requests - -[Needs Collaborator](#join-the-project-team): Issue Tracker - -While anyone can comment on a PR, add feedback, etc, PRs are only *approved* by team members with Issue Tracker or higher permissions. - -PR reviews use [GitHub's own review feature](https://help.github.com/articles/about-pull-request-reviews/), which manages comments, approval, and review iteration. - -Some notes: - -* You may ask for minor changes ("nitpicks"), but consider whether they are really blockers to merging: try to err on the side of "approve, with comments". -* *ALL PULL REQUESTS* should be covered by a test: either by a previously-failing test, an existing test that covers the entire functionality of the submitted code, or new tests to verify any new/changed behavior. All tests must also pass and follow established conventions. Test coverage should not drop, unless the specific case is considered reasonable by maintainers. -* Please make sure you're familiar with the code or documentation being updated, unless it's a minor change (spellchecking, minor formatting, etc). You may @mention another project member who you think is better suited for the review, but still provide a non-approving review of your own. -* Be extra kind: people who submit code/doc contributions are putting themselves in a pretty vulnerable position, and have put time and care into what they've done (even if that's not obvious to you!) -- always respond with respect, be understanding, but don't feel like you need to sacrifice your standards for their sake, either. Just don't be a jerk about it? - -## Merge Pull Requests - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. - -## Tag A Release - -[Needs Collaborator](#join-the-project-team): Committer - -TBD - need to hash out a bit more of this process. The most important bit here is probably that all tests must pass, and tags must use [semver](https://semver.org). - -## Join the Project Team - -### Ways to Join - -There are many ways to contribute! Most of them don't require any official status unless otherwise noted. That said, there's a couple of positions that grant special repository abilities, and this section describes how they're granted and what they do. - -All of the below positions are granted based on the project team's needs, as well as their consensus opinion about whether they would like to work with the person and think that they would fit well into that position. The process is relatively informal, and it's likely that people who express interest in participating can just be granted the permissions they'd like. - -You can spot a collaborator on the repo by looking for the `[Collaborator]` or `[Owner]` tags next to their names. - -Permission | Description ---- | --- -Issue Tracker | Granted to contributors who express a strong interest in spending time on the project's issue tracker. These tasks are mainly [labeling issues](#label-issues), [cleaning up old ones](#clean-up-issues-and-prs), and [reviewing pull requests](#review-pull-requests), as well as all the usual things non-team-member contributors can do. Issue handlers should not merge pull requests, tag releases, or directly commit code themselves: that should still be done through the usual pull request process. Becoming an Issue Handler means the project team trusts you to understand enough of the team's process and context to implement it on the issue tracker. -Committer | Granted to contributors who want to handle the actual pull request merges, tagging new versions, etc. Committers should have a good level of familiarity with the codebase, and enough context to understand the implications of various changes, as well as a good sense of the will and expectations of the project team. -Admin/Owner | Granted to people ultimately responsible for the project, its community, etc. - -## Attribution - -This guide was generated using the WeAllJS `CONTRIBUTING.md` generator. [Make your own](https://npm.im/weallcontribute)! diff --git a/deps/npm/node_modules/libnpx/CHANGELOG.md b/deps/npm/node_modules/libnpx/CHANGELOG.md index 5fa91fac96ae70..74da62235d696e 100644 --- a/deps/npm/node_modules/libnpx/CHANGELOG.md +++ b/deps/npm/node_modules/libnpx/CHANGELOG.md @@ -2,61 +2,73 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [10.2.2](https://github.com/npm/npx/compare/v10.2.1...v10.2.2) (2020-01-28) + + +### Bug Fixes + +* correct Kat's github url ([9a23db1](https://github.com/npm/npx/commit/9a23db1)) +* install latest npm on travis for node 6 ([e0eb3cb](https://github.com/npm/npx/commit/e0eb3cb)) +* Update changelog to fix old issue links ([3733137](https://github.com/npm/npx/commit/3733137)) + + + -# [10.2.0](https://github.com/zkat/npx/compare/v10.1.1...v10.2.0) (2018-04-13) +# [10.2.0](https://github.com/npm/npx/compare/v10.1.1...v10.2.0) (2018-04-13) ### Bug Fixes -* **i18n:** fix korean; 쉘 -> 셸 ([#163](https://github.com/zkat/npx/issues/163)) ([11d9fe0](https://github.com/zkat/npx/commit/11d9fe0)) -* **spawn:** spawn child processes with node without relying on the shebang. ([#174](https://github.com/zkat/npx/issues/174)) ([cba97bb](https://github.com/zkat/npx/commit/cba97bb)) -* **windows:** Allow spaces in the node path when using --node-arg ([#173](https://github.com/zkat/npx/issues/173)) ([fe0d48a](https://github.com/zkat/npx/commit/fe0d48a)), closes [#170](https://github.com/zkat/npx/issues/170) +* **i18n:** fix korean; 쉘 -> 셸 ([#163](https://github.com/zkat/npx/issues/163)) ([11d9fe0](https://github.com/npm/npx/commit/11d9fe0)) +* **spawn:** spawn child processes with node without relying on the shebang. ([#174](https://github.com/zkat/npx/issues/174)) ([cba97bb](https://github.com/npm/npx/commit/cba97bb)) +* **windows:** Allow spaces in the node path when using --node-arg ([#173](https://github.com/zkat/npx/issues/173)) ([fe0d48a](https://github.com/npm/npx/commit/fe0d48a)), closes [#170](https://github.com/zkat/npx/issues/170) ### Features -* **i18n:** add translation ([#159](https://github.com/zkat/npx/issues/159)) ([5da008b](https://github.com/zkat/npx/commit/5da008b)) +* **i18n:** add translation ([#159](https://github.com/zkat/npx/issues/159)) ([5da008b](https://github.com/npm/npx/commit/5da008b)) -## [10.1.1](https://github.com/zkat/npx/compare/v10.1.0...v10.1.1) (2018-04-12) +## [10.1.1](https://github.com/npm/npx/compare/v10.1.0...v10.1.1) (2018-04-12) -# [10.1.0](https://github.com/zkat/npx/compare/v10.0.1...v10.1.0) (2018-04-12) +# [10.1.0](https://github.com/npm/npx/compare/v10.0.1...v10.1.0) (2018-04-12) ### Features -* **spawn:** add --always-spawn to opt out of process takeover optimization feature ([#172](https://github.com/zkat/npx/issues/172)) ([c0d6abc](https://github.com/zkat/npx/commit/c0d6abc)) +* **spawn:** add --always-spawn to opt out of process takeover optimization feature ([#172](https://github.com/zkat/npx/issues/172)) ([c0d6abc](https://github.com/npm/npx/commit/c0d6abc)) -## [10.0.1](https://github.com/zkat/npx/compare/v10.0.0...v10.0.1) (2018-03-08) +## [10.0.1](https://github.com/npm/npx/compare/v10.0.0...v10.0.1) (2018-03-08) ### Bug Fixes -* **i18n:** Improve French localization ([#158](https://github.com/zkat/npx/issues/158)) ([c88823e](https://github.com/zkat/npx/commit/c88823e)) -* **windows:** on Windows, throw useful error when package contains no binaries([#142](https://github.com/zkat/npx/issues/142)) ([a69276e](https://github.com/zkat/npx/commit/a69276e)), closes [#137](https://github.com/zkat/npx/issues/137) +* **i18n:** Improve French localization ([#158](https://github.com/zkat/npx/issues/158)) ([c88823e](https://github.com/npm/npx/commit/c88823e)) +* **windows:** on Windows, throw useful error when package contains no binaries([#142](https://github.com/zkat/npx/issues/142)) ([a69276e](https://github.com/npm/npx/commit/a69276e)), closes [#137](https://github.com/zkat/npx/issues/137) -# [10.0.0](https://github.com/zkat/npx/compare/v9.7.1...v10.0.0) (2018-03-08) +# [10.0.0](https://github.com/npm/npx/compare/v9.7.1...v10.0.0) (2018-03-08) ### Bug Fixes -* **i18n:** Fix Korean locale ([#130](https://github.com/zkat/npx/issues/130)) ([752db48](https://github.com/zkat/npx/commit/752db48)) -* **index:** remove extraneous logging on Windows ([#136](https://github.com/zkat/npx/issues/136)) ([357e6ab](https://github.com/zkat/npx/commit/357e6ab)), closes [#131](https://github.com/zkat/npx/issues/131) -* **license:** change npx license to ISC ([a617d7b](https://github.com/zkat/npx/commit/a617d7b)) -* **parse-args:** fix version thing for yargs ([30677ed](https://github.com/zkat/npx/commit/30677ed)) -* **prefix:** Handle node_modules without package.json ([#128](https://github.com/zkat/npx/issues/128)) ([f64ae43](https://github.com/zkat/npx/commit/f64ae43)), closes [/github.com/babel/babel/issues/4066#issuecomment-336705199](https://github.com//github.com/babel/babel/issues/4066/issues/issuecomment-336705199) -* **standard:** get things in line with standard 11 ([6cf8e88](https://github.com/zkat/npx/commit/6cf8e88)) +* **i18n:** Fix Korean locale ([#130](https://github.com/zkat/npx/issues/130)) ([752db48](https://github.com/npm/npx/commit/752db48)) +* **index:** remove extraneous logging on Windows ([#136](https://github.com/zkat/npx/issues/136)) ([357e6ab](https://github.com/npm/npx/commit/357e6ab)), closes [#131](https://github.com/zkat/npx/issues/131) +* **license:** change npx license to ISC ([a617d7b](https://github.com/npm/npx/commit/a617d7b)) +* **parse-args:** fix version thing for yargs ([30677ed](https://github.com/npm/npx/commit/30677ed)) +* **prefix:** Handle node_modules without package.json ([#128](https://github.com/zkat/npx/issues/128)) ([f64ae43](https://github.com/npm/npx/commit/f64ae43)), closes [/github.com/babel/babel/issues/4066#issuecomment-336705199](https://github.com//github.com/babel/babel/issues/4066/issues/issuecomment-336705199) +* **standard:** get things in line with standard 11 ([6cf8e88](https://github.com/npm/npx/commit/6cf8e88)) ### BREAKING CHANGES @@ -66,271 +78,271 @@ All notable changes to this project will be documented in this file. See [standa -## [9.7.1](https://github.com/zkat/npx/compare/v9.7.0...v9.7.1) (2017-10-19) +## [9.7.1](https://github.com/npm/npx/compare/v9.7.0...v9.7.1) (2017-10-19) ### Bug Fixes -* **main:** err... oops? ([f24b4e3](https://github.com/zkat/npx/commit/f24b4e3)) +* **main:** err... oops? ([f24b4e3](https://github.com/npm/npx/commit/f24b4e3)) -# [9.7.0](https://github.com/zkat/npx/compare/v9.6.0...v9.7.0) (2017-10-19) +# [9.7.0](https://github.com/npm/npx/compare/v9.6.0...v9.7.0) (2017-10-19) ### Bug Fixes -* **exec:** fixed unix binary pathing issues (#120) ([f80a970](https://github.com/zkat/npx/commit/f80a970)), closes [#120](https://github.com/zkat/npx/issues/120) +* **exec:** fixed unix binary pathing issues (#120) ([f80a970](https://github.com/npm/npx/commit/f80a970)), closes [#120](https://github.com/zkat/npx/issues/120) ### Features -* **child:** add opts.installerStdio (#126) ([ade03f7](https://github.com/zkat/npx/commit/ade03f7)) +* **child:** add opts.installerStdio (#126) ([ade03f7](https://github.com/npm/npx/commit/ade03f7)) -# [9.6.0](https://github.com/zkat/npx/compare/v9.5.0...v9.6.0) (2017-08-17) +# [9.6.0](https://github.com/npm/npx/compare/v9.5.0...v9.6.0) (2017-08-17) ### Features -* **i18n:** add Arabic translation (#111) ([3c5b99a](https://github.com/zkat/npx/commit/3c5b99a)) -* **i18n:** add Dutch (#108) ([ed116fd](https://github.com/zkat/npx/commit/ed116fd)) +* **i18n:** add Arabic translation (#111) ([3c5b99a](https://github.com/npm/npx/commit/3c5b99a)) +* **i18n:** add Dutch (#108) ([ed116fd](https://github.com/npm/npx/commit/ed116fd)) -# [9.5.0](https://github.com/zkat/npx/compare/v9.4.1...v9.5.0) (2017-07-28) +# [9.5.0](https://github.com/npm/npx/compare/v9.4.1...v9.5.0) (2017-07-28) ### Features -* **i18n:** add Polish translations (#99) ([8442f59](https://github.com/zkat/npx/commit/8442f59)) +* **i18n:** add Polish translations (#99) ([8442f59](https://github.com/npm/npx/commit/8442f59)) -## [9.4.1](https://github.com/zkat/npx/compare/v9.4.0...v9.4.1) (2017-07-21) +## [9.4.1](https://github.com/npm/npx/compare/v9.4.0...v9.4.1) (2017-07-21) ### Bug Fixes -* **i18n:** fix filename for uk.json locale ([2c770e4](https://github.com/zkat/npx/commit/2c770e4)) +* **i18n:** fix filename for uk.json locale ([2c770e4](https://github.com/npm/npx/commit/2c770e4)) -# [9.4.0](https://github.com/zkat/npx/compare/v9.3.2...v9.4.0) (2017-07-21) +# [9.4.0](https://github.com/npm/npx/compare/v9.3.2...v9.4.0) (2017-07-21) ### Bug Fixes -* **i18n:** minor fixes to ru locale (#92) ([f4d5051](https://github.com/zkat/npx/commit/f4d5051)), closes [#92](https://github.com/zkat/npx/issues/92) +* **i18n:** minor fixes to ru locale (#92) ([f4d5051](https://github.com/npm/npx/commit/f4d5051)), closes [#92](https://github.com/zkat/npx/issues/92) ### Features -* **i18n:** `no` locale fallback for Norwegian bokmål ⚠️ In case of weird setups ⚠️ (#91) ([74f0e4c](https://github.com/zkat/npx/commit/74f0e4c)) -* **i18n:** add Bahasa Indonesia locale (#95) ([80dceeb](https://github.com/zkat/npx/commit/80dceeb)) -* **i18n:** add serbian translation (#96) ([040de7a](https://github.com/zkat/npx/commit/040de7a)) -* **i18n:** add Ukrainian locale (#93) ([9a3ef33](https://github.com/zkat/npx/commit/9a3ef33)) -* **i18n:** Added Norwegian (bokmål and nynorsk) translations (#90) ([6c5c733](https://github.com/zkat/npx/commit/6c5c733)) +* **i18n:** `no` locale fallback for Norwegian bokmål ⚠️ In case of weird setups ⚠️ (#91) ([74f0e4c](https://github.com/npm/npx/commit/74f0e4c)) +* **i18n:** add Bahasa Indonesia locale (#95) ([80dceeb](https://github.com/npm/npx/commit/80dceeb)) +* **i18n:** add serbian translation (#96) ([040de7a](https://github.com/npm/npx/commit/040de7a)) +* **i18n:** add Ukrainian locale (#93) ([9a3ef33](https://github.com/npm/npx/commit/9a3ef33)) +* **i18n:** Added Norwegian (bokmål and nynorsk) translations (#90) ([6c5c733](https://github.com/npm/npx/commit/6c5c733)) -## [9.3.2](https://github.com/zkat/npx/compare/v9.3.1...v9.3.2) (2017-07-17) +## [9.3.2](https://github.com/npm/npx/compare/v9.3.1...v9.3.2) (2017-07-17) ### Bug Fixes -* **exec:** detect a wider range of shebang lines for node scripts (#89) ([1841b6f](https://github.com/zkat/npx/commit/1841b6f)) -* **windows:** escape spawn args because windows is picky (#87) ([314e5eb](https://github.com/zkat/npx/commit/314e5eb)) -* **windows:** get magic shim detection working on Windows (#88) ([255aeeb](https://github.com/zkat/npx/commit/255aeeb)) +* **exec:** detect a wider range of shebang lines for node scripts (#89) ([1841b6f](https://github.com/npm/npx/commit/1841b6f)) +* **windows:** escape spawn args because windows is picky (#87) ([314e5eb](https://github.com/npm/npx/commit/314e5eb)) +* **windows:** get magic shim detection working on Windows (#88) ([255aeeb](https://github.com/npm/npx/commit/255aeeb)) -## [9.3.1](https://github.com/zkat/npx/compare/v9.3.0...v9.3.1) (2017-07-17) +## [9.3.1](https://github.com/npm/npx/compare/v9.3.0...v9.3.1) (2017-07-17) ### Bug Fixes -* **deps:** update to npm[@5](https://github.com/5).3.0 ([2b14de2](https://github.com/zkat/npx/commit/2b14de2)) +* **deps:** update to npm[@5](https://github.com/5).3.0 ([2b14de2](https://github.com/npm/npx/commit/2b14de2)) -# [9.3.0](https://github.com/zkat/npx/compare/v9.2.3...v9.3.0) (2017-07-17) +# [9.3.0](https://github.com/npm/npx/compare/v9.2.3...v9.3.0) (2017-07-17) ### Features -* **i18n:** add Korean locale (#86) ([3655314](https://github.com/zkat/npx/commit/3655314)) +* **i18n:** add Korean locale (#86) ([3655314](https://github.com/npm/npx/commit/3655314)) -## [9.2.3](https://github.com/zkat/npx/compare/v9.2.2...v9.2.3) (2017-07-17) +## [9.2.3](https://github.com/npm/npx/compare/v9.2.2...v9.2.3) (2017-07-17) ### Bug Fixes -* **paths:** support npm/npx paths with spaces in them ([8f3b829](https://github.com/zkat/npx/commit/8f3b829)) +* **paths:** support npm/npx paths with spaces in them ([8f3b829](https://github.com/npm/npx/commit/8f3b829)) -## [9.2.2](https://github.com/zkat/npx/compare/v9.2.1...v9.2.2) (2017-07-15) +## [9.2.2](https://github.com/npm/npx/compare/v9.2.1...v9.2.2) (2017-07-15) ### Bug Fixes -* **npm:** escape path to npm, too ([333d2ff](https://github.com/zkat/npx/commit/333d2ff)) +* **npm:** escape path to npm, too ([333d2ff](https://github.com/npm/npx/commit/333d2ff)) -## [9.2.1](https://github.com/zkat/npx/compare/v9.2.0...v9.2.1) (2017-07-14) +## [9.2.1](https://github.com/npm/npx/compare/v9.2.0...v9.2.1) (2017-07-14) ### Bug Fixes -* **windows:** fixed windows binary pathing issues ([761dfe9](https://github.com/zkat/npx/commit/761dfe9)) +* **windows:** fixed windows binary pathing issues ([761dfe9](https://github.com/npm/npx/commit/761dfe9)) -# [9.2.0](https://github.com/zkat/npx/compare/v9.1.0...v9.2.0) (2017-07-14) +# [9.2.0](https://github.com/npm/npx/compare/v9.1.0...v9.2.0) (2017-07-14) ### Bug Fixes -* **binpath:** fix calling binaries from subdirectories ([f185d0d](https://github.com/zkat/npx/commit/f185d0d)) -* **i18n:** Fix typos in french locale (#78) ([f277fc7](https://github.com/zkat/npx/commit/f277fc7)), closes [#78](https://github.com/zkat/npx/issues/78) +* **binpath:** fix calling binaries from subdirectories ([f185d0d](https://github.com/npm/npx/commit/f185d0d)) +* **i18n:** Fix typos in french locale (#78) ([f277fc7](https://github.com/npm/npx/commit/f277fc7)), closes [#78](https://github.com/zkat/npx/issues/78) ### Features -* **i18n:** Add German translations (#79) ([c81e26d](https://github.com/zkat/npx/commit/c81e26d)) -* **i18n:** add zh_TW translation (#80) ([98288d8](https://github.com/zkat/npx/commit/98288d8)) +* **i18n:** Add German translations (#79) ([c81e26d](https://github.com/npm/npx/commit/c81e26d)) +* **i18n:** add zh_TW translation (#80) ([98288d8](https://github.com/npm/npx/commit/98288d8)) -# [9.1.0](https://github.com/zkat/npx/compare/v9.0.7...v9.1.0) (2017-07-12) +# [9.1.0](https://github.com/npm/npx/compare/v9.0.7...v9.1.0) (2017-07-12) ### Bug Fixes -* **call:** only npm run env if package.json exists ([370f395](https://github.com/zkat/npx/commit/370f395)) -* **i18n:** Fix grammar and spelling for de.json (#63) ([b14020f](https://github.com/zkat/npx/commit/b14020f)), closes [#63](https://github.com/zkat/npx/issues/63) -* **i18n:** wording revisions for Brazilian Portuguese (#75) ([b5dc536](https://github.com/zkat/npx/commit/b5dc536)) -* **npm:** path directly to the npm-cli.js script ([d531206](https://github.com/zkat/npx/commit/d531206)) -* **rimraf:** fix rimraf.sync is not a function issue ([d2ecba3](https://github.com/zkat/npx/commit/d2ecba3)) -* **windows:** get npx working well on Windows again (#69) ([6cfb8de](https://github.com/zkat/npx/commit/6cfb8de)), closes [#60](https://github.com/zkat/npx/issues/60) [#58](https://github.com/zkat/npx/issues/58) [#62](https://github.com/zkat/npx/issues/62) +* **call:** only npm run env if package.json exists ([370f395](https://github.com/npm/npx/commit/370f395)) +* **i18n:** Fix grammar and spelling for de.json (#63) ([b14020f](https://github.com/npm/npx/commit/b14020f)), closes [#63](https://github.com/zkat/npx/issues/63) +* **i18n:** wording revisions for Brazilian Portuguese (#75) ([b5dc536](https://github.com/npm/npx/commit/b5dc536)) +* **npm:** path directly to the npm-cli.js script ([d531206](https://github.com/npm/npx/commit/d531206)) +* **rimraf:** fix rimraf.sync is not a function issue ([d2ecba3](https://github.com/npm/npx/commit/d2ecba3)) +* **windows:** get npx working well on Windows again (#69) ([6cfb8de](https://github.com/npm/npx/commit/6cfb8de)), closes [#60](https://github.com/zkat/npx/issues/60) [#58](https://github.com/zkat/npx/issues/58) [#62](https://github.com/zkat/npx/issues/62) ### Features -* **i18n:** add Czech translation (#76) ([8a0b3f6](https://github.com/zkat/npx/commit/8a0b3f6)) -* **i18n:** Add Turkish translation (#73) ([26e5edf](https://github.com/zkat/npx/commit/26e5edf)) -* **i18n:** Added support for Italian language (#71) ([6883e75](https://github.com/zkat/npx/commit/6883e75)) -* **i18n:** Fix Romanian translation (#70) ([fd6bbcf](https://github.com/zkat/npx/commit/fd6bbcf)), closes [#70](https://github.com/zkat/npx/issues/70) -* **node:** add --node-arg support to pass flags to node for script binaries (#77) ([65665bd](https://github.com/zkat/npx/commit/65665bd)) +* **i18n:** add Czech translation (#76) ([8a0b3f6](https://github.com/npm/npx/commit/8a0b3f6)) +* **i18n:** Add Turkish translation (#73) ([26e5edf](https://github.com/npm/npx/commit/26e5edf)) +* **i18n:** Added support for Italian language (#71) ([6883e75](https://github.com/npm/npx/commit/6883e75)) +* **i18n:** Fix Romanian translation (#70) ([fd6bbcf](https://github.com/npm/npx/commit/fd6bbcf)), closes [#70](https://github.com/zkat/npx/issues/70) +* **node:** add --node-arg support to pass flags to node for script binaries (#77) ([65665bd](https://github.com/npm/npx/commit/65665bd)) -## [9.0.7](https://github.com/zkat/npx/compare/v9.0.6...v9.0.7) (2017-07-11) +## [9.0.7](https://github.com/npm/npx/compare/v9.0.6...v9.0.7) (2017-07-11) ### Bug Fixes -* **i18n:** Fix some Catalan translations (#59) ([11c8a19](https://github.com/zkat/npx/commit/11c8a19)), closes [#59](https://github.com/zkat/npx/issues/59) +* **i18n:** Fix some Catalan translations (#59) ([11c8a19](https://github.com/npm/npx/commit/11c8a19)), closes [#59](https://github.com/zkat/npx/issues/59) -## [9.0.6](https://github.com/zkat/npx/compare/v9.0.5...v9.0.6) (2017-07-11) +## [9.0.6](https://github.com/npm/npx/compare/v9.0.5...v9.0.6) (2017-07-11) ### Bug Fixes -* **auto-fallback:** fix syntax error in bash/zsh auto-fallback ([d8b19db](https://github.com/zkat/npx/commit/d8b19db)) +* **auto-fallback:** fix syntax error in bash/zsh auto-fallback ([d8b19db](https://github.com/npm/npx/commit/d8b19db)) -## [9.0.5](https://github.com/zkat/npx/compare/v9.0.4...v9.0.5) (2017-07-11) +## [9.0.5](https://github.com/npm/npx/compare/v9.0.4...v9.0.5) (2017-07-11) ### Bug Fixes -* **npx:** something went wrong with the 9.0.4 build and bundledeps ([75fc436](https://github.com/zkat/npx/commit/75fc436)) +* **npx:** something went wrong with the 9.0.4 build and bundledeps ([75fc436](https://github.com/npm/npx/commit/75fc436)) -## [9.0.4](https://github.com/zkat/npx/compare/v9.0.3...v9.0.4) (2017-07-11) +## [9.0.4](https://github.com/npm/npx/compare/v9.0.3...v9.0.4) (2017-07-11) ### Bug Fixes -* **auto-fallback:** prevent infinite loop if npx disappears ([6c24e58](https://github.com/zkat/npx/commit/6c24e58)) -* **bin:** add repository and more detailed author info ([906574e](https://github.com/zkat/npx/commit/906574e)) -* **bin:** pin the npx bin's dependencies ([ae62f7a](https://github.com/zkat/npx/commit/ae62f7a)) -* **build:** make sure changelog and license are copied to bin ([4fbb599](https://github.com/zkat/npx/commit/4fbb599)) -* **deps:** stop bundling deps in libnpx itself ([c3e56e9](https://github.com/zkat/npx/commit/c3e56e9)) -* **errors:** print command not found for packages without valid binaries ([9b24359](https://github.com/zkat/npx/commit/9b24359)) -* **help:** --no-install help text was contradicting itself ([9d96f5e](https://github.com/zkat/npx/commit/9d96f5e)) -* **install:** prevent concurrent npx runs from clobbering each other ([6b35c91](https://github.com/zkat/npx/commit/6b35c91)) -* **npx:** npx npx npx npx npx npx npx npx npx works again ([875d4cd](https://github.com/zkat/npx/commit/875d4cd)) -* **updater:** dependency injection for update-notifier target ([c3027a9](https://github.com/zkat/npx/commit/c3027a9)) -* **updater:** ignore some kinds of update-notifier errors ([7631bbe](https://github.com/zkat/npx/commit/7631bbe)) +* **auto-fallback:** prevent infinite loop if npx disappears ([6c24e58](https://github.com/npm/npx/commit/6c24e58)) +* **bin:** add repository and more detailed author info ([906574e](https://github.com/npm/npx/commit/906574e)) +* **bin:** pin the npx bin's dependencies ([ae62f7a](https://github.com/npm/npx/commit/ae62f7a)) +* **build:** make sure changelog and license are copied to bin ([4fbb599](https://github.com/npm/npx/commit/4fbb599)) +* **deps:** stop bundling deps in libnpx itself ([c3e56e9](https://github.com/npm/npx/commit/c3e56e9)) +* **errors:** print command not found for packages without valid binaries ([9b24359](https://github.com/npm/npx/commit/9b24359)) +* **help:** --no-install help text was contradicting itself ([9d96f5e](https://github.com/npm/npx/commit/9d96f5e)) +* **install:** prevent concurrent npx runs from clobbering each other ([6b35c91](https://github.com/npm/npx/commit/6b35c91)) +* **npx:** npx npx npx npx npx npx npx npx npx works again ([875d4cd](https://github.com/npm/npx/commit/875d4cd)) +* **updater:** dependency injection for update-notifier target ([c3027a9](https://github.com/npm/npx/commit/c3027a9)) +* **updater:** ignore some kinds of update-notifier errors ([7631bbe](https://github.com/npm/npx/commit/7631bbe)) -## [9.0.3](https://github.com/zkat/npx/compare/v9.0.2...v9.0.3) (2017-07-08) +## [9.0.3](https://github.com/npm/npx/compare/v9.0.2...v9.0.3) (2017-07-08) ### Bug Fixes -* **version:** hand version to yargs directly ([e0b5eeb](https://github.com/zkat/npx/commit/e0b5eeb)) +* **version:** hand version to yargs directly ([e0b5eeb](https://github.com/npm/npx/commit/e0b5eeb)) -## [9.0.2](https://github.com/zkat/npx/compare/v9.0.1...v9.0.2) (2017-07-08) +## [9.0.2](https://github.com/npm/npx/compare/v9.0.1...v9.0.2) (2017-07-08) ### Bug Fixes -* **manpage:** fix manpage for real because files syntax is weird ([9145e2a](https://github.com/zkat/npx/commit/9145e2a)) +* **manpage:** fix manpage for real because files syntax is weird ([9145e2a](https://github.com/npm/npx/commit/9145e2a)) -## [9.0.1](https://github.com/zkat/npx/compare/v9.0.0...v9.0.1) (2017-07-08) +## [9.0.1](https://github.com/npm/npx/compare/v9.0.0...v9.0.1) (2017-07-08) ### Bug Fixes -* **man:** make sure manpage is used in npx bin ([704b94f](https://github.com/zkat/npx/commit/704b94f)) +* **man:** make sure manpage is used in npx bin ([704b94f](https://github.com/npm/npx/commit/704b94f)) -# [9.0.0](https://github.com/zkat/npx/compare/v8.1.1...v9.0.0) (2017-07-08) +# [9.0.0](https://github.com/npm/npx/compare/v8.1.1...v9.0.0) (2017-07-08) ### Features -* **libnpx:** libify main npx codebase ([643f58e](https://github.com/zkat/npx/commit/643f58e)) -* **npx:** create a new binary for standalone publishing ([da5a3b7](https://github.com/zkat/npx/commit/da5a3b7)) +* **libnpx:** libify main npx codebase ([643f58e](https://github.com/npm/npx/commit/643f58e)) +* **npx:** create a new binary for standalone publishing ([da5a3b7](https://github.com/npm/npx/commit/da5a3b7)) ### BREAKING CHANGES @@ -342,49 +354,49 @@ and a separate project will take over the role of the main `npx` binary. -## [8.1.1](https://github.com/zkat/npx/compare/v8.1.0...v8.1.1) (2017-07-06) +## [8.1.1](https://github.com/npm/npx/compare/v8.1.0...v8.1.1) (2017-07-06) ### Bug Fixes -* **deps:** bump all deps ([6ea24bf](https://github.com/zkat/npx/commit/6ea24bf)) -* **npm:** bump npm to 5.1.0 for a bunch of fixes ([18e4587](https://github.com/zkat/npx/commit/18e4587)) +* **deps:** bump all deps ([6ea24bf](https://github.com/npm/npx/commit/6ea24bf)) +* **npm:** bump npm to 5.1.0 for a bunch of fixes ([18e4587](https://github.com/npm/npx/commit/18e4587)) -# [8.1.0](https://github.com/zkat/npx/compare/v8.0.1...v8.1.0) (2017-06-27) +# [8.1.0](https://github.com/npm/npx/compare/v8.0.1...v8.1.0) (2017-06-27) ### Bug Fixes -* **i18n:** minor tweaks to ja.json (#46) ([1ed63c2](https://github.com/zkat/npx/commit/1ed63c2)) +* **i18n:** minor tweaks to ja.json (#46) ([1ed63c2](https://github.com/npm/npx/commit/1ed63c2)) ### Features -* **i18n:** Update pt_BR.json (#51) ([d292f22](https://github.com/zkat/npx/commit/d292f22)) +* **i18n:** Update pt_BR.json (#51) ([d292f22](https://github.com/npm/npx/commit/d292f22)) -## [8.0.1](https://github.com/zkat/npx/compare/v8.0.0...v8.0.1) (2017-06-27) +## [8.0.1](https://github.com/npm/npx/compare/v8.0.0...v8.0.1) (2017-06-27) ### Bug Fixes -* **npm:** bump npm version for more bugfixes ([30711a8](https://github.com/zkat/npx/commit/30711a8)) -* **npm:** Use --parseable option to work around output quirks ([8cb75a2](https://github.com/zkat/npx/commit/8cb75a2)) +* **npm:** bump npm version for more bugfixes ([30711a8](https://github.com/npm/npx/commit/30711a8)) +* **npm:** Use --parseable option to work around output quirks ([8cb75a2](https://github.com/npm/npx/commit/8cb75a2)) -# [8.0.0](https://github.com/zkat/npx/compare/v7.0.0...v8.0.0) (2017-06-24) +# [8.0.0](https://github.com/npm/npx/compare/v7.0.0...v8.0.0) (2017-06-24) ### Features -* **exec:** auto-guess binaries when different from pkg name ([139c434](https://github.com/zkat/npx/commit/139c434)) +* **exec:** auto-guess binaries when different from pkg name ([139c434](https://github.com/npm/npx/commit/139c434)) ### BREAKING CHANGES @@ -398,17 +410,17 @@ multiple non-matching binaries, but that should be rare. -# [7.0.0](https://github.com/zkat/npx/compare/v6.2.0...v7.0.0) (2017-06-24) +# [7.0.0](https://github.com/npm/npx/compare/v6.2.0...v7.0.0) (2017-06-24) ### Bug Fixes -* **win32:** improve win32 situation a bit (#50) ([b7ad934](https://github.com/zkat/npx/commit/b7ad934)) +* **win32:** improve win32 situation a bit (#50) ([b7ad934](https://github.com/npm/npx/commit/b7ad934)) ### Features -* **local:** improve the behavior when calling ./local paths (#48) ([2e418d1](https://github.com/zkat/npx/commit/2e418d1)) +* **local:** improve the behavior when calling ./local paths (#48) ([2e418d1](https://github.com/npm/npx/commit/2e418d1)) ### BREAKING CHANGES @@ -422,71 +434,71 @@ of all the various cases and how each of them is handled. -# [6.2.0](https://github.com/zkat/npx/compare/v6.1.0...v6.2.0) (2017-06-23) +# [6.2.0](https://github.com/npm/npx/compare/v6.1.0...v6.2.0) (2017-06-23) ### Bug Fixes -* **child:** iron out a few crinkles and add tests ([b3b5ef6](https://github.com/zkat/npx/commit/b3b5ef6)) -* **execCmd:** only reuse the current process if no shell passed in ([e413cff](https://github.com/zkat/npx/commit/e413cff)) -* **execCmd:** use the module built-in directly ([6f741c2](https://github.com/zkat/npx/commit/6f741c2)) -* **help:** fuck it. just hard-code it ([d5d5085](https://github.com/zkat/npx/commit/d5d5085)) -* **main:** only exec if this is the main module ([9631e2a](https://github.com/zkat/npx/commit/9631e2a)) +* **child:** iron out a few crinkles and add tests ([b3b5ef6](https://github.com/npm/npx/commit/b3b5ef6)) +* **execCmd:** only reuse the current process if no shell passed in ([e413cff](https://github.com/npm/npx/commit/e413cff)) +* **execCmd:** use the module built-in directly ([6f741c2](https://github.com/npm/npx/commit/6f741c2)) +* **help:** fuck it. just hard-code it ([d5d5085](https://github.com/npm/npx/commit/d5d5085)) +* **main:** only exec if this is the main module ([9631e2a](https://github.com/npm/npx/commit/9631e2a)) ### Features -* **i18n:** Update fr.json (#44) ([ea47c4f](https://github.com/zkat/npx/commit/ea47c4f)) -* **i18n:** update the Romanian translation. (#42) ([2ed36b6](https://github.com/zkat/npx/commit/2ed36b6)) +* **i18n:** Update fr.json (#44) ([ea47c4f](https://github.com/npm/npx/commit/ea47c4f)) +* **i18n:** update the Romanian translation. (#42) ([2ed36b6](https://github.com/npm/npx/commit/2ed36b6)) -# [6.1.0](https://github.com/zkat/npx/compare/v6.0.0...v6.1.0) (2017-06-21) +# [6.1.0](https://github.com/npm/npx/compare/v6.0.0...v6.1.0) (2017-06-21) ### Bug Fixes -* **deps:** remove unused gauge dep ([aa40a34](https://github.com/zkat/npx/commit/aa40a34)) +* **deps:** remove unused gauge dep ([aa40a34](https://github.com/npm/npx/commit/aa40a34)) ### Features -* **i18n:** update ru locale (#41) ([7c84dee](https://github.com/zkat/npx/commit/7c84dee)) -* **i18n:** update zh_CN (#40) ([da4ec67](https://github.com/zkat/npx/commit/da4ec67)) -* **perf:** run node-based commands in the current process ([6efcde4](https://github.com/zkat/npx/commit/6efcde4)) +* **i18n:** update ru locale (#41) ([7c84dee](https://github.com/npm/npx/commit/7c84dee)) +* **i18n:** update zh_CN (#40) ([da4ec67](https://github.com/npm/npx/commit/da4ec67)) +* **perf:** run node-based commands in the current process ([6efcde4](https://github.com/npm/npx/commit/6efcde4)) -# [6.0.0](https://github.com/zkat/npx/compare/v5.4.0...v6.0.0) (2017-06-20) +# [6.0.0](https://github.com/npm/npx/compare/v5.4.0...v6.0.0) (2017-06-20) ### Bug Fixes -* **call:** stop parsing -c for commands + fix corner cases ([bd4e538](https://github.com/zkat/npx/commit/bd4e538)) -* **child:** exec does not have the information needed to correctly escape its args ([6714992](https://github.com/zkat/npx/commit/6714992)) -* **guessCmdName:** tests failed because of lazy npa ([53a0119](https://github.com/zkat/npx/commit/53a0119)) -* **i18n:** gender inclusiveness fix for french version (#37) ([04920ae](https://github.com/zkat/npx/commit/04920ae)), closes [#37](https://github.com/zkat/npx/issues/37) -* **i18n:** typo 😇 (#38) ([ede4a53](https://github.com/zkat/npx/commit/ede4a53)) -* **install:** handle JSON parsing failures ([bec2887](https://github.com/zkat/npx/commit/bec2887)) -* **output:** stop printing out Command Failed messages ([873cffe](https://github.com/zkat/npx/commit/873cffe)) -* **parseArgs:** fix booboo in fast path ([d1e5487](https://github.com/zkat/npx/commit/d1e5487)) -* **perf:** fast-path `npx foo` arg parsing ([ba4fe71](https://github.com/zkat/npx/commit/ba4fe71)) -* **perf:** remove bluebird and defer some requires for SPEED ([00fc313](https://github.com/zkat/npx/commit/00fc313)) +* **call:** stop parsing -c for commands + fix corner cases ([bd4e538](https://github.com/npm/npx/commit/bd4e538)) +* **child:** exec does not have the information needed to correctly escape its args ([6714992](https://github.com/npm/npx/commit/6714992)) +* **guessCmdName:** tests failed because of lazy npa ([53a0119](https://github.com/npm/npx/commit/53a0119)) +* **i18n:** gender inclusiveness fix for french version (#37) ([04920ae](https://github.com/npm/npx/commit/04920ae)), closes [#37](https://github.com/zkat/npx/issues/37) +* **i18n:** typo 😇 (#38) ([ede4a53](https://github.com/npm/npx/commit/ede4a53)) +* **install:** handle JSON parsing failures ([bec2887](https://github.com/npm/npx/commit/bec2887)) +* **output:** stop printing out Command Failed messages ([873cffe](https://github.com/npm/npx/commit/873cffe)) +* **parseArgs:** fix booboo in fast path ([d1e5487](https://github.com/npm/npx/commit/d1e5487)) +* **perf:** fast-path `npx foo` arg parsing ([ba4fe71](https://github.com/npm/npx/commit/ba4fe71)) +* **perf:** remove bluebird and defer some requires for SPEED ([00fc313](https://github.com/npm/npx/commit/00fc313)) ### Features -* **i18n:** add Romanian translations. (#34) ([9e98bd0](https://github.com/zkat/npx/commit/9e98bd0)) -* **i18n:** added a few more localizable strings ([779d950](https://github.com/zkat/npx/commit/779d950)) -* **i18n:** updated ca.json ([af7a035](https://github.com/zkat/npx/commit/af7a035)) -* **i18n:** updated es.json ([414644f](https://github.com/zkat/npx/commit/414644f)) -* **i18n:** updated ja.json ([448b082](https://github.com/zkat/npx/commit/448b082)) -* **i18n:** Ze German Translation (#35) ([6f003f5](https://github.com/zkat/npx/commit/6f003f5)) -* **package:** report number of temp packages installed ([5b7fe8d](https://github.com/zkat/npx/commit/5b7fe8d)) -* **perf:** only launch update-notifier when npx installs stuff ([549d413](https://github.com/zkat/npx/commit/549d413)) -* **quiet:** added -q/--quiet to suppress output from npx itself ([16607d9](https://github.com/zkat/npx/commit/16607d9)) +* **i18n:** add Romanian translations. (#34) ([9e98bd0](https://github.com/npm/npx/commit/9e98bd0)) +* **i18n:** added a few more localizable strings ([779d950](https://github.com/npm/npx/commit/779d950)) +* **i18n:** updated ca.json ([af7a035](https://github.com/npm/npx/commit/af7a035)) +* **i18n:** updated es.json ([414644f](https://github.com/npm/npx/commit/414644f)) +* **i18n:** updated ja.json ([448b082](https://github.com/npm/npx/commit/448b082)) +* **i18n:** Ze German Translation (#35) ([6f003f5](https://github.com/npm/npx/commit/6f003f5)) +* **package:** report number of temp packages installed ([5b7fe8d](https://github.com/npm/npx/commit/5b7fe8d)) +* **perf:** only launch update-notifier when npx installs stuff ([549d413](https://github.com/npm/npx/commit/549d413)) +* **quiet:** added -q/--quiet to suppress output from npx itself ([16607d9](https://github.com/npm/npx/commit/16607d9)) ### BREAKING CHANGES @@ -496,124 +508,124 @@ of all the various cases and how each of them is handled. -# [5.4.0](https://github.com/zkat/npx/compare/v5.3.0...v5.4.0) (2017-06-17) +# [5.4.0](https://github.com/npm/npx/compare/v5.3.0...v5.4.0) (2017-06-17) ### Bug Fixes -* **i18n:** some corrections for es.json ([4d50b71](https://github.com/zkat/npx/commit/4d50b71)) -* **i18n:** update locale files with bugfixes ([77caf82](https://github.com/zkat/npx/commit/77caf82)) -* **i18n:** Y utility was ignoring falsy entries ([f22a4d0](https://github.com/zkat/npx/commit/f22a4d0)) -* **i18n:** してください -> します ([01671af](https://github.com/zkat/npx/commit/01671af)) +* **i18n:** some corrections for es.json ([4d50b71](https://github.com/npm/npx/commit/4d50b71)) +* **i18n:** update locale files with bugfixes ([77caf82](https://github.com/npm/npx/commit/77caf82)) +* **i18n:** Y utility was ignoring falsy entries ([f22a4d0](https://github.com/npm/npx/commit/f22a4d0)) +* **i18n:** してください -> します ([01671af](https://github.com/npm/npx/commit/01671af)) ### Features -* **i18n:** add catalan translation ([579efa1](https://github.com/zkat/npx/commit/579efa1)) -* **i18n:** add pt-br translation (#33) ([6142551](https://github.com/zkat/npx/commit/6142551)) -* **i18n:** added largely machine-translated ja.json ([827705f](https://github.com/zkat/npx/commit/827705f)) -* **i18n:** adds russian translation (#32) ([b2619c1](https://github.com/zkat/npx/commit/b2619c1)) +* **i18n:** add catalan translation ([579efa1](https://github.com/npm/npx/commit/579efa1)) +* **i18n:** add pt-br translation (#33) ([6142551](https://github.com/npm/npx/commit/6142551)) +* **i18n:** added largely machine-translated ja.json ([827705f](https://github.com/npm/npx/commit/827705f)) +* **i18n:** adds russian translation (#32) ([b2619c1](https://github.com/npm/npx/commit/b2619c1)) -# [5.3.0](https://github.com/zkat/npx/compare/v5.2.0...v5.3.0) (2017-06-13) +# [5.3.0](https://github.com/npm/npx/compare/v5.2.0...v5.3.0) (2017-06-13) ### Features -* **i18n:** add Chinese translation (#31) ([24e1b31](https://github.com/zkat/npx/commit/24e1b31)) +* **i18n:** add Chinese translation (#31) ([24e1b31](https://github.com/npm/npx/commit/24e1b31)) -# [5.2.0](https://github.com/zkat/npx/compare/v5.1.3...v5.2.0) (2017-06-12) +# [5.2.0](https://github.com/npm/npx/compare/v5.1.3...v5.2.0) (2017-06-12) ### Bug Fixes -* **i18n:** removing extra spacing in fr.json ([002e2b8](https://github.com/zkat/npx/commit/002e2b8)) +* **i18n:** removing extra spacing in fr.json ([002e2b8](https://github.com/npm/npx/commit/002e2b8)) ### Features -* **i18n:** add french locale (#29) ([662395b](https://github.com/zkat/npx/commit/662395b)) +* **i18n:** add french locale (#29) ([662395b](https://github.com/npm/npx/commit/662395b)) -## [5.1.3](https://github.com/zkat/npx/compare/v5.1.2...v5.1.3) (2017-06-12) +## [5.1.3](https://github.com/npm/npx/compare/v5.1.2...v5.1.3) (2017-06-12) ### Bug Fixes -* **fallback:** put the Y in the wrong place lol ([d6bf8aa](https://github.com/zkat/npx/commit/d6bf8aa)) +* **fallback:** put the Y in the wrong place lol ([d6bf8aa](https://github.com/npm/npx/commit/d6bf8aa)) -## [5.1.2](https://github.com/zkat/npx/compare/v5.1.1...v5.1.2) (2017-06-10) +## [5.1.2](https://github.com/npm/npx/compare/v5.1.1...v5.1.2) (2017-06-10) -## [5.1.1](https://github.com/zkat/npx/compare/v5.1.0...v5.1.1) (2017-06-10) +## [5.1.1](https://github.com/npm/npx/compare/v5.1.0...v5.1.1) (2017-06-10) ### Bug Fixes -* **i18n:** forgot to add locales to files ([4118d6a](https://github.com/zkat/npx/commit/4118d6a)) +* **i18n:** forgot to add locales to files ([4118d6a](https://github.com/npm/npx/commit/4118d6a)) -# [5.1.0](https://github.com/zkat/npx/compare/v5.0.3...v5.1.0) (2017-06-10) +# [5.1.0](https://github.com/npm/npx/compare/v5.0.3...v5.1.0) (2017-06-10) ### Bug Fixes -* **exit:** let process exit normally to finish writes ([c50a398](https://github.com/zkat/npx/commit/c50a398)) +* **exit:** let process exit normally to finish writes ([c50a398](https://github.com/npm/npx/commit/c50a398)) ### Features -* **i18n:** added es.json ([6cf58b9](https://github.com/zkat/npx/commit/6cf58b9)) -* **i18n:** set up i18n plus baseline en.json locale ([b67bb3a](https://github.com/zkat/npx/commit/b67bb3a)) +* **i18n:** added es.json ([6cf58b9](https://github.com/npm/npx/commit/6cf58b9)) +* **i18n:** set up i18n plus baseline en.json locale ([b67bb3a](https://github.com/npm/npx/commit/b67bb3a)) -## [5.0.3](https://github.com/zkat/npx/compare/v5.0.2...v5.0.3) (2017-06-09) +## [5.0.3](https://github.com/npm/npx/compare/v5.0.2...v5.0.3) (2017-06-09) ### Bug Fixes -* **fallback:** exec is no ([42c1d30](https://github.com/zkat/npx/commit/42c1d30)) +* **fallback:** exec is no ([42c1d30](https://github.com/npm/npx/commit/42c1d30)) -## [5.0.2](https://github.com/zkat/npx/compare/v5.0.1...v5.0.2) (2017-06-09) +## [5.0.2](https://github.com/npm/npx/compare/v5.0.1...v5.0.2) (2017-06-09) ### Bug Fixes -* **fallback:** allow fallback to local anyway ([569cf2c](https://github.com/zkat/npx/commit/569cf2c)) +* **fallback:** allow fallback to local anyway ([569cf2c](https://github.com/npm/npx/commit/569cf2c)) -## [5.0.1](https://github.com/zkat/npx/compare/v5.0.0...v5.0.1) (2017-06-09) +## [5.0.1](https://github.com/npm/npx/compare/v5.0.0...v5.0.1) (2017-06-09) -# [5.0.0](https://github.com/zkat/npx/compare/v4.0.3...v5.0.0) (2017-06-09) +# [5.0.0](https://github.com/npm/npx/compare/v4.0.3...v5.0.0) (2017-06-09) ### Features -* **fallback:** by default, only fall back if you have an @ in the name ([bea08a0](https://github.com/zkat/npx/commit/bea08a0)) +* **fallback:** by default, only fall back if you have an @ in the name ([bea08a0](https://github.com/npm/npx/commit/bea08a0)) ### BREAKING CHANGES @@ -624,45 +636,45 @@ an @ sign in the command. -## [4.0.3](https://github.com/zkat/npx/compare/v4.0.2...v4.0.3) (2017-06-04) +## [4.0.3](https://github.com/npm/npx/compare/v4.0.2...v4.0.3) (2017-06-04) ### Bug Fixes -* **npm:** use --userconfig when querying for npm cache config (#28) ([21bc3bf](https://github.com/zkat/npx/commit/21bc3bf)) +* **npm:** use --userconfig when querying for npm cache config (#28) ([21bc3bf](https://github.com/npm/npx/commit/21bc3bf)) -## [4.0.2](https://github.com/zkat/npx/compare/v4.0.1...v4.0.2) (2017-06-04) +## [4.0.2](https://github.com/npm/npx/compare/v4.0.1...v4.0.2) (2017-06-04) ### Bug Fixes -* **install:** get windows workin (#27) ([9472175](https://github.com/zkat/npx/commit/9472175)) +* **install:** get windows workin (#27) ([9472175](https://github.com/npm/npx/commit/9472175)) -## [4.0.1](https://github.com/zkat/npx/compare/v4.0.0...v4.0.1) (2017-06-04) +## [4.0.1](https://github.com/npm/npx/compare/v4.0.0...v4.0.1) (2017-06-04) ### Bug Fixes -* **cmd:** make sure to use our own, enriched path ([9c89c2a](https://github.com/zkat/npx/commit/9c89c2a)) -* **error:** join args with a space on Command failed error ([c2f6f18](https://github.com/zkat/npx/commit/c2f6f18)) +* **cmd:** make sure to use our own, enriched path ([9c89c2a](https://github.com/npm/npx/commit/9c89c2a)) +* **error:** join args with a space on Command failed error ([c2f6f18](https://github.com/npm/npx/commit/c2f6f18)) -# [4.0.0](https://github.com/zkat/npx/compare/v3.0.0...v4.0.0) (2017-06-03) +# [4.0.0](https://github.com/npm/npx/compare/v3.0.0...v4.0.0) (2017-06-03) ### Features -* **call:** -c now loads same env as run-script ([76ae44c](https://github.com/zkat/npx/commit/76ae44c)) -* **npm:** allow configuration of npm binary ([e5d5634](https://github.com/zkat/npx/commit/e5d5634)) -* **npm:** embed npm binary ([a2cae9d](https://github.com/zkat/npx/commit/a2cae9d)) +* **call:** -c now loads same env as run-script ([76ae44c](https://github.com/npm/npx/commit/76ae44c)) +* **npm:** allow configuration of npm binary ([e5d5634](https://github.com/npm/npx/commit/e5d5634)) +* **npm:** embed npm binary ([a2cae9d](https://github.com/npm/npx/commit/a2cae9d)) ### BREAKING CHANGES @@ -674,29 +686,29 @@ variables added to them that were not there before. -# [3.0.0](https://github.com/zkat/npx/compare/v2.1.0...v3.0.0) (2017-06-03) +# [3.0.0](https://github.com/npm/npx/compare/v2.1.0...v3.0.0) (2017-06-03) ### Bug Fixes -* **args:** accept argv as arg and fix minor bugs ([46f10fe](https://github.com/zkat/npx/commit/46f10fe)) -* **deps:** explicitly add mkdirp and rimraf to devDeps ([832c75d](https://github.com/zkat/npx/commit/832c75d)) -* **docs:** misc tweaks to docs ([ed70a7b](https://github.com/zkat/npx/commit/ed70a7b)) -* **exec:** escape binaries and args to cp.exec (#18) ([55d6a11](https://github.com/zkat/npx/commit/55d6a11)) -* **fallback:** shells were sometimes ignored based on $SHELL ([07b7efc](https://github.com/zkat/npx/commit/07b7efc)) -* **get-prefix:** nudge isRootPath ([1ab31eb](https://github.com/zkat/npx/commit/1ab31eb)) -* **help:** correctly enable -h and --help ([adc2f45](https://github.com/zkat/npx/commit/adc2f45)) -* **startup:** delay loading some things to speed up startup ([6b32bf5](https://github.com/zkat/npx/commit/6b32bf5)) +* **args:** accept argv as arg and fix minor bugs ([46f10fe](https://github.com/npm/npx/commit/46f10fe)) +* **deps:** explicitly add mkdirp and rimraf to devDeps ([832c75d](https://github.com/npm/npx/commit/832c75d)) +* **docs:** misc tweaks to docs ([ed70a7b](https://github.com/npm/npx/commit/ed70a7b)) +* **exec:** escape binaries and args to cp.exec (#18) ([55d6a11](https://github.com/npm/npx/commit/55d6a11)) +* **fallback:** shells were sometimes ignored based on $SHELL ([07b7efc](https://github.com/npm/npx/commit/07b7efc)) +* **get-prefix:** nudge isRootPath ([1ab31eb](https://github.com/npm/npx/commit/1ab31eb)) +* **help:** correctly enable -h and --help ([adc2f45](https://github.com/npm/npx/commit/adc2f45)) +* **startup:** delay loading some things to speed up startup ([6b32bf5](https://github.com/npm/npx/commit/6b32bf5)) ### Features -* **cmd:** do some heuristic guesswork on default command names (#23) ([2404420](https://github.com/zkat/npx/commit/2404420)) -* **ignore:** add --ignore-existing option (#20) ([0866a83](https://github.com/zkat/npx/commit/0866a83)) -* **install:** added --no-install option to prevent install fallbacks ([a5fbdaf](https://github.com/zkat/npx/commit/a5fbdaf)) -* **package:** multiple --package options are now accepted ([f2fa6b3](https://github.com/zkat/npx/commit/f2fa6b3)) -* **save:** remove all save-related functionality (#19) ([ab77f6c](https://github.com/zkat/npx/commit/ab77f6c)) -* **shell:** run -c strings inside a system shell (#22) ([17db461](https://github.com/zkat/npx/commit/17db461)) +* **cmd:** do some heuristic guesswork on default command names (#23) ([2404420](https://github.com/npm/npx/commit/2404420)) +* **ignore:** add --ignore-existing option (#20) ([0866a83](https://github.com/npm/npx/commit/0866a83)) +* **install:** added --no-install option to prevent install fallbacks ([a5fbdaf](https://github.com/npm/npx/commit/a5fbdaf)) +* **package:** multiple --package options are now accepted ([f2fa6b3](https://github.com/npm/npx/commit/f2fa6b3)) +* **save:** remove all save-related functionality (#19) ([ab77f6c](https://github.com/npm/npx/commit/ab77f6c)) +* **shell:** run -c strings inside a system shell (#22) ([17db461](https://github.com/npm/npx/commit/17db461)) ### BREAKING CHANGES @@ -706,37 +718,37 @@ variables added to them that were not there before. -# [2.1.0](https://github.com/zkat/npx/compare/v2.0.1...v2.1.0) (2017-06-01) +# [2.1.0](https://github.com/npm/npx/compare/v2.0.1...v2.1.0) (2017-06-01) ### Features -* **opts:** add --shell-auto-fallback (#7) ([ac9cb40](https://github.com/zkat/npx/commit/ac9cb40)) +* **opts:** add --shell-auto-fallback (#7) ([ac9cb40](https://github.com/npm/npx/commit/ac9cb40)) -## [2.0.1](https://github.com/zkat/npx/compare/v2.0.0...v2.0.1) (2017-05-31) +## [2.0.1](https://github.com/npm/npx/compare/v2.0.0...v2.0.1) (2017-05-31) ### Bug Fixes -* **exec:** use command lookup joined with current PATH ([d9175e8](https://github.com/zkat/npx/commit/d9175e8)) +* **exec:** use command lookup joined with current PATH ([d9175e8](https://github.com/npm/npx/commit/d9175e8)) -# [2.0.0](https://github.com/zkat/npx/compare/v1.1.1...v2.0.0) (2017-05-31) +# [2.0.0](https://github.com/npm/npx/compare/v1.1.1...v2.0.0) (2017-05-31) ### Bug Fixes -* **npm:** manually look up npm path for Windows compat ([0fe8fbf](https://github.com/zkat/npx/commit/0fe8fbf)) +* **npm:** manually look up npm path for Windows compat ([0fe8fbf](https://github.com/npm/npx/commit/0fe8fbf)) ### Features -* **commands:** -p and [@version](https://github.com/version) now trigger installs ([9668c83](https://github.com/zkat/npx/commit/9668c83)) +* **commands:** -p and [@version](https://github.com/version) now trigger installs ([9668c83](https://github.com/npm/npx/commit/9668c83)) ### BREAKING CHANGES @@ -746,51 +758,51 @@ variables added to them that were not there before. -## [1.1.1](https://github.com/zkat/npx/compare/v1.1.0...v1.1.1) (2017-05-30) +## [1.1.1](https://github.com/npm/npx/compare/v1.1.0...v1.1.1) (2017-05-30) ### Bug Fixes -* **docs:** make sure man page gets installed ([2aadc16](https://github.com/zkat/npx/commit/2aadc16)) +* **docs:** make sure man page gets installed ([2aadc16](https://github.com/npm/npx/commit/2aadc16)) -# [1.1.0](https://github.com/zkat/npx/compare/v1.0.2...v1.1.0) (2017-05-30) +# [1.1.0](https://github.com/npm/npx/compare/v1.0.2...v1.1.0) (2017-05-30) ### Bug Fixes -* **help:** update usage string for help ([0747cff](https://github.com/zkat/npx/commit/0747cff)) -* **main:** exit if no package was parsed ([cdb579d](https://github.com/zkat/npx/commit/cdb579d)) -* **opts:** allow -- to prevent further parsing ([db7a0e4](https://github.com/zkat/npx/commit/db7a0e4)) +* **help:** update usage string for help ([0747cff](https://github.com/npm/npx/commit/0747cff)) +* **main:** exit if no package was parsed ([cdb579d](https://github.com/npm/npx/commit/cdb579d)) +* **opts:** allow -- to prevent further parsing ([db7a0e4](https://github.com/npm/npx/commit/db7a0e4)) ### Features -* **updates:** added update-notifier ([8dc91d4](https://github.com/zkat/npx/commit/8dc91d4)) +* **updates:** added update-notifier ([8dc91d4](https://github.com/npm/npx/commit/8dc91d4)) -## [1.0.2](https://github.com/zkat/npx/compare/v1.0.1...v1.0.2) (2017-05-30) +## [1.0.2](https://github.com/npm/npx/compare/v1.0.1...v1.0.2) (2017-05-30) ### Bug Fixes -* **pkg:** bundle deps to guarantee global install precision ([3e21217](https://github.com/zkat/npx/commit/3e21217)) +* **pkg:** bundle deps to guarantee global install precision ([3e21217](https://github.com/npm/npx/commit/3e21217)) -## [1.0.1](https://github.com/zkat/npx/compare/v1.0.0...v1.0.1) (2017-05-30) +## [1.0.1](https://github.com/npm/npx/compare/v1.0.0...v1.0.1) (2017-05-30) ### Bug Fixes -* **build:** add dummy test file to let things build ([6199eb6](https://github.com/zkat/npx/commit/6199eb6)) -* **docs:** fix arg documentation in readme/manpage ([d1cf44c](https://github.com/zkat/npx/commit/d1cf44c)) -* **opts:** add --version/-v ([2633a0e](https://github.com/zkat/npx/commit/2633a0e)) +* **build:** add dummy test file to let things build ([6199eb6](https://github.com/npm/npx/commit/6199eb6)) +* **docs:** fix arg documentation in readme/manpage ([d1cf44c](https://github.com/npm/npx/commit/d1cf44c)) +* **opts:** add --version/-v ([2633a0e](https://github.com/npm/npx/commit/2633a0e)) @@ -800,4 +812,4 @@ variables added to them that were not there before. ### Features -* **npx:** initial working implementation ([a83a67d](https://github.com/zkat/npx/commit/a83a67d)) +* **npx:** initial working implementation ([a83a67d](https://github.com/npm/npx/commit/a83a67d)) diff --git a/deps/npm/node_modules/libnpx/README.md b/deps/npm/node_modules/libnpx/README.md index 130f1bc3fdd023..fa7f37d878a067 100644 --- a/deps/npm/node_modules/libnpx/README.md +++ b/deps/npm/node_modules/libnpx/README.md @@ -1,4 +1,4 @@ -[![npm](https://img.shields.io/npm/v/npx.svg)](https://npm.im/npx) [![license](https://img.shields.io/npm/l/npx.svg)](https://npm.im/npx) [![Travis](https://img.shields.io/travis/zkat/npx.svg)](https://travis-ci.org/zkat/npx) [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/zkat/npx?svg=true)](https://ci.appveyor.com/project/zkat/npx) [![Coverage Status](https://coveralls.io/repos/github/zkat/npx/badge.svg?branch=latest)](https://coveralls.io/github/zkat/npx?branch=latest) +[![npm](https://img.shields.io/npm/v/npx.svg)](https://npm.im/npx) [![license](https://img.shields.io/npm/l/npx.svg)](https://npm.im/npx) [![Travis](https://img.shields.io/travis/npm/npx.svg)](https://travis-ci.org/npm/npx) [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/npm/npx?svg=true)](https://ci.appveyor.com/project/npm/npx) [![Coverage Status](https://coveralls.io/repos/github/npm/npx/badge.svg?branch=latest)](https://coveralls.io/github/npm/npx?branch=latest) # npx(1) -- execute npm package binaries @@ -152,7 +152,7 @@ Written by [Kat Marchan](https://github.com/zkat). ## REPORTING BUGS -Please file any relevant issues [on Github.](https://github.com/zkat/npx) +Please file any relevant issues [on Github.](https://github.com/npm/npx) ## LICENSE diff --git a/deps/npm/node_modules/libnpx/libnpx.1 b/deps/npm/node_modules/libnpx/libnpx.1 index 4215202da8e244..aea3ffe8f41922 100644 --- a/deps/npm/node_modules/libnpx/libnpx.1 +++ b/deps/npm/node_modules/libnpx/libnpx.1 @@ -1,4 +1,4 @@ -.TH "NPX" "1" "April 2018" "libnpx@10.1.1" "User Commands" +.TH "NPX" "1" "January 2020" "libnpx@10.2.1" "User Commands" .SH "NAME" \fBnpx\fR \- execute npm package binaries .SH SYNOPSIS @@ -158,7 +158,7 @@ Huge thanks to Kwyn Meagher \fIhttps://blog\.kwyn\.io\fR for generously donating Written by Kat Marchan \fIhttps://github\.com/zkat\fR\|\. .SH REPORTING BUGS .P -Please file any relevant issues on Github\. \fIhttps://github\.com/zkat/npx\fR +Please file any relevant issues on Github\. \fIhttps://github\.com/npm/npx\fR .SH LICENSE .P This work is released by its authors into the public domain under CC0\-1\.0\. See \fBLICENSE\.md\fP for details\. diff --git a/deps/npm/node_modules/libnpx/package.json b/deps/npm/node_modules/libnpx/package.json index b9d866b96a7d00..9b9949cd3ca4f4 100644 --- a/deps/npm/node_modules/libnpx/package.json +++ b/deps/npm/node_modules/libnpx/package.json @@ -1,39 +1,36 @@ { - "_args": [ - [ - "libnpx@10.2.0", - "/Users/rebecca/code/npm" - ] - ], - "_from": "libnpx@10.2.0", - "_id": "libnpx@10.2.0", + "_from": "libnpx@10.2.2", + "_id": "libnpx@10.2.2", "_inBundle": false, - "_integrity": "sha512-X28coei8/XRCt15cYStbLBph+KGhFra4VQhRBPuH/HHMkC5dxM8v24RVgUsvODKCrUZ0eTgiTqJp6zbl0sskQQ==", + "_integrity": "sha512-ujaYToga1SAX5r7FU5ShMFi88CWpY75meNZtr6RtEyv4l2ZK3+Wgvxq2IqlwWBiDZOqhumdeiocPS1aKrCMe3A==", "_location": "/libnpx", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "libnpx@10.2.0", + "raw": "libnpx@10.2.2", "name": "libnpx", "escapedName": "libnpx", - "rawSpec": "10.2.0", + "rawSpec": "10.2.2", "saveSpec": null, - "fetchSpec": "10.2.0" + "fetchSpec": "10.2.2" }, "_requiredBy": [ + "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/libnpx/-/libnpx-10.2.0.tgz", - "_spec": "10.2.0", - "_where": "/Users/rebecca/code/npm", + "_resolved": "https://registry.npmjs.org/libnpx/-/libnpx-10.2.2.tgz", + "_shasum": "5a4171b9b92dd031463ef66a4af9f5cbd6b09572", + "_spec": "libnpx@10.2.2", + "_where": "/Users/mperrotte/npminc/cli", "author": { "name": "Kat Marchán", "email": "kzm@sykosomatic.org" }, "bugs": { - "url": "https://github.com/zkat/npx/issues" + "url": "https://github.com/npm/npx/issues" }, + "bundleDependencies": false, "config": { "nyc": { "exclude": [ @@ -52,6 +49,7 @@ "y18n": "^4.0.0", "yargs": "^11.0.0" }, + "deprecated": false, "description": "support library for npx -- an tool for executing npm-based packages.", "devDependencies": { "cross-env": "^5.1.3", @@ -76,7 +74,7 @@ "libnpx.1", "locales" ], - "homepage": "https://github.com/zkat/npx#readme", + "homepage": "https://github.com/npm/npx#readme", "keywords": [ "npm", "npm exec", @@ -93,7 +91,7 @@ "name": "libnpx", "repository": { "type": "git", - "url": "git+https://github.com/zkat/npx.git" + "url": "git+https://github.com/npm/npx.git" }, "scripts": { "bin": "make bin", @@ -107,5 +105,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "10.2.0" + "version": "10.2.2" } diff --git a/deps/npm/node_modules/map-age-cleaner/dist/index.d.ts b/deps/npm/node_modules/map-age-cleaner/dist/index.d.ts new file mode 100644 index 00000000000000..fbf5ce08f5fc18 --- /dev/null +++ b/deps/npm/node_modules/map-age-cleaner/dist/index.d.ts @@ -0,0 +1,20 @@ +interface Entry { + [key: string]: any; +} +interface MaxAgeEntry extends Entry { + maxAge: number; +} +/** + * Automatically cleanup the items in the provided `map`. The property of the expiration timestamp should be named `maxAge`. + * + * @param map - Map instance which should be cleaned up. + */ +export default function mapAgeCleaner(map: Map): any; +/** + * Automatically cleanup the items in the provided `map`. + * + * @param map - Map instance which should be cleaned up. + * @param property - Name of the property which olds the expiry timestamp. + */ +export default function mapAgeCleaner(map: Map, property: string): any; +export {}; diff --git a/deps/npm/node_modules/map-age-cleaner/dist/index.js b/deps/npm/node_modules/map-age-cleaner/dist/index.js new file mode 100644 index 00000000000000..ff137dec85f56d --- /dev/null +++ b/deps/npm/node_modules/map-age-cleaner/dist/index.js @@ -0,0 +1,92 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const p_defer_1 = __importDefault(require("p-defer")); +function mapAgeCleaner(map, property = 'maxAge') { + let processingKey; + let processingTimer; + let processingDeferred; + const cleanup = () => __awaiter(this, void 0, void 0, function* () { + if (processingKey !== undefined) { + // If we are already processing an item, we can safely exit + return; + } + const setupTimer = (item) => __awaiter(this, void 0, void 0, function* () { + processingDeferred = p_defer_1.default(); + const delay = item[1][property] - Date.now(); + if (delay <= 0) { + // Remove the item immediately if the delay is equal to or below 0 + map.delete(item[0]); + processingDeferred.resolve(); + return; + } + // Keep track of the current processed key + processingKey = item[0]; + processingTimer = setTimeout(() => { + // Remove the item when the timeout fires + map.delete(item[0]); + if (processingDeferred) { + processingDeferred.resolve(); + } + }, delay); + // tslint:disable-next-line:strict-type-predicates + if (typeof processingTimer.unref === 'function') { + // Don't hold up the process from exiting + processingTimer.unref(); + } + return processingDeferred.promise; + }); + try { + for (const entry of map) { + yield setupTimer(entry); + } + } + catch (_a) { + // Do nothing if an error occurs, this means the timer was cleaned up and we should stop processing + } + processingKey = undefined; + }); + const reset = () => { + processingKey = undefined; + if (processingTimer !== undefined) { + clearTimeout(processingTimer); + processingTimer = undefined; + } + if (processingDeferred !== undefined) { // tslint:disable-line:early-exit + processingDeferred.reject(undefined); + processingDeferred = undefined; + } + }; + const originalSet = map.set.bind(map); + map.set = (key, value) => { + if (map.has(key)) { + // If the key already exist, remove it so we can add it back at the end of the map. + map.delete(key); + } + // Call the original `map.set` + const result = originalSet(key, value); + // If we are already processing a key and the key added is the current processed key, stop processing it + if (processingKey && processingKey === key) { + reset(); + } + // Always run the cleanup method in case it wasn't started yet + cleanup(); // tslint:disable-line:no-floating-promises + return result; + }; + cleanup(); // tslint:disable-line:no-floating-promises + return map; +} +exports.default = mapAgeCleaner; +// Add support for CJS +module.exports = mapAgeCleaner; +module.exports.default = mapAgeCleaner; diff --git a/deps/npm/node_modules/map-age-cleaner/license b/deps/npm/node_modules/map-age-cleaner/license new file mode 100644 index 00000000000000..0711ab006f8a92 --- /dev/null +++ b/deps/npm/node_modules/map-age-cleaner/license @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) Sam Verschueren (github.com/SamVerschueren) + +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. diff --git a/deps/npm/node_modules/map-age-cleaner/package.json b/deps/npm/node_modules/map-age-cleaner/package.json new file mode 100644 index 00000000000000..fc6be6aac5f145 --- /dev/null +++ b/deps/npm/node_modules/map-age-cleaner/package.json @@ -0,0 +1,95 @@ +{ + "_args": [ + [ + "map-age-cleaner@0.1.3", + "/Users/mperrotte/npminc/cli" + ] + ], + "_development": true, + "_from": "map-age-cleaner@0.1.3", + "_id": "map-age-cleaner@0.1.3", + "_inBundle": false, + "_integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "_location": "/map-age-cleaner", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "map-age-cleaner@0.1.3", + "name": "map-age-cleaner", + "escapedName": "map-age-cleaner", + "rawSpec": "0.1.3", + "saveSpec": null, + "fetchSpec": "0.1.3" + }, + "_requiredBy": [ + "/nyc/mem" + ], + "_resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "_spec": "0.1.3", + "_where": "/Users/mperrotte/npminc/cli", + "author": { + "name": "Sam Verschueren", + "email": "sam.verschueren@gmail.com", + "url": "github.com/SamVerschueren" + }, + "bugs": { + "url": "https://github.com/SamVerschueren/map-age-cleaner/issues" + }, + "dependencies": { + "p-defer": "^1.0.0" + }, + "description": "Automatically cleanup expired items in a Map", + "devDependencies": { + "@types/delay": "^2.0.1", + "@types/node": "^10.7.1", + "ava": "^0.25.0", + "codecov": "^3.0.0", + "del-cli": "^1.1.0", + "delay": "^3.0.0", + "nyc": "^12.0.0", + "tslint": "^5.11.0", + "tslint-xo": "^0.9.0", + "typescript": "^3.0.1" + }, + "engines": { + "node": ">=6" + }, + "files": [ + "dist/index.js", + "dist/index.d.ts" + ], + "homepage": "https://github.com/SamVerschueren/map-age-cleaner#readme", + "keywords": [ + "map", + "age", + "cleaner", + "maxage", + "expire", + "expiration", + "expiring" + ], + "license": "MIT", + "main": "dist/index.js", + "name": "map-age-cleaner", + "nyc": { + "exclude": [ + "dist/test.js" + ] + }, + "repository": { + "type": "git", + "url": "git+https://github.com/SamVerschueren/map-age-cleaner.git" + }, + "scripts": { + "build": "npm run clean && tsc", + "clean": "del-cli dist", + "lint": "tslint --format stylish --project .", + "prepublishOnly": "npm run build", + "pretest": "npm run build -- --sourceMap", + "test": "npm run lint && nyc ava dist/test.js" + }, + "sideEffects": false, + "typings": "dist/index.d.ts", + "version": "0.1.3" +} diff --git a/deps/npm/node_modules/map-age-cleaner/readme.md b/deps/npm/node_modules/map-age-cleaner/readme.md new file mode 100644 index 00000000000000..471d93353a07ec --- /dev/null +++ b/deps/npm/node_modules/map-age-cleaner/readme.md @@ -0,0 +1,67 @@ +# map-age-cleaner + +[![Build Status](https://travis-ci.org/SamVerschueren/map-age-cleaner.svg?branch=master)](https://travis-ci.org/SamVerschueren/map-age-cleaner) [![codecov](https://codecov.io/gh/SamVerschueren/map-age-cleaner/badge.svg?branch=master)](https://codecov.io/gh/SamVerschueren/map-age-cleaner?branch=master) + +> Automatically cleanup expired items in a Map + + +## Install + +``` +$ npm install map-age-cleaner +``` + + +## Usage + +```js +import mapAgeCleaner from 'map-age-cleaner'; + +const map = new Map([ + ['unicorn', {data: '🦄', maxAge: Date.now() + 1000}] +]); + +mapAgeCleaner(map); + +map.has('unicorn'); +//=> true + +// Wait for 1 second... + +map.has('unicorn'); +//=> false +``` + +> **Note**: Items have to be ordered ascending based on the expiry property. This means that the item which will be expired first, should be in the first position of the `Map`. + + +## API + +### mapAgeCleaner(map, [property]) + +Returns the `Map` instance. + +#### map + +Type: `Map` + +Map instance which should be cleaned up. + +#### property + +Type: `string`
    +Default: `maxAge` + +Name of the property which olds the expiry timestamp. + + +## Related + +- [expiry-map](https://github.com/SamVerschueren/expiry-map) - A `Map` implementation with expirable items +- [expiry-set](https://github.com/SamVerschueren/expiry-set) - A `Set` implementation with expirable keys +- [mem](https://github.com/sindresorhus/mem) - Memoize functions + + +## License + +MIT © [Sam Verschueren](https://github.com/SamVerschueren) diff --git a/deps/npm/node_modules/mem/index.d.ts b/deps/npm/node_modules/mem/index.d.ts new file mode 100644 index 00000000000000..786625520b2034 --- /dev/null +++ b/deps/npm/node_modules/mem/index.d.ts @@ -0,0 +1,96 @@ +declare namespace mem { + interface CacheStorage { + has(key: KeyType): boolean; + get(key: KeyType): ValueType | undefined; + set(key: KeyType, value: ValueType): void; + delete(key: KeyType): void; + clear?: () => void; + } + + interface Options< + ArgumentsType extends unknown[], + CacheKeyType extends unknown, + ReturnType extends unknown + > { + /** + Milliseconds until the cache expires. + + @default Infinity + */ + readonly maxAge?: number; + + /** + Determines the cache key for storing the result based on the function arguments. By default, if there's only one argument and it's a [primitive](https://developer.mozilla.org/en-US/docs/Glossary/Primitive), it's used directly as a key, otherwise it's all the function arguments JSON stringified as an array. + + You could for example change it to only cache on the first argument `x => JSON.stringify(x)`. + */ + readonly cacheKey?: (...arguments: ArgumentsType) => CacheKeyType; + + /** + Use a different cache storage. You could for example use a `WeakMap` instead or [`quick-lru`](https://github.com/sindresorhus/quick-lru) for a LRU cache. + + @default new Map() + */ + readonly cache?: CacheStorage; + + /** + Cache rejected promises. + + @default false + */ + readonly cachePromiseRejection?: boolean; + } +} + +declare const mem: { + /** + [Memoize](https://en.wikipedia.org/wiki/Memoization) functions - An optimization used to speed up consecutive function calls by caching the result of calls with identical input. + + @param fn - Function to be memoized. + + @example + ``` + import mem = require('mem'); + + let i = 0; + const counter = () => ++i; + const memoized = mem(counter); + + memoized('foo'); + //=> 1 + + // Cached as it's the same arguments + memoized('foo'); + //=> 1 + + // Not cached anymore as the arguments changed + memoized('bar'); + //=> 2 + + memoized('bar'); + //=> 2 + ``` + */ + < + ArgumentsType extends unknown[], + ReturnType extends unknown, + CacheKeyType extends unknown + >( + fn: (...arguments: ArgumentsType) => ReturnType, + options?: mem.Options + ): (...arguments: ArgumentsType) => ReturnType; + + /** + Clear all cached data of a memoized function. + + @param fn - Memoized function. + */ + clear( + fn: (...arguments: ArgumentsType) => ReturnType + ): void; + + // TODO: Remove this for the next major release + default: typeof mem; +}; + +export = mem; diff --git a/deps/npm/node_modules/mem/index.js b/deps/npm/node_modules/mem/index.js index aa5a0739822c7e..51faf012c2fc44 100644 --- a/deps/npm/node_modules/mem/index.js +++ b/deps/npm/node_modules/mem/index.js @@ -1,51 +1,84 @@ 'use strict'; const mimicFn = require('mimic-fn'); +const isPromise = require('p-is-promise'); +const mapAgeCleaner = require('map-age-cleaner'); const cacheStore = new WeakMap(); -const defaultCacheKey = function (x) { - if (arguments.length === 1 && (x === null || x === undefined || (typeof x !== 'function' && typeof x !== 'object'))) { - return x; +const defaultCacheKey = (...arguments_) => { + if (arguments_.length === 0) { + return '__defaultKey'; } - return JSON.stringify(arguments); + if (arguments_.length === 1) { + const [firstArgument] = arguments_; + if ( + firstArgument === null || + firstArgument === undefined || + (typeof firstArgument !== 'function' && typeof firstArgument !== 'object') + ) { + return firstArgument; + } + } + + return JSON.stringify(arguments_); }; -module.exports = (fn, opts) => { - opts = Object.assign({ +const mem = (fn, options) => { + options = Object.assign({ cacheKey: defaultCacheKey, - cache: new Map() - }, opts); + cache: new Map(), + cachePromiseRejection: false + }, options); + + if (typeof options.maxAge === 'number') { + mapAgeCleaner(options.cache); + } - const memoized = function () { - const cache = cacheStore.get(memoized); - const key = opts.cacheKey.apply(null, arguments); + const {cache} = options; + options.maxAge = options.maxAge || 0; - if (cache.has(key)) { - const c = cache.get(key); + const setData = (key, data) => { + cache.set(key, { + data, + maxAge: Date.now() + options.maxAge + }); + }; + + const memoized = function (...arguments_) { + const key = options.cacheKey(...arguments_); - if (typeof opts.maxAge !== 'number' || Date.now() < c.maxAge) { - return c.data; - } + if (cache.has(key)) { + return cache.get(key).data; } - const ret = fn.apply(null, arguments); + const cacheItem = fn.call(this, ...arguments_); - cache.set(key, { - data: ret, - maxAge: Date.now() + (opts.maxAge || 0) - }); + setData(key, cacheItem); + + if (isPromise(cacheItem) && options.cachePromiseRejection === false) { + // Remove rejected promises from cache unless `cachePromiseRejection` is set to `true` + cacheItem.catch(() => cache.delete(key)); + } - return ret; + return cacheItem; }; - mimicFn(memoized, fn); + try { + // The below call will throw in some host environments + // See https://github.com/sindresorhus/mimic-fn/issues/10 + mimicFn(memoized, fn); + } catch (_) {} - cacheStore.set(memoized, opts.cache); + cacheStore.set(memoized, options.cache); return memoized; }; +module.exports = mem; +// TODO: Remove this for the next major release +module.exports.default = mem; + module.exports.clear = fn => { const cache = cacheStore.get(fn); diff --git a/deps/npm/node_modules/mem/license b/deps/npm/node_modules/mem/license index 654d0bfe943437..e7af2f77107d73 100644 --- a/deps/npm/node_modules/mem/license +++ b/deps/npm/node_modules/mem/license @@ -1,21 +1,9 @@ -The MIT License (MIT) +MIT License Copyright (c) Sindre Sorhus (sindresorhus.com) -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: +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 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. +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. diff --git a/deps/npm/node_modules/mem/node_modules/mimic-fn/index.d.ts b/deps/npm/node_modules/mem/node_modules/mimic-fn/index.d.ts new file mode 100644 index 00000000000000..b4047d58902ebf --- /dev/null +++ b/deps/npm/node_modules/mem/node_modules/mimic-fn/index.d.ts @@ -0,0 +1,54 @@ +declare const mimicFn: { + /** + Make a function mimic another one. It will copy over the properties `name`, `length`, `displayName`, and any custom properties you may have set. + + @param to - Mimicking function. + @param from - Function to mimic. + @returns The modified `to` function. + + @example + ``` + import mimicFn = require('mimic-fn'); + + function foo() {} + foo.unicorn = '🦄'; + + function wrapper() { + return foo(); + } + + console.log(wrapper.name); + //=> 'wrapper' + + mimicFn(wrapper, foo); + + console.log(wrapper.name); + //=> 'foo' + + console.log(wrapper.unicorn); + //=> '🦄' + ``` + */ + < + ArgumentsType extends unknown[], + ReturnType, + FunctionType extends (...arguments: ArgumentsType) => ReturnType + >( + to: (...arguments: ArgumentsType) => ReturnType, + from: FunctionType + ): FunctionType; + + // TODO: Remove this for the next major release, refactor the whole definition to: + // declare function mimicFn< + // ArgumentsType extends unknown[], + // ReturnType, + // FunctionType extends (...arguments: ArgumentsType) => ReturnType + // >( + // to: (...arguments: ArgumentsType) => ReturnType, + // from: FunctionType + // ): FunctionType; + // export = mimicFn; + default: typeof mimicFn; +}; + +export = mimicFn; diff --git a/deps/npm/node_modules/mem/node_modules/mimic-fn/index.js b/deps/npm/node_modules/mem/node_modules/mimic-fn/index.js new file mode 100644 index 00000000000000..1a597051750da2 --- /dev/null +++ b/deps/npm/node_modules/mem/node_modules/mimic-fn/index.js @@ -0,0 +1,13 @@ +'use strict'; + +const mimicFn = (to, from) => { + for (const prop of Reflect.ownKeys(from)) { + Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop)); + } + + return to; +}; + +module.exports = mimicFn; +// TODO: Remove this for the next major release +module.exports.default = mimicFn; diff --git a/deps/npm/node_modules/mem/node_modules/mimic-fn/license b/deps/npm/node_modules/mem/node_modules/mimic-fn/license new file mode 100644 index 00000000000000..e7af2f77107d73 --- /dev/null +++ b/deps/npm/node_modules/mem/node_modules/mimic-fn/license @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) Sindre Sorhus (sindresorhus.com) + +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. diff --git a/deps/npm/node_modules/mimic-fn/package.json b/deps/npm/node_modules/mem/node_modules/mimic-fn/package.json similarity index 59% rename from deps/npm/node_modules/mimic-fn/package.json rename to deps/npm/node_modules/mem/node_modules/mimic-fn/package.json index 4dc1bdae9aa20f..b4970a28d40c8a 100644 --- a/deps/npm/node_modules/mimic-fn/package.json +++ b/deps/npm/node_modules/mem/node_modules/mimic-fn/package.json @@ -1,28 +1,27 @@ { - "_from": "mimic-fn@^1.0.0", - "_id": "mimic-fn@1.2.0", + "_from": "mimic-fn@^2.0.0", + "_id": "mimic-fn@2.1.0", "_inBundle": false, - "_integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "_location": "/mimic-fn", + "_integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "_location": "/mem/mimic-fn", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "mimic-fn@^1.0.0", + "raw": "mimic-fn@^2.0.0", "name": "mimic-fn", "escapedName": "mimic-fn", - "rawSpec": "^1.0.0", + "rawSpec": "^2.0.0", "saveSpec": null, - "fetchSpec": "^1.0.0" + "fetchSpec": "^2.0.0" }, "_requiredBy": [ - "/mem", - "/onetime" + "/mem" ], - "_resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "_shasum": "820c86a39334640e99516928bd03fca88057d022", - "_spec": "mimic-fn@^1.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/mem", + "_resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "_shasum": "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b", + "_spec": "mimic-fn@^2.0.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/mem", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -35,14 +34,16 @@ "deprecated": false, "description": "Make a function mimic another one", "devDependencies": { - "ava": "*", - "xo": "*" + "ava": "^1.4.1", + "tsd": "^0.7.1", + "xo": "^0.24.0" }, "engines": { - "node": ">=4" + "node": ">=6" }, "files": [ - "index.js" + "index.js", + "index.d.ts" ], "homepage": "https://github.com/sindresorhus/mimic-fn#readme", "keywords": [ @@ -67,7 +68,7 @@ "url": "git+https://github.com/sindresorhus/mimic-fn.git" }, "scripts": { - "test": "xo && ava" + "test": "xo && ava && tsd" }, - "version": "1.2.0" + "version": "2.1.0" } diff --git a/deps/npm/node_modules/mimic-fn/readme.md b/deps/npm/node_modules/mem/node_modules/mimic-fn/readme.md similarity index 83% rename from deps/npm/node_modules/mimic-fn/readme.md rename to deps/npm/node_modules/mem/node_modules/mimic-fn/readme.md index e57573438997b1..0ef8a13d7e0d95 100644 --- a/deps/npm/node_modules/mimic-fn/readme.md +++ b/deps/npm/node_modules/mem/node_modules/mimic-fn/readme.md @@ -21,7 +21,7 @@ function foo() {} foo.unicorn = '🦄'; function wrapper() { - return foo() {}; + return foo(); } console.log(wrapper.name); @@ -43,7 +43,7 @@ It will copy over the properties `name`, `length`, `displayName`, and any custom ### mimicFn(to, from) -It will modify `to` and return it. +Modifies the `to` function and returns it. #### to @@ -61,6 +61,7 @@ Function to mimic. ## Related - [rename-fn](https://github.com/sindresorhus/rename-fn) - Rename a function +- [keep-func-props](https://github.com/ehmicky/keep-func-props) - Wrap a function without changing its name, length and other properties ## License diff --git a/deps/npm/node_modules/mem/package.json b/deps/npm/node_modules/mem/package.json index 27eefe8d720d4f..eedf07469c4c3c 100644 --- a/deps/npm/node_modules/mem/package.json +++ b/deps/npm/node_modules/mem/package.json @@ -1,27 +1,27 @@ { - "_from": "mem@^1.1.0", - "_id": "mem@1.1.0", + "_from": "mem@^4.0.0", + "_id": "mem@4.3.0", "_inBundle": false, - "_integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "_integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "_location": "/mem", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "mem@^1.1.0", + "raw": "mem@^4.0.0", "name": "mem", "escapedName": "mem", - "rawSpec": "^1.1.0", + "rawSpec": "^4.0.0", "saveSpec": null, - "fetchSpec": "^1.1.0" + "fetchSpec": "^4.0.0" }, "_requiredBy": [ "/os-locale" ], - "_resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "_shasum": "5edd52b485ca1d900fe64895505399a0dfa45f76", - "_spec": "mem@^1.1.0", - "_where": "/Users/rebecca/code/npm/node_modules/os-locale", + "_resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "_shasum": "461af497bc4ae09608cdb2e60eefb69bff744178", + "_spec": "mem@^4.0.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/os-locale", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -32,20 +32,24 @@ }, "bundleDependencies": false, "dependencies": { - "mimic-fn": "^1.0.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" }, "deprecated": false, "description": "Memoize functions - An optimization used to speed up consecutive function calls by caching the result of calls with identical input", "devDependencies": { - "ava": "*", - "delay": "^1.1.0", - "xo": "*" + "ava": "^1.4.1", + "delay": "^4.1.0", + "tsd": "^0.7.1", + "xo": "^0.24.0" }, "engines": { - "node": ">=4" + "node": ">=6" }, "files": [ - "index.js" + "index.js", + "index.d.ts" ], "homepage": "https://github.com/sindresorhus/mem#readme", "keywords": [ @@ -68,10 +72,7 @@ "url": "git+https://github.com/sindresorhus/mem.git" }, "scripts": { - "test": "xo && ava" + "test": "xo && ava && tsd" }, - "version": "1.1.0", - "xo": { - "esnext": true - } + "version": "4.3.0" } diff --git a/deps/npm/node_modules/mem/readme.md b/deps/npm/node_modules/mem/readme.md index 7ebab84f0e716b..add4222b62d71a 100644 --- a/deps/npm/node_modules/mem/readme.md +++ b/deps/npm/node_modules/mem/readme.md @@ -2,11 +2,13 @@ > [Memoize](https://en.wikipedia.org/wiki/Memoization) functions - An optimization used to speed up consecutive function calls by caching the result of calls with identical input +Memory is automatically released when an item expires. + ## Install ``` -$ npm install --save mem +$ npm install mem ``` @@ -22,11 +24,11 @@ const memoized = mem(counter); memoized('foo'); //=> 1 -// cached as it's the same arguments +// Cached as it's the same arguments memoized('foo'); //=> 1 -// not cached anymore as the arguments changed +// Not cached anymore as the arguments changed memoized('bar'); //=> 2 @@ -40,35 +42,37 @@ memoized('bar'); const mem = require('mem'); let i = 0; -const counter = () => Promise.resolve(++i); +const counter = async () => ++i; const memoized = mem(counter); -memoized().then(a => { - console.log(a); +(async () => { + console.log(await memoized()); //=> 1 - memoized().then(b => { - // the return value didn't increase as it's cached - console.log(b); - //=> 1 - }); -}); + // The return value didn't increase as it's cached + console.log(await memoized()); + //=> 1 +})(); ``` ```js const mem = require('mem'); const got = require('got'); +const delay = require('delay'); + const memGot = mem(got, {maxAge: 1000}); -memGot('sindresorhus.com').then(() => { - // this call is cached - memGot('sindresorhus.com').then(() => { - setTimeout(() => { - // this call is not cached as the cache has expired - memGot('sindresorhus.com').then(() => {}); - }, 2000); - }); -}); +(async () => { + await memGot('sindresorhus.com'); + + // This call is cached + await memGot('sindresorhus.com'); + + await delay(2000); + + // This call is not cached as the cache has expired + await memGot('sindresorhus.com'); +})(); ``` @@ -84,6 +88,8 @@ Function to be memoized. #### options +Type: `Object` + ##### maxAge Type: `number`
    @@ -104,7 +110,14 @@ You could for example change it to only cache on the first argument `x => JSON.s Type: `Object`
    Default: `new Map()` -Use a different cache storage. Must implement the following methods: `.has(key)`, `.get(key)`, `.set(key, value)`, and optionally `.clear()`. You could for example use a `WeakMap` instead. +Use a different cache storage. Must implement the following methods: `.has(key)`, `.get(key)`, `.set(key, value)`, `.delete(key)`, and optionally `.clear()`. You could for example use a `WeakMap` instead or [`quick-lru`](https://github.com/sindresorhus/quick-lru) for a LRU cache. + +##### cachePromiseRejection + +Type: `boolean`
    +Default: `false` + +Cache rejected promises. ### mem.clear(fn) @@ -133,15 +146,22 @@ const got = require('got'); const cache = new StatsMap(); const memGot = mem(got, {cache}); -memGot('sindresorhus.com') - .then(() => memGot('sindresorhus.com')) - .then(() => memGot('sindresorhus.com')); +(async () => { + await memGot('sindresorhus.com'); + await memGot('sindresorhus.com'); + await memGot('sindresorhus.com'); -console.log(cache.stats); -//=> {hits: 2, misses: 1} + console.log(cache.stats); + //=> {hits: 2, misses: 1} +})(); ``` +## Related + +- [p-memoize](https://github.com/sindresorhus/p-memoize) - Memoize promise-returning & async functions + + ## License MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/deps/npm/node_modules/mimic-fn/index.js b/deps/npm/node_modules/mimic-fn/index.js deleted file mode 100644 index 08e69d3d88f020..00000000000000 --- a/deps/npm/node_modules/mimic-fn/index.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; -module.exports = (to, from) => { - // TODO: use `Reflect.ownKeys()` when targeting Node.js 6 - for (const prop of Object.getOwnPropertyNames(from).concat(Object.getOwnPropertySymbols(from))) { - Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop)); - } - - return to; -}; diff --git a/deps/npm/node_modules/minimist/.travis.yml b/deps/npm/node_modules/minimist/.travis.yml deleted file mode 100644 index cc4dba29d959a2..00000000000000 --- a/deps/npm/node_modules/minimist/.travis.yml +++ /dev/null @@ -1,4 +0,0 @@ -language: node_js -node_js: - - "0.8" - - "0.10" diff --git a/deps/npm/node_modules/mkdirp/examples/pow.js b/deps/npm/node_modules/mkdirp/examples/pow.js deleted file mode 100644 index e6924212e6a244..00000000000000 --- a/deps/npm/node_modules/mkdirp/examples/pow.js +++ /dev/null @@ -1,6 +0,0 @@ -var mkdirp = require('mkdirp'); - -mkdirp('/tmp/foo/bar/baz', function (err) { - if (err) console.error(err) - else console.log('pow!') -}); diff --git a/deps/npm/node_modules/mkdirp/index.js b/deps/npm/node_modules/mkdirp/index.js index 6ce241b58c100f..2f1287071fc0d6 100644 --- a/deps/npm/node_modules/mkdirp/index.js +++ b/deps/npm/node_modules/mkdirp/index.js @@ -31,6 +31,7 @@ function mkdirP (p, opts, f, made) { } switch (er.code) { case 'ENOENT': + if (path.dirname(p) === p) return cb(er); mkdirP(path.dirname(p), opts, function (er, made) { if (er) cb(er, made); else mkdirP(p, opts, cb, made); diff --git a/deps/npm/node_modules/mkdirp/.travis.yml b/deps/npm/node_modules/mkdirp/node_modules/minimist/.travis.yml similarity index 100% rename from deps/npm/node_modules/mkdirp/.travis.yml rename to deps/npm/node_modules/mkdirp/node_modules/minimist/.travis.yml diff --git a/deps/npm/node_modules/minimist/LICENSE b/deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE similarity index 100% rename from deps/npm/node_modules/minimist/LICENSE rename to deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE diff --git a/deps/npm/node_modules/minimist/example/parse.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/example/parse.js similarity index 72% rename from deps/npm/node_modules/minimist/example/parse.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/example/parse.js index abff3e8ee8f5ef..f7c8d49807f32e 100644 --- a/deps/npm/node_modules/minimist/example/parse.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/example/parse.js @@ -1,2 +1,2 @@ var argv = require('../')(process.argv.slice(2)); -console.dir(argv); +console.log(argv); diff --git a/deps/npm/node_modules/minimist/index.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/index.js similarity index 50% rename from deps/npm/node_modules/minimist/index.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/index.js index 584f551a6da734..d5fa9d510fa17e 100644 --- a/deps/npm/node_modules/minimist/index.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/index.js @@ -1,16 +1,20 @@ module.exports = function (args, opts) { if (!opts) opts = {}; - - var flags = { bools : {}, strings : {} }; - - [].concat(opts['boolean']).filter(Boolean).forEach(function (key) { - flags.bools[key] = true; - }); - - [].concat(opts.string).filter(Boolean).forEach(function (key) { - flags.strings[key] = true; - }); - + + var flags = { bools : {}, strings : {}, unknownFn: null }; + + if (typeof opts['unknown'] === 'function') { + flags.unknownFn = opts['unknown']; + } + + if (typeof opts['boolean'] === 'boolean' && opts['boolean']) { + flags.allBools = true; + } else { + [].concat(opts['boolean']).filter(Boolean).forEach(function (key) { + flags.bools[key] = true; + }); + } + var aliases = {}; Object.keys(opts.alias || {}).forEach(function (key) { aliases[key] = [].concat(opts.alias[key]); @@ -20,14 +24,21 @@ module.exports = function (args, opts) { })); }); }); - + + [].concat(opts.string).filter(Boolean).forEach(function (key) { + flags.strings[key] = true; + if (aliases[key]) { + flags.strings[aliases[key]] = true; + } + }); + var defaults = opts['default'] || {}; - + var argv = { _ : [] }; Object.keys(flags.bools).forEach(function (key) { setArg(key, defaults[key] === undefined ? false : defaults[key]); }); - + var notFlags = []; if (args.indexOf('--') !== -1) { @@ -35,114 +46,183 @@ module.exports = function (args, opts) { args = args.slice(0, args.indexOf('--')); } - function setArg (key, val) { + function argDefined(key, arg) { + return (flags.allBools && /^--[^=]+$/.test(arg)) || + flags.strings[key] || flags.bools[key] || aliases[key]; + } + + function setArg (key, val, arg) { + if (arg && flags.unknownFn && !argDefined(key, arg)) { + if (flags.unknownFn(arg) === false) return; + } + var value = !flags.strings[key] && isNumber(val) ? Number(val) : val ; setKey(argv, key.split('.'), value); - + (aliases[key] || []).forEach(function (x) { setKey(argv, x.split('.'), value); }); } - + + function setKey (obj, keys, value) { + var o = obj; + for (var i = 0; i < keys.length-1; i++) { + var key = keys[i]; + if (key === '__proto__') return; + if (o[key] === undefined) o[key] = {}; + if (o[key] === Object.prototype || o[key] === Number.prototype + || o[key] === String.prototype) o[key] = {}; + if (o[key] === Array.prototype) o[key] = []; + o = o[key]; + } + + var key = keys[keys.length - 1]; + if (key === '__proto__') return; + if (o === Object.prototype || o === Number.prototype + || o === String.prototype) o = {}; + if (o === Array.prototype) o = []; + if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') { + o[key] = value; + } + else if (Array.isArray(o[key])) { + o[key].push(value); + } + else { + o[key] = [ o[key], value ]; + } + } + + function aliasIsBoolean(key) { + return aliases[key].some(function (x) { + return flags.bools[x]; + }); + } + for (var i = 0; i < args.length; i++) { var arg = args[i]; - + if (/^--.+=/.test(arg)) { // Using [\s\S] instead of . because js doesn't support the // 'dotall' regex modifier. See: // http://stackoverflow.com/a/1068308/13216 var m = arg.match(/^--([^=]+)=([\s\S]*)$/); - setArg(m[1], m[2]); + var key = m[1]; + var value = m[2]; + if (flags.bools[key]) { + value = value !== 'false'; + } + setArg(key, value, arg); } else if (/^--no-.+/.test(arg)) { var key = arg.match(/^--no-(.+)/)[1]; - setArg(key, false); + setArg(key, false, arg); } else if (/^--.+/.test(arg)) { var key = arg.match(/^--(.+)/)[1]; var next = args[i + 1]; if (next !== undefined && !/^-/.test(next) && !flags.bools[key] - && (aliases[key] ? !flags.bools[aliases[key]] : true)) { - setArg(key, next); + && !flags.allBools + && (aliases[key] ? !aliasIsBoolean(key) : true)) { + setArg(key, next, arg); i++; } else if (/^(true|false)$/.test(next)) { - setArg(key, next === 'true'); + setArg(key, next === 'true', arg); i++; } else { - setArg(key, flags.strings[key] ? '' : true); + setArg(key, flags.strings[key] ? '' : true, arg); } } else if (/^-[^-]+/.test(arg)) { var letters = arg.slice(1,-1).split(''); - + var broken = false; for (var j = 0; j < letters.length; j++) { var next = arg.slice(j+2); - + if (next === '-') { - setArg(letters[j], next) + setArg(letters[j], next, arg) continue; } - + + if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) { + setArg(letters[j], next.split('=')[1], arg); + broken = true; + break; + } + if (/[A-Za-z]/.test(letters[j]) && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) { - setArg(letters[j], next); + setArg(letters[j], next, arg); broken = true; break; } - + if (letters[j+1] && letters[j+1].match(/\W/)) { - setArg(letters[j], arg.slice(j+2)); + setArg(letters[j], arg.slice(j+2), arg); broken = true; break; } else { - setArg(letters[j], flags.strings[letters[j]] ? '' : true); + setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg); } } - + var key = arg.slice(-1)[0]; if (!broken && key !== '-') { if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1]) && !flags.bools[key] - && (aliases[key] ? !flags.bools[aliases[key]] : true)) { - setArg(key, args[i+1]); + && (aliases[key] ? !aliasIsBoolean(key) : true)) { + setArg(key, args[i+1], arg); i++; } - else if (args[i+1] && /true|false/.test(args[i+1])) { - setArg(key, args[i+1] === 'true'); + else if (args[i+1] && /^(true|false)$/.test(args[i+1])) { + setArg(key, args[i+1] === 'true', arg); i++; } else { - setArg(key, flags.strings[key] ? '' : true); + setArg(key, flags.strings[key] ? '' : true, arg); } } } else { - argv._.push( - flags.strings['_'] || !isNumber(arg) ? arg : Number(arg) - ); + if (!flags.unknownFn || flags.unknownFn(arg) !== false) { + argv._.push( + flags.strings['_'] || !isNumber(arg) ? arg : Number(arg) + ); + } + if (opts.stopEarly) { + argv._.push.apply(argv._, args.slice(i + 1)); + break; + } } } - + Object.keys(defaults).forEach(function (key) { if (!hasKey(argv, key.split('.'))) { setKey(argv, key.split('.'), defaults[key]); - + (aliases[key] || []).forEach(function (x) { setKey(argv, x.split('.'), defaults[key]); }); } }); - - notFlags.forEach(function(key) { - argv._.push(key); - }); + + if (opts['--']) { + argv['--'] = new Array(); + notFlags.forEach(function(key) { + argv['--'].push(key); + }); + } + else { + notFlags.forEach(function(key) { + argv._.push(key); + }); + } return argv; }; @@ -157,31 +237,8 @@ function hasKey (obj, keys) { return key in o; } -function setKey (obj, keys, value) { - var o = obj; - keys.slice(0,-1).forEach(function (key) { - if (o[key] === undefined) o[key] = {}; - o = o[key]; - }); - - var key = keys[keys.length - 1]; - if (o[key] === undefined || typeof o[key] === 'boolean') { - o[key] = value; - } - else if (Array.isArray(o[key])) { - o[key].push(value); - } - else { - o[key] = [ o[key], value ]; - } -} - function isNumber (x) { if (typeof x === 'number') return true; if (/^0x[0-9a-f]+$/i.test(x)) return true; return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x); } - -function longest (xs) { - return Math.max.apply(null, xs.map(function (x) { return x.length })); -} diff --git a/deps/npm/node_modules/minimist/package.json b/deps/npm/node_modules/mkdirp/node_modules/minimist/package.json similarity index 63% rename from deps/npm/node_modules/minimist/package.json rename to deps/npm/node_modules/mkdirp/node_modules/minimist/package.json index 0a1961342b71b0..2846f6885ae634 100644 --- a/deps/npm/node_modules/minimist/package.json +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/package.json @@ -1,27 +1,27 @@ { - "_from": "minimist@0.0.8", - "_id": "minimist@0.0.8", + "_from": "minimist@^1.2.5", + "_id": "minimist@1.2.5", "_inBundle": false, - "_integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "_location": "/minimist", + "_integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "_location": "/mkdirp/minimist", "_phantomChildren": {}, "_requested": { - "type": "version", + "type": "range", "registry": true, - "raw": "minimist@0.0.8", + "raw": "minimist@^1.2.5", "name": "minimist", "escapedName": "minimist", - "rawSpec": "0.0.8", + "rawSpec": "^1.2.5", "saveSpec": null, - "fetchSpec": "0.0.8" + "fetchSpec": "^1.2.5" }, "_requiredBy": [ "/mkdirp" ], - "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d", - "_spec": "minimist@0.0.8", - "_where": "/Users/rebecca/code/npm/node_modules/mkdirp", + "_resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "_shasum": "67d66014b66a6a8aaa0c083c5fd58df4e4e97602", + "_spec": "minimist@^1.2.5", + "_where": "/Users/darcyclarke/Documents/Repos/npm/npm/cli/node_modules/mkdirp", "author": { "name": "James Halliday", "email": "mail@substack.net", @@ -34,8 +34,9 @@ "deprecated": false, "description": "parse argument options", "devDependencies": { + "covert": "^1.0.0", "tap": "~0.4.0", - "tape": "~1.0.4" + "tape": "^3.5.0" }, "homepage": "https://github.com/substack/minimist", "keywords": [ @@ -52,6 +53,7 @@ "url": "git://github.com/substack/minimist.git" }, "scripts": { + "coverage": "covert test/*.js", "test": "tap test/*.js" }, "testling": { @@ -67,5 +69,5 @@ "opera/12" ] }, - "version": "0.0.8" + "version": "1.2.5" } diff --git a/deps/npm/node_modules/minimist/readme.markdown b/deps/npm/node_modules/mkdirp/node_modules/minimist/readme.markdown similarity index 53% rename from deps/npm/node_modules/minimist/readme.markdown rename to deps/npm/node_modules/mkdirp/node_modules/minimist/readme.markdown index c25635323e1661..5fd97ab11ee9d8 100644 --- a/deps/npm/node_modules/minimist/readme.markdown +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/readme.markdown @@ -5,15 +5,11 @@ parse argument options This module is the guts of optimist's argument parser without all the fanciful decoration. -[![browser support](https://ci.testling.com/substack/minimist.png)](http://ci.testling.com/substack/minimist) - -[![build status](https://secure.travis-ci.org/substack/minimist.png)](http://travis-ci.org/substack/minimist) - # example ``` js var argv = require('minimist')(process.argv.slice(2)); -console.dir(argv); +console.log(argv); ``` ``` @@ -33,6 +29,13 @@ $ node example/parse.js -x 3 -y 4 -n5 -abc --beep=boop foo bar baz beep: 'boop' } ``` +# security + +Previous versions had a prototype pollution bug that could cause privilege +escalation in some circumstances when handling untrusted user input. + +Please use version 1.2.3 or later: https://snyk.io/vuln/SNYK-JS-MINIMIST-559764 + # methods ``` js @@ -55,10 +58,29 @@ options can be: * `opts.string` - a string or array of strings argument names to always treat as strings -* `opts.boolean` - a string or array of strings to always treat as booleans +* `opts.boolean` - a boolean, string or array of strings to always treat as +booleans. if `true` will treat all double hyphenated arguments without equal signs +as boolean (e.g. affects `--foo`, not `-f` or `--foo=bar`) * `opts.alias` - an object mapping string names to strings or arrays of string argument names to use as aliases * `opts.default` - an object mapping string argument names to default values +* `opts.stopEarly` - when true, populate `argv._` with everything after the +first non-option +* `opts['--']` - when true, populate `argv._` with everything before the `--` +and `argv['--']` with everything after the `--`. Here's an example: + + ``` + > require('./')('one two three -- four five --six'.split(' '), { '--': true }) + { _: [ 'one', 'two', 'three' ], + '--': [ 'four', 'five', '--six' ] } + ``` + + Note that with `opts['--']` set, parsing for arguments still stops after the + `--`. + +* `opts.unknown` - a function which is invoked with a command line parameter not +defined in the `opts` configuration object. If the function returns `false`, the +unknown option is not added to `argv`. # install diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/all_bool.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/all_bool.js new file mode 100644 index 00000000000000..25df1654bc99d9 --- /dev/null +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/all_bool.js @@ -0,0 +1,32 @@ +var parse = require('../'); +var test = require('tape'); + +test('flag boolean true (default all --args to boolean)', function (t) { + var argv = parse(['moo', '--honk', 'cow'], { + boolean: true + }); + + t.deepEqual(argv, { + honk: true, + _: ['moo', 'cow'] + }); + + t.deepEqual(typeof argv.honk, 'boolean'); + t.end(); +}); + +test('flag boolean true only affects double hyphen arguments without equals signs', function (t) { + var argv = parse(['moo', '--honk', 'cow', '-p', '55', '--tacos=good'], { + boolean: true + }); + + t.deepEqual(argv, { + honk: true, + tacos: 'good', + p: 55, + _: ['moo', 'cow'] + }); + + t.deepEqual(typeof argv.honk, 'boolean'); + t.end(); +}); diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/bool.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/bool.js new file mode 100644 index 00000000000000..dc9666bc619755 --- /dev/null +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/bool.js @@ -0,0 +1,178 @@ +var parse = require('../'); +var test = require('tape'); + +test('flag boolean default false', function (t) { + var argv = parse(['moo'], { + boolean: ['t', 'verbose'], + default: { verbose: false, t: false } + }); + + t.deepEqual(argv, { + verbose: false, + t: false, + _: ['moo'] + }); + + t.deepEqual(typeof argv.verbose, 'boolean'); + t.deepEqual(typeof argv.t, 'boolean'); + t.end(); + +}); + +test('boolean groups', function (t) { + var argv = parse([ '-x', '-z', 'one', 'two', 'three' ], { + boolean: ['x','y','z'] + }); + + t.deepEqual(argv, { + x : true, + y : false, + z : true, + _ : [ 'one', 'two', 'three' ] + }); + + t.deepEqual(typeof argv.x, 'boolean'); + t.deepEqual(typeof argv.y, 'boolean'); + t.deepEqual(typeof argv.z, 'boolean'); + t.end(); +}); +test('boolean and alias with chainable api', function (t) { + var aliased = [ '-h', 'derp' ]; + var regular = [ '--herp', 'derp' ]; + var opts = { + herp: { alias: 'h', boolean: true } + }; + var aliasedArgv = parse(aliased, { + boolean: 'herp', + alias: { h: 'herp' } + }); + var propertyArgv = parse(regular, { + boolean: 'herp', + alias: { h: 'herp' } + }); + var expected = { + herp: true, + h: true, + '_': [ 'derp' ] + }; + + t.same(aliasedArgv, expected); + t.same(propertyArgv, expected); + t.end(); +}); + +test('boolean and alias with options hash', function (t) { + var aliased = [ '-h', 'derp' ]; + var regular = [ '--herp', 'derp' ]; + var opts = { + alias: { 'h': 'herp' }, + boolean: 'herp' + }; + var aliasedArgv = parse(aliased, opts); + var propertyArgv = parse(regular, opts); + var expected = { + herp: true, + h: true, + '_': [ 'derp' ] + }; + t.same(aliasedArgv, expected); + t.same(propertyArgv, expected); + t.end(); +}); + +test('boolean and alias array with options hash', function (t) { + var aliased = [ '-h', 'derp' ]; + var regular = [ '--herp', 'derp' ]; + var alt = [ '--harp', 'derp' ]; + var opts = { + alias: { 'h': ['herp', 'harp'] }, + boolean: 'h' + }; + var aliasedArgv = parse(aliased, opts); + var propertyArgv = parse(regular, opts); + var altPropertyArgv = parse(alt, opts); + var expected = { + harp: true, + herp: true, + h: true, + '_': [ 'derp' ] + }; + t.same(aliasedArgv, expected); + t.same(propertyArgv, expected); + t.same(altPropertyArgv, expected); + t.end(); +}); + +test('boolean and alias using explicit true', function (t) { + var aliased = [ '-h', 'true' ]; + var regular = [ '--herp', 'true' ]; + var opts = { + alias: { h: 'herp' }, + boolean: 'h' + }; + var aliasedArgv = parse(aliased, opts); + var propertyArgv = parse(regular, opts); + var expected = { + herp: true, + h: true, + '_': [ ] + }; + + t.same(aliasedArgv, expected); + t.same(propertyArgv, expected); + t.end(); +}); + +// regression, see https://github.com/substack/node-optimist/issues/71 +test('boolean and --x=true', function(t) { + var parsed = parse(['--boool', '--other=true'], { + boolean: 'boool' + }); + + t.same(parsed.boool, true); + t.same(parsed.other, 'true'); + + parsed = parse(['--boool', '--other=false'], { + boolean: 'boool' + }); + + t.same(parsed.boool, true); + t.same(parsed.other, 'false'); + t.end(); +}); + +test('boolean --boool=true', function (t) { + var parsed = parse(['--boool=true'], { + default: { + boool: false + }, + boolean: ['boool'] + }); + + t.same(parsed.boool, true); + t.end(); +}); + +test('boolean --boool=false', function (t) { + var parsed = parse(['--boool=false'], { + default: { + boool: true + }, + boolean: ['boool'] + }); + + t.same(parsed.boool, false); + t.end(); +}); + +test('boolean using something similar to true', function (t) { + var opts = { boolean: 'h' }; + var result = parse(['-h', 'true.txt'], opts); + var expected = { + h: true, + '_': ['true.txt'] + }; + + t.same(result, expected); + t.end(); +}); \ No newline at end of file diff --git a/deps/npm/node_modules/minimist/test/dash.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dash.js similarity index 74% rename from deps/npm/node_modules/minimist/test/dash.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/dash.js index 8b034b99a9eace..5a4fa5be418596 100644 --- a/deps/npm/node_modules/minimist/test/dash.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dash.js @@ -22,3 +22,10 @@ test('-a -- b', function (t) { t.deepEqual(parse([ '--a', '--', 'b' ]), { a: true, _: [ 'b' ] }); t.deepEqual(parse([ '--a', '--', 'b' ]), { a: true, _: [ 'b' ] }); }); + +test('move arguments after the -- into their own `--` array', function(t) { + t.plan(1); + t.deepEqual( + parse([ '--name', 'John', 'before', '--', 'after' ], { '--': true }), + { name: 'John', _: [ 'before' ], '--': [ 'after' ] }); +}); diff --git a/deps/npm/node_modules/minimist/test/default_bool.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/default_bool.js similarity index 58% rename from deps/npm/node_modules/minimist/test/default_bool.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/default_bool.js index f0041ee40cd05f..780a311270fcda 100644 --- a/deps/npm/node_modules/minimist/test/default_bool.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/default_bool.js @@ -18,3 +18,18 @@ test('boolean default false', function (t) { t.equal(argv.somefalse, false); t.end(); }); + +test('boolean default to null', function (t) { + var argv = parse([], { + boolean: 'maybe', + default: { maybe: null } + }); + t.equal(argv.maybe, null); + var argv = parse(['--maybe'], { + boolean: 'maybe', + default: { maybe: null } + }); + t.equal(argv.maybe, true); + t.end(); + +}) diff --git a/deps/npm/node_modules/minimist/test/dotted.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dotted.js similarity index 75% rename from deps/npm/node_modules/minimist/test/dotted.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/dotted.js index ef0ae349bf3bf5..d8b3e856ec795f 100644 --- a/deps/npm/node_modules/minimist/test/dotted.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dotted.js @@ -14,3 +14,9 @@ test('dotted default', function (t) { t.equal(argv.aa.bb, 11); t.end(); }); + +test('dotted default with no alias', function (t) { + var argv = parse('', {default: {'a.b': 11}}); + t.equal(argv.a.b, 11); + t.end(); +}); diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/kv_short.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/kv_short.js new file mode 100644 index 00000000000000..ae880be4661dd5 --- /dev/null +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/kv_short.js @@ -0,0 +1,16 @@ +var parse = require('../'); +var test = require('tape'); + +test('short -k=v' , function (t) { + t.plan(1); + + var argv = parse([ '-b=123' ]); + t.deepEqual(argv, { b: 123, _: [] }); +}); + +test('multi short -k=v' , function (t) { + t.plan(1); + + var argv = parse([ '-a=whatever', '-b=robots' ]); + t.deepEqual(argv, { a: 'whatever', b: 'robots', _: [] }); +}); diff --git a/deps/npm/node_modules/minimist/test/long.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/long.js similarity index 100% rename from deps/npm/node_modules/minimist/test/long.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/long.js diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/num.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/num.js new file mode 100644 index 00000000000000..2cc77f4d62ffb2 --- /dev/null +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/num.js @@ -0,0 +1,36 @@ +var parse = require('../'); +var test = require('tape'); + +test('nums', function (t) { + var argv = parse([ + '-x', '1234', + '-y', '5.67', + '-z', '1e7', + '-w', '10f', + '--hex', '0xdeadbeef', + '789' + ]); + t.deepEqual(argv, { + x : 1234, + y : 5.67, + z : 1e7, + w : '10f', + hex : 0xdeadbeef, + _ : [ 789 ] + }); + t.deepEqual(typeof argv.x, 'number'); + t.deepEqual(typeof argv.y, 'number'); + t.deepEqual(typeof argv.z, 'number'); + t.deepEqual(typeof argv.w, 'string'); + t.deepEqual(typeof argv.hex, 'number'); + t.deepEqual(typeof argv._[0], 'number'); + t.end(); +}); + +test('already a number', function (t) { + var argv = parse([ '-x', 1234, 789 ]); + t.deepEqual(argv, { x : 1234, _ : [ 789 ] }); + t.deepEqual(typeof argv.x, 'number'); + t.deepEqual(typeof argv._[0], 'number'); + t.end(); +}); diff --git a/deps/npm/node_modules/minimist/test/parse.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js similarity index 54% rename from deps/npm/node_modules/minimist/test/parse.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js index 8a90646696628e..58f24572c47d86 100644 --- a/deps/npm/node_modules/minimist/test/parse.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js @@ -14,7 +14,7 @@ test('parse args', function (t) { ); t.end(); }); - + test('comprehensive', function (t) { t.deepEqual( parse([ @@ -42,32 +42,6 @@ test('comprehensive', function (t) { t.end(); }); -test('nums', function (t) { - var argv = parse([ - '-x', '1234', - '-y', '5.67', - '-z', '1e7', - '-w', '10f', - '--hex', '0xdeadbeef', - '789' - ]); - t.deepEqual(argv, { - x : 1234, - y : 5.67, - z : 1e7, - w : '10f', - hex : 0xdeadbeef, - _ : [ 789 ] - }); - t.deepEqual(typeof argv.x, 'number'); - t.deepEqual(typeof argv.y, 'number'); - t.deepEqual(typeof argv.z, 'number'); - t.deepEqual(typeof argv.w, 'string'); - t.deepEqual(typeof argv.hex, 'number'); - t.deepEqual(typeof argv._[0], 'number'); - t.end(); -}); - test('flag boolean', function (t) { var argv = parse([ '-t', 'moo' ], { boolean: 't' }); t.deepEqual(argv, { t : true, _ : [ 'moo' ] }); @@ -80,58 +54,22 @@ test('flag boolean value', function (t) { boolean: [ 't', 'verbose' ], default: { verbose: true } }); - + t.deepEqual(argv, { verbose: false, t: true, _: ['moo'] }); - - t.deepEqual(typeof argv.verbose, 'boolean'); - t.deepEqual(typeof argv.t, 'boolean'); - t.end(); -}); -test('flag boolean default false', function (t) { - var argv = parse(['moo'], { - boolean: ['t', 'verbose'], - default: { verbose: false, t: false } - }); - - t.deepEqual(argv, { - verbose: false, - t: false, - _: ['moo'] - }); - t.deepEqual(typeof argv.verbose, 'boolean'); t.deepEqual(typeof argv.t, 'boolean'); t.end(); - -}); - -test('boolean groups', function (t) { - var argv = parse([ '-x', '-z', 'one', 'two', 'three' ], { - boolean: ['x','y','z'] - }); - - t.deepEqual(argv, { - x : true, - y : false, - z : true, - _ : [ 'one', 'two', 'three' ] - }); - - t.deepEqual(typeof argv.x, 'boolean'); - t.deepEqual(typeof argv.y, 'boolean'); - t.deepEqual(typeof argv.z, 'boolean'); - t.end(); }); test('newlines in params' , function (t) { var args = parse([ '-s', "X\nX" ]) t.deepEqual(args, { _ : [], s : "X\nX" }); - + // reproduce in bash: // VALUE="new // line" @@ -145,7 +83,7 @@ test('strings' , function (t) { var s = parse([ '-s', '0001234' ], { string: 's' }).s; t.equal(s, '0001234'); t.equal(typeof s, 'string'); - + var x = parse([ '-x', '56' ], { string: 'x' }).x; t.equal(x, '56'); t.equal(typeof x, 'string'); @@ -183,6 +121,29 @@ test('empty strings', function(t) { }); +test('string and alias', function(t) { + var x = parse([ '--str', '000123' ], { + string: 's', + alias: { s: 'str' } + }); + + t.equal(x.str, '000123'); + t.equal(typeof x.str, 'string'); + t.equal(x.s, '000123'); + t.equal(typeof x.s, 'string'); + + var y = parse([ '-s', '000123' ], { + string: 'str', + alias: { str: 's' } + }); + + t.equal(y.str, '000123'); + t.equal(typeof y.str, 'string'); + t.equal(y.s, '000123'); + t.equal(typeof y.s, 'string'); + t.end(); +}); + test('slashBreak', function (t) { t.same( parse([ '-I/foo/bar/baz' ]), @@ -222,7 +183,7 @@ test('nested dotted objects', function (t) { '--foo.quux.quibble', '5', '--foo.quux.o_O', '--beep.boop' ]); - + t.same(argv.foo, { bar : 3, baz : 4, @@ -234,85 +195,3 @@ test('nested dotted objects', function (t) { t.same(argv.beep, { boop : true }); t.end(); }); - -test('boolean and alias with chainable api', function (t) { - var aliased = [ '-h', 'derp' ]; - var regular = [ '--herp', 'derp' ]; - var opts = { - herp: { alias: 'h', boolean: true } - }; - var aliasedArgv = parse(aliased, { - boolean: 'herp', - alias: { h: 'herp' } - }); - var propertyArgv = parse(regular, { - boolean: 'herp', - alias: { h: 'herp' } - }); - var expected = { - herp: true, - h: true, - '_': [ 'derp' ] - }; - - t.same(aliasedArgv, expected); - t.same(propertyArgv, expected); - t.end(); -}); - -test('boolean and alias with options hash', function (t) { - var aliased = [ '-h', 'derp' ]; - var regular = [ '--herp', 'derp' ]; - var opts = { - alias: { 'h': 'herp' }, - boolean: 'herp' - }; - var aliasedArgv = parse(aliased, opts); - var propertyArgv = parse(regular, opts); - var expected = { - herp: true, - h: true, - '_': [ 'derp' ] - }; - t.same(aliasedArgv, expected); - t.same(propertyArgv, expected); - t.end(); -}); - -test('boolean and alias using explicit true', function (t) { - var aliased = [ '-h', 'true' ]; - var regular = [ '--herp', 'true' ]; - var opts = { - alias: { h: 'herp' }, - boolean: 'h' - }; - var aliasedArgv = parse(aliased, opts); - var propertyArgv = parse(regular, opts); - var expected = { - herp: true, - h: true, - '_': [ ] - }; - - t.same(aliasedArgv, expected); - t.same(propertyArgv, expected); - t.end(); -}); - -// regression, see https://github.com/substack/node-optimist/issues/71 -test('boolean and --x=true', function(t) { - var parsed = parse(['--boool', '--other=true'], { - boolean: 'boool' - }); - - t.same(parsed.boool, true); - t.same(parsed.other, 'true'); - - parsed = parse(['--boool', '--other=false'], { - boolean: 'boool' - }); - - t.same(parsed.boool, true); - t.same(parsed.other, 'false'); - t.end(); -}); diff --git a/deps/npm/node_modules/minimist/test/parse_modified.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js similarity index 77% rename from deps/npm/node_modules/minimist/test/parse_modified.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js index 21851b036ee6d9..a22248532f0c6f 100644 --- a/deps/npm/node_modules/minimist/test/parse_modified.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js @@ -3,7 +3,7 @@ var test = require('tape'); test('parse with modifier functions' , function (t) { t.plan(1); - + var argv = parse([ '-b', '123' ], { boolean: 'b' }); - t.deepEqual(argv, { b: true, _: ['123'] }); + t.deepEqual(argv, { b: true, _: [123] }); }); diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/proto.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/proto.js new file mode 100644 index 00000000000000..8649107ecba1f0 --- /dev/null +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/proto.js @@ -0,0 +1,44 @@ +var parse = require('../'); +var test = require('tape'); + +test('proto pollution', function (t) { + var argv = parse(['--__proto__.x','123']); + t.equal({}.x, undefined); + t.equal(argv.__proto__.x, undefined); + t.equal(argv.x, undefined); + t.end(); +}); + +test('proto pollution (array)', function (t) { + var argv = parse(['--x','4','--x','5','--x.__proto__.z','789']); + t.equal({}.z, undefined); + t.deepEqual(argv.x, [4,5]); + t.equal(argv.x.z, undefined); + t.equal(argv.x.__proto__.z, undefined); + t.end(); +}); + +test('proto pollution (number)', function (t) { + var argv = parse(['--x','5','--x.__proto__.z','100']); + t.equal({}.z, undefined); + t.equal((4).z, undefined); + t.equal(argv.x, 5); + t.equal(argv.x.z, undefined); + t.end(); +}); + +test('proto pollution (string)', function (t) { + var argv = parse(['--x','abc','--x.__proto__.z','def']); + t.equal({}.z, undefined); + t.equal('...'.z, undefined); + t.equal(argv.x, 'abc'); + t.equal(argv.x.z, undefined); + t.end(); +}); + +test('proto pollution (constructor)', function (t) { + var argv = parse(['--constructor.prototype.y','123']); + t.equal({}.y, undefined); + t.equal(argv.y, undefined); + t.end(); +}); diff --git a/deps/npm/node_modules/minimist/test/short.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js similarity index 99% rename from deps/npm/node_modules/minimist/test/short.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js index d513a1c2529095..ac18880f1eb50c 100644 --- a/deps/npm/node_modules/minimist/test/short.js +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js @@ -43,7 +43,7 @@ test('short', function (t) { ); t.end(); }); - + test('mixed short bool and capture', function (t) { t.same( parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]), @@ -54,7 +54,7 @@ test('mixed short bool and capture', function (t) { ); t.end(); }); - + test('short and long', function (t) { t.deepEqual( parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]), diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/stop_early.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/stop_early.js new file mode 100644 index 00000000000000..bdf9fbcb0b57ab --- /dev/null +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/stop_early.js @@ -0,0 +1,15 @@ +var parse = require('../'); +var test = require('tape'); + +test('stops parsing on the first non-option when stopEarly is set', function (t) { + var argv = parse(['--aaa', 'bbb', 'ccc', '--ddd'], { + stopEarly: true + }); + + t.deepEqual(argv, { + aaa: 'bbb', + _: ['ccc', '--ddd'] + }); + + t.end(); +}); diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/unknown.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/unknown.js new file mode 100644 index 00000000000000..462a36bdd7ec9f --- /dev/null +++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/unknown.js @@ -0,0 +1,102 @@ +var parse = require('../'); +var test = require('tape'); + +test('boolean and alias is not unknown', function (t) { + var unknown = []; + function unknownFn(arg) { + unknown.push(arg); + return false; + } + var aliased = [ '-h', 'true', '--derp', 'true' ]; + var regular = [ '--herp', 'true', '-d', 'true' ]; + var opts = { + alias: { h: 'herp' }, + boolean: 'h', + unknown: unknownFn + }; + var aliasedArgv = parse(aliased, opts); + var propertyArgv = parse(regular, opts); + + t.same(unknown, ['--derp', '-d']); + t.end(); +}); + +test('flag boolean true any double hyphen argument is not unknown', function (t) { + var unknown = []; + function unknownFn(arg) { + unknown.push(arg); + return false; + } + var argv = parse(['--honk', '--tacos=good', 'cow', '-p', '55'], { + boolean: true, + unknown: unknownFn + }); + t.same(unknown, ['--tacos=good', 'cow', '-p']); + t.same(argv, { + honk: true, + _: [] + }); + t.end(); +}); + +test('string and alias is not unknown', function (t) { + var unknown = []; + function unknownFn(arg) { + unknown.push(arg); + return false; + } + var aliased = [ '-h', 'hello', '--derp', 'goodbye' ]; + var regular = [ '--herp', 'hello', '-d', 'moon' ]; + var opts = { + alias: { h: 'herp' }, + string: 'h', + unknown: unknownFn + }; + var aliasedArgv = parse(aliased, opts); + var propertyArgv = parse(regular, opts); + + t.same(unknown, ['--derp', '-d']); + t.end(); +}); + +test('default and alias is not unknown', function (t) { + var unknown = []; + function unknownFn(arg) { + unknown.push(arg); + return false; + } + var aliased = [ '-h', 'hello' ]; + var regular = [ '--herp', 'hello' ]; + var opts = { + default: { 'h': 'bar' }, + alias: { 'h': 'herp' }, + unknown: unknownFn + }; + var aliasedArgv = parse(aliased, opts); + var propertyArgv = parse(regular, opts); + + t.same(unknown, []); + t.end(); + unknownFn(); // exercise fn for 100% coverage +}); + +test('value following -- is not unknown', function (t) { + var unknown = []; + function unknownFn(arg) { + unknown.push(arg); + return false; + } + var aliased = [ '--bad', '--', 'good', 'arg' ]; + var opts = { + '--': true, + unknown: unknownFn + }; + var argv = parse(aliased, opts); + + t.same(unknown, ['--bad']); + t.same(argv, { + '--': ['good', 'arg'], + '_': [] + }) + t.end(); +}); diff --git a/deps/npm/node_modules/minimist/test/whitespace.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/whitespace.js similarity index 100% rename from deps/npm/node_modules/minimist/test/whitespace.js rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/whitespace.js diff --git a/deps/npm/node_modules/mkdirp/package.json b/deps/npm/node_modules/mkdirp/package.json index aa7b9061128f2f..5ff5891b2c06d8 100644 --- a/deps/npm/node_modules/mkdirp/package.json +++ b/deps/npm/node_modules/mkdirp/package.json @@ -1,47 +1,41 @@ { - "_args": [ - [ - "mkdirp@0.5.1", - "/Users/rebecca/code/npm" - ] - ], - "_from": "mkdirp@0.5.1", - "_id": "mkdirp@0.5.1", + "_from": "mkdirp@0.5.4", + "_id": "mkdirp@0.5.4", "_inBundle": false, - "_integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "_integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", "_location": "/mkdirp", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "mkdirp@0.5.1", + "raw": "mkdirp@0.5.4", "name": "mkdirp", "escapedName": "mkdirp", - "rawSpec": "0.5.1", + "rawSpec": "0.5.4", "saveSpec": null, - "fetchSpec": "0.5.1" + "fetchSpec": "0.5.4" }, "_requiredBy": [ + "#USER", "/", "/cacache", "/cmd-shim", "/copy-concurrently", "/eslint", - "/fstream", "/gentle-fs", + "/libcipm", "/move-concurrently", "/node-gyp", - "/npm-profile/cacache", - "/npm-registry-fetch/cacache", "/pacote", - "/tacks", + "/spawn-wrap", "/tap", "/tar", "/write" ], - "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "_spec": "0.5.1", - "_where": "/Users/rebecca/code/npm", + "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", + "_shasum": "fd01504a6797ec5c9be81ff43d204961ed64a512", + "_spec": "mkdirp@0.5.4", + "_where": "/Users/ruyadorno/Documents/workspace/cli", "author": { "name": "James Halliday", "email": "mail@substack.net", @@ -53,14 +47,20 @@ "bugs": { "url": "https://github.com/substack/node-mkdirp/issues" }, + "bundleDependencies": false, "dependencies": { - "minimist": "0.0.8" + "minimist": "^1.2.5" }, + "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", "description": "Recursively mkdir, like `mkdir -p`", "devDependencies": { - "mock-fs": "2 >=2.7.0", - "tap": "1" + "mock-fs": "^3.7.0", + "tap": "^5.4.2" }, + "files": [ + "bin", + "index.js" + ], "homepage": "https://github.com/substack/node-mkdirp#readme", "keywords": [ "mkdir", @@ -69,6 +69,9 @@ "license": "MIT", "main": "index.js", "name": "mkdirp", + "publishConfig": { + "tag": "legacy" + }, "repository": { "type": "git", "url": "git+https://github.com/substack/node-mkdirp.git" @@ -76,5 +79,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "0.5.1" + "version": "0.5.4" } diff --git a/deps/npm/node_modules/mkdirp/test/chmod.js b/deps/npm/node_modules/mkdirp/test/chmod.js deleted file mode 100644 index 6a404b932f941f..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/chmod.js +++ /dev/null @@ -1,41 +0,0 @@ -var mkdirp = require('../').mkdirp; -var path = require('path'); -var fs = require('fs'); -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); -var _0744 = parseInt('0744', 8); - -var ps = [ '', 'tmp' ]; - -for (var i = 0; i < 25; i++) { - var dir = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - ps.push(dir); -} - -var file = ps.join('/'); - -test('chmod-pre', function (t) { - var mode = _0744 - mkdirp(file, mode, function (er) { - t.ifError(er, 'should not error'); - fs.stat(file, function (er, stat) { - t.ifError(er, 'should exist'); - t.ok(stat && stat.isDirectory(), 'should be directory'); - t.equal(stat && stat.mode & _0777, mode, 'should be 0744'); - t.end(); - }); - }); -}); - -test('chmod', function (t) { - var mode = _0755 - mkdirp(file, mode, function (er) { - t.ifError(er, 'should not error'); - fs.stat(file, function (er, stat) { - t.ifError(er, 'should exist'); - t.ok(stat && stat.isDirectory(), 'should be directory'); - t.end(); - }); - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/clobber.js b/deps/npm/node_modules/mkdirp/test/clobber.js deleted file mode 100644 index 2433b9ad548557..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/clobber.js +++ /dev/null @@ -1,38 +0,0 @@ -var mkdirp = require('../').mkdirp; -var path = require('path'); -var fs = require('fs'); -var test = require('tap').test; -var _0755 = parseInt('0755', 8); - -var ps = [ '', 'tmp' ]; - -for (var i = 0; i < 25; i++) { - var dir = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - ps.push(dir); -} - -var file = ps.join('/'); - -// a file in the way -var itw = ps.slice(0, 3).join('/'); - - -test('clobber-pre', function (t) { - console.error("about to write to "+itw) - fs.writeFileSync(itw, 'I AM IN THE WAY, THE TRUTH, AND THE LIGHT.'); - - fs.stat(itw, function (er, stat) { - t.ifError(er) - t.ok(stat && stat.isFile(), 'should be file') - t.end() - }) -}) - -test('clobber', function (t) { - t.plan(2); - mkdirp(file, _0755, function (err) { - t.ok(err); - t.equal(err.code, 'ENOTDIR'); - t.end(); - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/mkdirp.js b/deps/npm/node_modules/mkdirp/test/mkdirp.js deleted file mode 100644 index eaa8921c7f1488..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/mkdirp.js +++ /dev/null @@ -1,28 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('woo', function (t) { - t.plan(5); - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/tmp/' + [x,y,z].join('/'); - - mkdirp(file, _0755, function (err) { - t.ifError(err); - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }) - }) - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/opts_fs.js b/deps/npm/node_modules/mkdirp/test/opts_fs.js deleted file mode 100644 index 97186b62e0bb90..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/opts_fs.js +++ /dev/null @@ -1,29 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var test = require('tap').test; -var mockfs = require('mock-fs'); -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('opts.fs', function (t) { - t.plan(5); - - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/beep/boop/' + [x,y,z].join('/'); - var xfs = mockfs.fs(); - - mkdirp(file, { fs: xfs, mode: _0755 }, function (err) { - t.ifError(err); - xfs.exists(file, function (ex) { - t.ok(ex, 'created file'); - xfs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }); - }); - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/opts_fs_sync.js b/deps/npm/node_modules/mkdirp/test/opts_fs_sync.js deleted file mode 100644 index 6c370aa6e93a20..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/opts_fs_sync.js +++ /dev/null @@ -1,27 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var test = require('tap').test; -var mockfs = require('mock-fs'); -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('opts.fs sync', function (t) { - t.plan(4); - - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/beep/boop/' + [x,y,z].join('/'); - var xfs = mockfs.fs(); - - mkdirp.sync(file, { fs: xfs, mode: _0755 }); - xfs.exists(file, function (ex) { - t.ok(ex, 'created file'); - xfs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }); - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/perm.js b/deps/npm/node_modules/mkdirp/test/perm.js deleted file mode 100644 index fbce44b82bafee..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/perm.js +++ /dev/null @@ -1,32 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('async perm', function (t) { - t.plan(5); - var file = '/tmp/' + (Math.random() * (1<<30)).toString(16); - - mkdirp(file, _0755, function (err) { - t.ifError(err); - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }) - }) - }); -}); - -test('async root perm', function (t) { - mkdirp('/tmp', _0755, function (err) { - if (err) t.fail(err); - t.end(); - }); - t.end(); -}); diff --git a/deps/npm/node_modules/mkdirp/test/perm_sync.js b/deps/npm/node_modules/mkdirp/test/perm_sync.js deleted file mode 100644 index 398229fe54ab04..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/perm_sync.js +++ /dev/null @@ -1,36 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('sync perm', function (t) { - t.plan(4); - var file = '/tmp/' + (Math.random() * (1<<30)).toString(16) + '.json'; - - mkdirp.sync(file, _0755); - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }); - }); -}); - -test('sync root perm', function (t) { - t.plan(3); - - var file = '/tmp'; - mkdirp.sync(file, _0755); - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.ok(stat.isDirectory(), 'target not a directory'); - }) - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/race.js b/deps/npm/node_modules/mkdirp/test/race.js deleted file mode 100644 index b0b9e183c902fb..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/race.js +++ /dev/null @@ -1,37 +0,0 @@ -var mkdirp = require('../').mkdirp; -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('race', function (t) { - t.plan(10); - var ps = [ '', 'tmp' ]; - - for (var i = 0; i < 25; i++) { - var dir = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - ps.push(dir); - } - var file = ps.join('/'); - - var res = 2; - mk(file); - - mk(file); - - function mk (file, cb) { - mkdirp(file, _0755, function (err) { - t.ifError(err); - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }); - }) - }); - } -}); diff --git a/deps/npm/node_modules/mkdirp/test/rel.js b/deps/npm/node_modules/mkdirp/test/rel.js deleted file mode 100644 index 4ddb34276a72a2..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/rel.js +++ /dev/null @@ -1,32 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('rel', function (t) { - t.plan(5); - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var cwd = process.cwd(); - process.chdir('/tmp'); - - var file = [x,y,z].join('/'); - - mkdirp(file, _0755, function (err) { - t.ifError(err); - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - process.chdir(cwd); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }) - }) - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/return.js b/deps/npm/node_modules/mkdirp/test/return.js deleted file mode 100644 index bce68e5613e3f9..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/return.js +++ /dev/null @@ -1,25 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var test = require('tap').test; - -test('return value', function (t) { - t.plan(4); - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/tmp/' + [x,y,z].join('/'); - - // should return the first dir created. - // By this point, it would be profoundly surprising if /tmp didn't - // already exist, since every other test makes things in there. - mkdirp(file, function (err, made) { - t.ifError(err); - t.equal(made, '/tmp/' + x); - mkdirp(file, function (err, made) { - t.ifError(err); - t.equal(made, null); - }); - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/return_sync.js b/deps/npm/node_modules/mkdirp/test/return_sync.js deleted file mode 100644 index 7c222d3558d6f0..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/return_sync.js +++ /dev/null @@ -1,24 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var test = require('tap').test; - -test('return value', function (t) { - t.plan(2); - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/tmp/' + [x,y,z].join('/'); - - // should return the first dir created. - // By this point, it would be profoundly surprising if /tmp didn't - // already exist, since every other test makes things in there. - // Note that this will throw on failure, which will fail the test. - var made = mkdirp.sync(file); - t.equal(made, '/tmp/' + x); - - // making the same file again should have no effect. - made = mkdirp.sync(file); - t.equal(made, null); -}); diff --git a/deps/npm/node_modules/mkdirp/test/root.js b/deps/npm/node_modules/mkdirp/test/root.js deleted file mode 100644 index 9e7d079d9fc757..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/root.js +++ /dev/null @@ -1,19 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var test = require('tap').test; -var _0755 = parseInt('0755', 8); - -test('root', function (t) { - // '/' on unix, 'c:/' on windows. - var file = path.resolve('/'); - - mkdirp(file, _0755, function (err) { - if (err) throw err - fs.stat(file, function (er, stat) { - if (er) throw er - t.ok(stat.isDirectory(), 'target is a directory'); - t.end(); - }) - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/sync.js b/deps/npm/node_modules/mkdirp/test/sync.js deleted file mode 100644 index 8c8dc938c8b4a8..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/sync.js +++ /dev/null @@ -1,32 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('sync', function (t) { - t.plan(4); - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/tmp/' + [x,y,z].join('/'); - - try { - mkdirp.sync(file, _0755); - } catch (err) { - t.fail(err); - return t.end(); - } - - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0755); - t.ok(stat.isDirectory(), 'target not a directory'); - }); - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/umask.js b/deps/npm/node_modules/mkdirp/test/umask.js deleted file mode 100644 index 2033c63a414efa..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/umask.js +++ /dev/null @@ -1,28 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('implicit mode from umask', function (t) { - t.plan(5); - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/tmp/' + [x,y,z].join('/'); - - mkdirp(file, function (err) { - t.ifError(err); - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, _0777 & (~process.umask())); - t.ok(stat.isDirectory(), 'target not a directory'); - }); - }) - }); -}); diff --git a/deps/npm/node_modules/mkdirp/test/umask_sync.js b/deps/npm/node_modules/mkdirp/test/umask_sync.js deleted file mode 100644 index 11a76147496a52..00000000000000 --- a/deps/npm/node_modules/mkdirp/test/umask_sync.js +++ /dev/null @@ -1,32 +0,0 @@ -var mkdirp = require('../'); -var path = require('path'); -var fs = require('fs'); -var exists = fs.exists || path.exists; -var test = require('tap').test; -var _0777 = parseInt('0777', 8); -var _0755 = parseInt('0755', 8); - -test('umask sync modes', function (t) { - t.plan(4); - var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16); - - var file = '/tmp/' + [x,y,z].join('/'); - - try { - mkdirp.sync(file); - } catch (err) { - t.fail(err); - return t.end(); - } - - exists(file, function (ex) { - t.ok(ex, 'file created'); - fs.stat(file, function (err, stat) { - t.ifError(err); - t.equal(stat.mode & _0777, (_0777 & (~process.umask()))); - t.ok(stat.isDirectory(), 'target not a directory'); - }); - }); -}); diff --git a/deps/npm/node_modules/nice-try/CHANGELOG.md b/deps/npm/node_modules/nice-try/CHANGELOG.md new file mode 100644 index 00000000000000..9e6baf2fb59be2 --- /dev/null +++ b/deps/npm/node_modules/nice-try/CHANGELOG.md @@ -0,0 +1,21 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [1.0.5] - 2018-08-25 + +### Changed + +- Removed `prepublish` script from `package.json` + +## [1.0.4] - 2017-08-08 + +### New + +- Added a changelog + +### Changed + +- Ignore `yarn.lock` and `package-lock.json` files \ No newline at end of file diff --git a/deps/npm/node_modules/nice-try/LICENSE b/deps/npm/node_modules/nice-try/LICENSE new file mode 100644 index 00000000000000..681c8f507b00e7 --- /dev/null +++ b/deps/npm/node_modules/nice-try/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2018 Tobias Reich + +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. diff --git a/deps/npm/node_modules/nice-try/README.md b/deps/npm/node_modules/nice-try/README.md new file mode 100644 index 00000000000000..5b83b78824a0e5 --- /dev/null +++ b/deps/npm/node_modules/nice-try/README.md @@ -0,0 +1,32 @@ +# nice-try + +[![Travis Build Status](https://travis-ci.org/electerious/nice-try.svg?branch=master)](https://travis-ci.org/electerious/nice-try) [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/8tqb09wrwci3xf8l?svg=true)](https://ci.appveyor.com/project/electerious/nice-try) [![Coverage Status](https://coveralls.io/repos/github/electerious/nice-try/badge.svg?branch=master)](https://coveralls.io/github/electerious/nice-try?branch=master) [![Dependencies](https://david-dm.org/electerious/nice-try.svg)](https://david-dm.org/electerious/nice-try#info=dependencies) [![Greenkeeper badge](https://badges.greenkeeper.io/electerious/nice-try.svg)](https://greenkeeper.io/) + +A function that tries to execute a function and discards any error that occurs. + +## Install + +``` +npm install nice-try +``` + +## Usage + +```js +const niceTry = require('nice-try') + +niceTry(() => JSON.parse('true')) // true +niceTry(() => JSON.parse('truee')) // undefined +niceTry() // undefined +niceTry(true) // undefined +``` + +## API + +### Parameters + +- `fn` `{Function}` Function that might or might not throw an error. + +### Returns + +- `{?*}` Return-value of the function when no error occurred. \ No newline at end of file diff --git a/deps/npm/node_modules/nice-try/package.json b/deps/npm/node_modules/nice-try/package.json new file mode 100644 index 00000000000000..787ce7a7a846e5 --- /dev/null +++ b/deps/npm/node_modules/nice-try/package.json @@ -0,0 +1,65 @@ +{ + "_args": [ + [ + "nice-try@1.0.5", + "/Users/mperrotte/npminc/cli" + ] + ], + "_development": true, + "_from": "nice-try@1.0.5", + "_id": "nice-try@1.0.5", + "_inBundle": false, + "_integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "_location": "/nice-try", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "nice-try@1.0.5", + "name": "nice-try", + "escapedName": "nice-try", + "rawSpec": "1.0.5", + "saveSpec": null, + "fetchSpec": "1.0.5" + }, + "_requiredBy": [ + "/nyc/cross-spawn" + ], + "_resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "_spec": "1.0.5", + "_where": "/Users/mperrotte/npminc/cli", + "authors": [ + "Tobias Reich " + ], + "bugs": { + "url": "https://github.com/electerious/nice-try/issues" + }, + "description": "Tries to execute a function and discards any error that occurs", + "devDependencies": { + "chai": "^4.1.2", + "coveralls": "^3.0.0", + "mocha": "^5.1.1", + "nyc": "^12.0.1" + }, + "files": [ + "src" + ], + "homepage": "https://github.com/electerious/nice-try", + "keywords": [ + "try", + "catch", + "error" + ], + "license": "MIT", + "main": "src/index.js", + "name": "nice-try", + "repository": { + "type": "git", + "url": "git+https://github.com/electerious/nice-try.git" + }, + "scripts": { + "coveralls": "nyc report --reporter=text-lcov | coveralls", + "test": "nyc node_modules/mocha/bin/_mocha" + }, + "version": "1.0.5" +} diff --git a/deps/npm/node_modules/nice-try/src/index.js b/deps/npm/node_modules/nice-try/src/index.js new file mode 100644 index 00000000000000..837506f2cc2db3 --- /dev/null +++ b/deps/npm/node_modules/nice-try/src/index.js @@ -0,0 +1,12 @@ +'use strict' + +/** + * Tries to execute a function and discards any error that occurs. + * @param {Function} fn - Function that might or might not throw an error. + * @returns {?*} Return-value of the function when no error occurred. + */ +module.exports = function(fn) { + + try { return fn() } catch (e) {} + +} \ No newline at end of file diff --git a/deps/npm/node_modules/node-gyp/.github/workflows/Python_tests.yml b/deps/npm/node_modules/node-gyp/.github/workflows/Python_tests.yml new file mode 100644 index 00000000000000..dba9d10933cbf9 --- /dev/null +++ b/deps/npm/node_modules/node-gyp/.github/workflows/Python_tests.yml @@ -0,0 +1,40 @@ +# TODO: Line 15, enable python-version: 3.5 +# TODO: Line 36, enable pytest --doctest-modules + +name: Python_tests +on: [push, pull_request] +jobs: + Python_tests: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + max-parallel: 15 + matrix: + os: [macos-latest, ubuntu-latest, windows-latest] + python-version: [2.7, 3.6, 3.7, 3.8] # 3.5, + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest # -r requirements.txt + - name: Lint with flake8 + if: matrix.os == 'ubuntu-latest' + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest (Linux and macOS) + if: matrix.os != 'windows-latest' + run: pytest + - name: Test with pytest (Windows) + if: matrix.os == 'windows-latest' + shell: bash + run: GYP_MSVS_VERSION=2015 GYP_MSVS_OVERRIDE_PATH="C:\\Dummy" pytest + # - name: Run doctests with pytest + # run: pytest --doctest-modules diff --git a/deps/npm/node_modules/node-gyp/.travis.yml b/deps/npm/node_modules/node-gyp/.travis.yml index cf0ea43fff2d6d..22f7bc12fc349c 100644 --- a/deps/npm/node_modules/node-gyp/.travis.yml +++ b/deps/npm/node_modules/node-gyp/.travis.yml @@ -1,44 +1,28 @@ dist: xenial language: python cache: pip -matrix: +addons: + homebrew: + update: true + packages: + - npm + - pyenv +jobs: include: - name: "Python 2.7 on Linux" env: NODE_GYP_FORCE_PYTHON=python2 python: 2.7 - - name: "Python 2.7 on macOS" - os: osx - osx_image: xcode11 - language: shell # 'language: python' is not yet supported on macOS - env: NODE_GYP_FORCE_PYTHON=python2 - before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm - - name: "Node.js 6 & Python 2.7 on Windows" - os: windows - language: node_js - node_js: 6 # node - env: >- - PATH=/c/Python27:/c/Python27/Scripts:$PATH - NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe - before_install: choco install python2 - - name: "Node.js 12 & Python 2.7 on Windows" - os: windows - language: node_js - node_js: 12 # node - env: >- - PATH=/c/Python27:/c/Python27/Scripts:$PATH - NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe - before_install: choco install python2 - - name: "Node.js 6 & Python 3.7 on Linux" - python: 3.7 + - name: "Node.js 6 & Python 3.8 on Linux" + python: 3.8 env: NODE_GYP_FORCE_PYTHON=python3 before_install: nvm install 6 - - name: "Node.js 8 & Python 3.7 on Linux" - python: 3.7 + - name: "Node.js 8 & Python 3.8 on Linux" + python: 3.8 env: NODE_GYP_FORCE_PYTHON=python3 before_install: nvm install 8 - - name: "Node.js 10 & Python 3.7 on Linux" - python: 3.7 + - name: "Node.js 10 & Python 3.8 on Linux" + python: 3.8 env: NODE_GYP_FORCE_PYTHON=python3 before_install: nvm install 10 - name: "Node.js 12 & Python 3.5 on Linux" @@ -53,12 +37,41 @@ matrix: python: 3.7 env: NODE_GYP_FORCE_PYTHON=python3 before_install: nvm install 12 - - name: "Python 3.7 on macOS" + - name: "Node.js 12 & Python 3.8 on Linux" + python: 3.8 + env: NODE_GYP_FORCE_PYTHON=python3 + before_install: nvm install 12 + + - name: "Python 2.7 on macOS" os: osx - #osx_image: xcode11 + osx_image: xcode11.2 language: shell # 'language: python' is not yet supported on macOS - env: NODE_GYP_FORCE_PYTHON=python3 - before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm + env: NODE_GYP_FORCE_PYTHON=python2 PATH=$HOME/.pyenv/shims:$PATH PYENV_VERSION=2.7.17 + before_install: pyenv install $PYENV_VERSION + - name: "Python 3.8 on macOS" + os: osx + osx_image: xcode11.2 + language: shell # 'language: python' is not yet supported on macOS + env: NODE_GYP_FORCE_PYTHON=python3 PATH=$HOME/.pyenv/shims:$PATH PYENV_VERSION=3.8.0 + before_install: pyenv install $PYENV_VERSION + + - name: "Node.js 6 & Python 2.7 on Windows" + os: windows + language: node_js + node_js: 6 # node + env: >- + PATH=/c/Python27:/c/Python27/Scripts:$PATH + NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe + before_install: choco install python2 + - name: "Node.js 12 & Python 2.7 on Windows" + os: windows + language: node_js + node_js: 12 # node + env: >- + PATH=/c/Python27:/c/Python27/Scripts:$PATH + NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe + before_install: choco install python2 + - name: "Node.js 12 & Python 3.7 on Windows" os: windows language: node_js @@ -66,23 +79,30 @@ matrix: env: >- PATH=/c/Python37:/c/Python37/Scripts:$PATH NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe + before_install: choco install python --version=3.7.4 + - name: "Node.js 12 & Python 3.8 on Windows" + os: windows + language: node_js + node_js: 12 # node + env: >- + PATH=/c/Python38:/c/Python38/Scripts:$PATH + NODE_GYP_FORCE_PYTHON=/c/Python38/python.exe before_install: choco install python install: - #- pip install -r requirements.txt - - pip install flake8 # pytest # add another testing frameworks later + - python -m pip install --upgrade flake8 pytest==4.6.6 # pytest 5 no longer supports legacy Python before_script: - - flake8 --version + - python -m flake8 --version # stop the build if there are Python syntax errors or undefined names - - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + - python -m flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide - - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics + - python -m flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics - npm install - npm list script: - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})' - npm test - #- pytest --capture=sys # add other tests here + - GYP_MSVS_VERSION=2015 GYP_MSVS_OVERRIDE_PATH="C:\\Dummy" python -m pytest notifications: on_success: change on_failure: change # `always` will be the setting once code changes slow down diff --git a/deps/npm/node_modules/node-gyp/CHANGELOG.md b/deps/npm/node_modules/node-gyp/CHANGELOG.md index ecc51b360dd183..5dc6bb4d47069b 100644 --- a/deps/npm/node_modules/node-gyp/CHANGELOG.md +++ b/deps/npm/node_modules/node-gyp/CHANGELOG.md @@ -1,3 +1,48 @@ +v5.1.0 2020-02-05 +================= + +* [[`f37a8b40d0`](https://github.com/nodejs/node-gyp/commit/f37a8b40d0)] - **doc**: add GitHub Actions badge (#1994) (Rod Vagg) [#1994](https://github.com/nodejs/node-gyp/pull/1994) +* [[`cb3f6aae5e`](https://github.com/nodejs/node-gyp/commit/cb3f6aae5e)] - **doc**: update macOS\_Catalina.md (#1992) (James Home) [#1992](https://github.com/nodejs/node-gyp/pull/1992) +* [[`0607596a4c`](https://github.com/nodejs/node-gyp/commit/0607596a4c)] - **doc**: fix typo in README.md (#1985) (Suraneti Rodsuwan) [#1985](https://github.com/nodejs/node-gyp/pull/1985) +* [[`0d5a415a14`](https://github.com/nodejs/node-gyp/commit/0d5a415a14)] - **doc**: add travis badge (Rod Vagg) [#1971](https://github.com/nodejs/node-gyp/pull/1971) +* [[`103740cd95`](https://github.com/nodejs/node-gyp/commit/103740cd95)] - **gyp**: list(dict) so we can del dict(key) while iterating (Christian Clauss) [#2009](https://github.com/nodejs/node-gyp/pull/2009) +* [[`278dcddbdd`](https://github.com/nodejs/node-gyp/commit/278dcddbdd)] - **lib**: ignore VS instances that cause COMExceptions (Andrew Casey) [#2018](https://github.com/nodejs/node-gyp/pull/2018) +* [[`1694907bbf`](https://github.com/nodejs/node-gyp/commit/1694907bbf)] - **lib**: compatibility with semver ≥ 7 (`new` for semver.Range) (Xavier Guimard) [#2006](https://github.com/nodejs/node-gyp/pull/2006) +* [[`a3f1143514`](https://github.com/nodejs/node-gyp/commit/a3f1143514)] - **(SEMVER-MINOR)** **lib**: noproxy support, match proxy detection to `request` (Matias Lopez) [#1978](https://github.com/nodejs/node-gyp/pull/1978) +* [[`52365819c7`](https://github.com/nodejs/node-gyp/commit/52365819c7)] - **test**: remove old docker test harness (#1993) (Rod Vagg) [#1993](https://github.com/nodejs/node-gyp/pull/1993) +* [[`bc509c511d`](https://github.com/nodejs/node-gyp/commit/bc509c511d)] - **test**: add Windows to GitHub Actions testing (#1996) (Christian Clauss) [#1996](https://github.com/nodejs/node-gyp/pull/1996) +* [[`91ee26dd48`](https://github.com/nodejs/node-gyp/commit/91ee26dd48)] - **test**: fix typo in header download test (#2001) (Richard Lau) [#2001](https://github.com/nodejs/node-gyp/pull/2001) +* [[`0923f344c9`](https://github.com/nodejs/node-gyp/commit/0923f344c9)] - **test**: direct python invocation & simpler pyenv (Matias Lopez) [#1979](https://github.com/nodejs/node-gyp/pull/1979) +* [[`32c8744b34`](https://github.com/nodejs/node-gyp/commit/32c8744b34)] - **test**: fix macOS Travis on Python 2.7 & 3.7 (Christian Clauss) [#1979](https://github.com/nodejs/node-gyp/pull/1979) +* [[`fd4b1351e4`](https://github.com/nodejs/node-gyp/commit/fd4b1351e4)] - **test**: initial Github Actions with Ubuntu & macOS (Christian Clauss) [#1985](https://github.com/nodejs/node-gyp/pull/1985) + +v5.0.7 2019-12-16 +================= + +Republish of v5.0.6 with unnecessary tarball removed from pack file. + +v5.0.6 2019-12-16 +================= + +* [[`cdec00286f`](https://github.com/nodejs/node-gyp/commit/cdec00286f)] - **doc**: adjustments to the README.md for new users (Dan Pike) [#1919](https://github.com/nodejs/node-gyp/pull/1919) +* [[`b7c8233ef2`](https://github.com/nodejs/node-gyp/commit/b7c8233ef2)] - **test**: fix Python unittests (cclauss) [#1961](https://github.com/nodejs/node-gyp/pull/1961) +* [[`e12b00ab0a`](https://github.com/nodejs/node-gyp/commit/e12b00ab0a)] - **doc**: macOS Catalina add two commands (Christian Clauss) [#1962](https://github.com/nodejs/node-gyp/pull/1962) +* [[`70b9890c0d`](https://github.com/nodejs/node-gyp/commit/70b9890c0d)] - **test**: add header download test (Rod Vagg) [#1796](https://github.com/nodejs/node-gyp/pull/1796) +* [[`4029fa8629`](https://github.com/nodejs/node-gyp/commit/4029fa8629)] - **test**: configure proper devDir for invoking configure() (Rod Vagg) [#1796](https://github.com/nodejs/node-gyp/pull/1796) +* [[`fe8b02cc8b`](https://github.com/nodejs/node-gyp/commit/fe8b02cc8b)] - **doc**: add macOS\_Catalina.md document (cclauss) [#1940](https://github.com/nodejs/node-gyp/pull/1940) +* [[`8ea47ce365`](https://github.com/nodejs/node-gyp/commit/8ea47ce365)] - **gyp**: python3 fixes: utf8 decode, use of 'None' in eval (Wilfried Goesgens) [#1925](https://github.com/nodejs/node-gyp/pull/1925) +* [[`c7229716ba`](https://github.com/nodejs/node-gyp/commit/c7229716ba)] - **gyp**: iteritems() -\> items() in compile\_commands\_json.py (cclauss) [#1947](https://github.com/nodejs/node-gyp/pull/1947) +* [[`2a18b2a0f8`](https://github.com/nodejs/node-gyp/commit/2a18b2a0f8)] - **gyp**: make cmake python3 compatible (gengjiawen) [#1944](https://github.com/nodejs/node-gyp/pull/1944) +* [[`70f391e844`](https://github.com/nodejs/node-gyp/commit/70f391e844)] - **gyp**: fix TypeError in XcodeVersion() (Christian Clauss) [#1939](https://github.com/nodejs/node-gyp/pull/1939) +* [[`9f4f0fa34e`](https://github.com/nodejs/node-gyp/commit/9f4f0fa34e)] - **gyp**: finish decode stdout on Python 3 (Christian Clauss) [#1937](https://github.com/nodejs/node-gyp/pull/1937) +* [[`7cf507906d`](https://github.com/nodejs/node-gyp/commit/7cf507906d)] - **src,win**: allow 403 errors for arm64 node.lib (Richard Lau) [#1934](https://github.com/nodejs/node-gyp/pull/1934) +* [[`ad0d182c01`](https://github.com/nodejs/node-gyp/commit/ad0d182c01)] - **deps**: update deps to roughly match current npm@6 (Rod Vagg) [#1920](https://github.com/nodejs/node-gyp/pull/1920) +* [[`1553081ed6`](https://github.com/nodejs/node-gyp/commit/1553081ed6)] - **test**: upgrade Linux Travis CI to Python 3.8 (Christian Clauss) [#1923](https://github.com/nodejs/node-gyp/pull/1923) +* [[`0705cae9aa`](https://github.com/nodejs/node-gyp/commit/0705cae9aa)] - **travis**: ignore failed `brew upgrade npm`, update xcode (Christian Clauss) [#1932](https://github.com/nodejs/node-gyp/pull/1932) +* [[`7bfdb6f5bf`](https://github.com/nodejs/node-gyp/commit/7bfdb6f5bf)] - **build**: avoid bare exceptions in xcode\_emulation.py (Christian Clauss) [#1932](https://github.com/nodejs/node-gyp/pull/1932) +* [[`7edf7658fa`](https://github.com/nodejs/node-gyp/commit/7edf7658fa)] - **lib,install**: always download SHA sums on Windows (Sam Hughes) [#1926](https://github.com/nodejs/node-gyp/pull/1926) +* [[`69056d04fe`](https://github.com/nodejs/node-gyp/commit/69056d04fe)] - **travis**: add Windows + Python 3.8 to the mix (Rod Vagg) [#1921](https://github.com/nodejs/node-gyp/pull/1921) + v5.0.5 2019-10-04 ================= diff --git a/deps/npm/node_modules/node-gyp/CONTRIBUTING.md b/deps/npm/node_modules/node-gyp/CONTRIBUTING.md deleted file mode 100644 index f48786bd84af31..00000000000000 --- a/deps/npm/node_modules/node-gyp/CONTRIBUTING.md +++ /dev/null @@ -1,34 +0,0 @@ -# Contributing to node-gyp - -## Code of Conduct - -Please read the -[Code of Conduct](https://github.com/nodejs/TSC/blob/master/CODE_OF_CONDUCT.md) -which explains the minimum behavior expectations for node-gyp contributors. - - -## Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. diff --git a/deps/npm/node_modules/node-gyp/README.md b/deps/npm/node_modules/node-gyp/README.md index d3930a253d4d1c..79abf4ba71fe3d 100644 --- a/deps/npm/node_modules/node-gyp/README.md +++ b/deps/npm/node_modules/node-gyp/README.md @@ -1,10 +1,12 @@ # `node-gyp` - Node.js native addon build tool +[![Travis CI](https://travis-ci.com/nodejs/node-gyp.svg?branch=master)](https://travis-ci.com/nodejs/node-gyp) +[![Build Status](https://github.com/nodejs/node-gyp/workflows/Python_tests/badge.svg)](https://github.com/nodejs/node-gyp/actions?workflow=Python_tests) + `node-gyp` is a cross-platform command-line tool written in Node.js for compiling native addon modules for Node.js. It contains a fork of the [gyp](https://gyp.gsrc.io) project that was previously used by the Chromium -team and takes away the pain of dealing with the various differences in build -platforms. +team, extended to support the development of Node.js native addons. Note that `node-gyp` is _not_ used to build Node.js itself. @@ -14,23 +16,18 @@ etc.), regardless of what version of Node.js is actually installed on your syste ## Features - * Easy to use, consistent interface - * Same commands to build your module on every platform - * Supports multiple target versions of Node.js + * The same build commands work on any of the supported platforms + * Supports the targeting of different versions of Node.js ## Installation -You can install with `npm`: +You can install `node-gyp` using `npm`: ``` bash $ npm install -g node-gyp ``` -You will also need to install: - -NOTE: node-gyp is compatible with Python v2.7, v3.5, v3.6, or v3.7. If the -Python to use is not explicitly configured (see "Configuring Python Dependency" -below) it will attempt to find a compatible Python executable. +Depending on your operating system, you will need to install: ### On Unix @@ -43,6 +40,7 @@ below) it will attempt to find a compatible Python executable. * Python v2.7, v3.5, v3.6, or v3.7 * [Xcode](https://developer.apple.com/xcode/download/) * You also need to install the `XCode Command Line Tools` by running `xcode-select --install`. Alternatively, if you already have the full Xcode installed, you can find them under the menu `Xcode -> Open Developer Tool -> More Developer Tools...`. This step will install `clang`, `clang++`, and `make`. + * If your Mac has been _upgraded_ to macOS Catalina (10.15), please read [macOS_Catalina.md](macOS_Catalina.md). ### On Windows @@ -66,14 +64,17 @@ Install tools and configuration manually: ### Configuring Python Dependency -If you have multiple Python versions installed, you can identify which Python -version `node-gyp` uses by setting the `--python` variable: +`node-gyp` requires that you have installed a compatible version of Python, one of: v2.7, v3.5, v3.6, +or v3.7. If you have multiple Python versions installed, you can identify which Python +version `node-gyp` should use in one of the following ways: + +1. by setting the `--python` command-line option, e.g.: ``` bash $ node-gyp --python /path/to/executable/python ``` -If `node-gyp` is called by way of `npm`, *and* you have multiple versions of +2. If `node-gyp` is called by way of `npm`, *and* you have multiple versions of Python installed, then you can set `npm`'s 'python' config key to the appropriate value: @@ -81,12 +82,12 @@ value: $ npm config set python /path/to/executable/python ``` -If the `PYTHON` environment variable is set to the path of a Python executable, -it will be used if it is a compatible Python. +3. If the `PYTHON` environment variable is set to the path of a Python executable, +then that version will be used, if it is a compatible version. -If the `NODE_GYP_FORCE_PYTHON` environment variable is set to the path of a +4. If the `NODE_GYP_FORCE_PYTHON` environment variable is set to the path of a Python executable, it will be used instead of any of the other configured or -builtin Python search paths. If its not a compatible Python, no further +builtin Python search paths. If it's not a compatible version, no further searching will be done. ## How to Use @@ -146,7 +147,9 @@ A barebones `gyp` file appropriate for building a Node.js addon could look like: } ``` -Some additional resources for addons and writing `gyp` files: +## Further reading + +Some additional resources for Node.js native addons and writing `gyp` configuration files: * ["Going Native" a nodeschool.io tutorial](http://nodeschool.io/#goingnative) * ["Hello World" node addon example](https://github.com/nodejs/node/tree/master/test/addons/hello-world) @@ -154,7 +157,6 @@ Some additional resources for addons and writing `gyp` files: * [gyp input format reference](https://gyp.gsrc.io/docs/InputFormatReference.md) * [*"binding.gyp" files out in the wild* wiki page](https://github.com/nodejs/node-gyp/wiki/%22binding.gyp%22-files-out-in-the-wild) - ## Commands `node-gyp` responds to the following commands: @@ -192,7 +194,8 @@ Some additional resources for addons and writing `gyp` files: | `--devdir=$path` | SDK download directory (default is OS cache directory) | `--ensure` | Don't reinstall headers if already present | `--dist-url=$url` | Download header tarball from custom URL -| `--proxy=$url` | Set HTTP proxy for downloading header tarball +| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball +| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball | `--cafile=$cafile` | Override default CA chain (to download tarball) | `--nodedir=$path` | Set the path to the node source code | `--python=$path` | Set path to the Python binary diff --git a/deps/npm/node_modules/node-gyp/gyp/gyp_main.py b/deps/npm/node_modules/node-gyp/gyp/gyp_main.py index aece53c8eb3b05..f738e8009f71e7 100755 --- a/deps/npm/node_modules/node-gyp/gyp/gyp_main.py +++ b/deps/npm/node_modules/node-gyp/gyp/gyp_main.py @@ -31,7 +31,7 @@ def UnixifyPath(path): out = subprocess.Popen(["cygpath", "-u", path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - stdout, stderr = out.communicate() + stdout, _ = out.communicate() if PY3: stdout = stdout.decode("utf-8") return str(stdout) diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py index c082bbea9b41da..ce71c38a9b94fa 100755 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py @@ -1085,6 +1085,7 @@ def testConvertToMSBuildSettings_full_synthetic(self): 'GenerateManifest': 'true', 'IgnoreImportLibrary': 'true', 'LinkIncremental': 'false'}} + self.maxDiff = 9999 # on failure display a long diff actual_msbuild_settings = MSVSSettings.ConvertToMSBuildSettings( msvs_settings, self.stderr) @@ -1476,6 +1477,7 @@ def testConvertToMSBuildSettings_actual(self): 'ResourceOutputFileName': '$(IntDir)$(TargetFileName).embed.manifest.resfdsf'} } + self.maxDiff = 9999 # on failure display a long diff actual_msbuild_settings = MSVSSettings.ConvertToMSBuildSettings( msvs_settings, self.stderr) diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py index 13d9777f0e1acc..c7cf68d3a1ba90 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py @@ -12,6 +12,8 @@ import gyp import glob +PY3 = bytes != str + class VisualStudioVersion(object): """Information regarding a version of Visual Studio.""" @@ -132,6 +134,8 @@ def _RegistryQueryBase(sysdir, key, value): # Obtain the stdout from reg.exe, reading to the end so p.returncode is valid # Note that the error text may be in [1] in some cases text = p.communicate()[0] + if PY3: + text = text.decode('utf-8') # Check return code from reg.exe; officially 0==success and 1==error if p.returncode: return None @@ -334,6 +338,8 @@ def _ConvertToCygpath(path): if sys.platform == 'cygwin': p = subprocess.Popen(['cygpath', path], stdout=subprocess.PIPE) path = p.communicate()[0].strip() + if PY3: + path = path.decode('utf-8') return path diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common.py index 071ad7e242c2e2..d866e81d40b0a4 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common.py @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import collections import errno import filecmp import os.path @@ -11,6 +10,11 @@ import sys import subprocess +try: + from collections.abc import MutableSet +except ImportError: + from collections import MutableSet + PY3 = bytes != str @@ -496,7 +500,7 @@ def uniquer(seq, idfun=None): # Based on http://code.activestate.com/recipes/576694/. -class OrderedSet(collections.MutableSet): +class OrderedSet(MutableSet): def __init__(self, iterable=None): self.end = end = [] end += [None, end, end] # sentinel node for doubly linked list diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py index 996b6f25fdb014..5601a6657e3d03 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/cmake.py @@ -239,7 +239,10 @@ def StringToCMakeTargetName(a): Invalid for make: ':' Invalid for unknown reasons but cause failures: '.' """ - return a.translate(string.maketrans(' /():."', '_______')) + try: + return a.translate(str.maketrans(' /():."', '_______')) + except AttributeError: + return a.translate(string.maketrans(' /():."', '_______')) def WriteActions(target_name, actions, extra_sources, extra_deps, diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/compile_commands_json.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/compile_commands_json.py index 575db63c4e1943..1b8490451f9793 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/compile_commands_json.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/compile_commands_json.py @@ -43,7 +43,7 @@ def CalculateVariables(default_variables, params): def AddCommandsForTarget(cwd, target, params, per_config_commands): output_dir = params['generator_flags']['output_dir'] - for configuration_name, configuration in target['configurations'].iteritems(): + for configuration_name, configuration in target['configurations'].items(): builddir_name = os.path.join(output_dir, configuration_name) if IsMac(params): @@ -92,7 +92,7 @@ def resolve(filename): def GenerateOutput(target_list, target_dicts, data, params): per_config_commands = {} - for qualified_target, target in target_dicts.iteritems(): + for qualified_target, target in target_dicts.items(): build_file, target_name, toolset = ( gyp.common.ParseQualifiedTarget(qualified_target)) if IsMac(params): @@ -102,7 +102,7 @@ def GenerateOutput(target_list, target_dicts, data, params): AddCommandsForTarget(cwd, target, params, per_config_commands) output_dir = params['generator_flags']['output_dir'] - for configuration_name, commands in per_config_commands.iteritems(): + for configuration_name, commands in per_config_commands.items(): filename = os.path.join(output_dir, configuration_name, 'compile_commands.json') diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py index 6b49ad6760051e..91f187d685ad51 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py @@ -26,6 +26,8 @@ import shlex import xml.etree.cElementTree as ET +PY3 = bytes != str + generator_wants_static_library_dependencies_adjusted = False generator_default_variables = { @@ -97,6 +99,8 @@ def GetAllIncludeDirectories(target_list, target_dicts, proc = subprocess.Popen(args=command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) output = proc.communicate()[1] + if PY3: + output = output.decode('utf-8') # Extract the list of include dirs from the output, which has this format: # ... # #include "..." search starts here: @@ -234,6 +238,8 @@ def GetAllDefines(target_list, target_dicts, data, config_name, params, cpp_proc = subprocess.Popen(args=command, cwd='.', stdin=subprocess.PIPE, stdout=subprocess.PIPE) cpp_output = cpp_proc.communicate()[0] + if PY3: + cpp_output = cpp_output.decode('utf-8') cpp_lines = cpp_output.split('\n') for cpp_line in cpp_lines: if not cpp_line.strip(): diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py index bdf7134537022f..196053679492f2 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py @@ -1776,7 +1776,7 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None, # - The multi-output rule will have an do-nothing recipe. # Hash the target name to avoid generating overlong filenames. - cmddigest = hashlib.sha1(command if command else self.target).hexdigest() + cmddigest = hashlib.sha1((command or self.target).encode('utf-8')).hexdigest() intermediate = "%s.intermediate" % cmddigest self.WriteLn('%s: %s' % (' '.join(outputs), intermediate)) self.WriteLn('\t%s' % '@:') diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py index b3b4bc105366eb..8dbe0dc05b86b6 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py @@ -12,6 +12,8 @@ import subprocess import sys +from collections import OrderedDict + import gyp.common import gyp.easy_xml as easy_xml import gyp.generator.ninja as ninja_generator @@ -25,15 +27,7 @@ from gyp.common import GypError from gyp.common import OrderedSet -# TODO: Remove once bots are on 2.7, http://crbug.com/241769 -def _import_OrderedDict(): - import collections - try: - return collections.OrderedDict - except AttributeError: - import gyp.ordered_dict - return gyp.ordered_dict.OrderedDict -OrderedDict = _import_OrderedDict() +PY3 = bytes != str # Regular expression for validating Visual Studio GUIDs. If the GUID @@ -124,6 +118,8 @@ def _GetDomainAndUserName(): call = subprocess.Popen(['net', 'config', 'Workstation'], stdout=subprocess.PIPE) config = call.communicate()[0] + if PY3: + config = config.decode('utf-8') username_re = re.compile(r'^User name\s+(\S+)', re.MULTILINE) username_match = username_re.search(config) if username_match: @@ -175,7 +171,7 @@ def _FixPath(path): def _IsWindowsAbsPath(path): - """ + r""" On Cygwin systems Python needs a little help determining if a path is an absolute Windows path or not, so that it does not treat those as relative, which results in bad paths like: diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py index 1ad68e4fc9f072..5ecfbdf004d211 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py @@ -9,7 +9,6 @@ import gyp.generator.ninja as ninja import unittest import sys -import TestCommon class TestPrefixesAndSuffixes(unittest.TestCase): diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py index aba81cf6542e01..d1742800ac507e 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py @@ -22,6 +22,7 @@ from gyp.common import GypError from gyp.common import OrderedSet +PY3 = bytes != str # A list of types that are treated as linkable. linkable_types = [ @@ -239,7 +240,7 @@ def LoadOneBuildFile(build_file_path, data, aux_data, includes, if check: build_file_data = CheckedEval(build_file_contents) else: - build_file_data = eval(build_file_contents, {'__builtins__': None}, + build_file_data = eval(build_file_contents, {'__builtins__': {}}, None) except SyntaxError as e: e.filename = build_file_path @@ -909,6 +910,9 @@ def ExpandVariables(input, phase, variables, build_file): (e, contents, build_file)) p_stdout, p_stderr = p.communicate('') + if PY3: + p_stdout = p_stdout.decode('utf-8') + p_stderr = p_stderr.decode('utf-8') if p.wait() != 0 or p_stderr: sys.stderr.write(p_stderr) @@ -1090,7 +1094,7 @@ def EvalSingleCondition( else: ast_code = compile(cond_expr_expanded, '', 'eval') cached_conditions_asts[cond_expr_expanded] = ast_code - if eval(ast_code, {'__builtins__': None}, variables): + if eval(ast_code, {'__builtins__': {}}, variables): return true_dict return false_dict except SyntaxError as e: @@ -2282,7 +2286,7 @@ def SetUpConfigurations(target, target_dict): merged_configurations[configuration]) # Now drop all the abstract ones. - for configuration in target_dict['configurations'].keys(): + for configuration in list(target_dict['configurations']): old_configuration_dict = target_dict['configurations'][configuration] if old_configuration_dict.get('abstract'): del target_dict['configurations'][configuration] diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py index b8b7344eff85bf..222befb982a9d4 100755 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py @@ -23,6 +23,8 @@ import sys import tempfile +PY3 = bytes != str + def main(args): executor = MacTool() @@ -243,6 +245,8 @@ def ExecFilterLibtool(self, *cmd_list): env['ZERO_AR_DATE'] = '1' libtoolout = subprocess.Popen(cmd_list, stderr=subprocess.PIPE, env=env) _, err = libtoolout.communicate() + if PY3: + err = err.decode('utf-8') for line in err.splitlines(): if not libtool_re.match(line) and not libtool_re5.match(line): print(line, file=sys.stderr) diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py index 9d50bad1f558c7..9f1f547b907751 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py @@ -16,6 +16,7 @@ import gyp.MSVSUtil import gyp.MSVSVersion +PY3 = bytes != str windows_quoter_regex = re.compile(r'(\\*)"') @@ -126,7 +127,10 @@ def _FindDirectXInstallation(): # Setup params to pass to and attempt to launch reg.exe. cmd = ['reg.exe', 'query', r'HKLM\Software\Microsoft\DirectX', '/s'] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - for line in p.communicate()[0].splitlines(): + stdout = p.communicate()[0] + if PY3: + stdout = stdout.decode('utf-8') + for line in stdout.splitlines(): if 'InstallPath' in line: dxsdk_dir = line.split(' ')[3] + "\\" @@ -1038,6 +1042,8 @@ def GenerateEnvironmentFiles(toplevel_build_dir, generator_flags, popen = subprocess.Popen( args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) variables, _ = popen.communicate() + if PY3: + variables = variables.decode('utf-8') env = _ExtractImportantEnvironment(variables) # Inject system includes from gyp files into INCLUDE. @@ -1057,6 +1063,8 @@ def GenerateEnvironmentFiles(toplevel_build_dir, generator_flags, 'for', '%i', 'in', '(cl.exe)', 'do', '@echo', 'LOC:%~$PATH:i')) popen = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE) output, _ = popen.communicate() + if PY3: + output = output.decode('utf-8') cl_paths[arch] = _ExtractCLPath(output) return cl_paths diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/ordered_dict.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/ordered_dict.py deleted file mode 100644 index 6fe9c1f6c7c22b..00000000000000 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/ordered_dict.py +++ /dev/null @@ -1,289 +0,0 @@ -# Unmodified from http://code.activestate.com/recipes/576693/ -# other than to add MIT license header (as specified on page, but not in code). -# Linked from Python documentation here: -# http://docs.python.org/2/library/collections.html#collections.OrderedDict -# -# This should be deleted once Py2.7 is available on all bots, see -# http://crbug.com/241769. -# -# Copyright (c) 2009 Raymond Hettinger. -# -# 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. - -# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy. -# Passes Python2.7's test suite and incorporates all the latest updates. - -try: - from thread import get_ident as _get_ident -except ImportError: - from dummy_thread import get_ident as _get_ident - -try: - from _abcoll import KeysView, ValuesView, ItemsView -except ImportError: - pass - - -class OrderedDict(dict): - 'Dictionary that remembers insertion order' - # An inherited dict maps keys to values. - # The inherited dict provides __getitem__, __len__, __contains__, and get. - # The remaining methods are order-aware. - # Big-O running times for all methods are the same as for regular dictionaries. - - # The internal self.__map dictionary maps keys to links in a doubly linked list. - # The circular doubly linked list starts and ends with a sentinel element. - # The sentinel element never gets deleted (this simplifies the algorithm). - # Each link is stored as a list of length three: [PREV, NEXT, KEY]. - - def __init__(self, *args, **kwds): - '''Initialize an ordered dictionary. Signature is the same as for - regular dictionaries, but keyword arguments are not recommended - because their insertion order is arbitrary. - - ''' - if len(args) > 1: - raise TypeError('expected at most 1 arguments, got %d' % len(args)) - try: - self.__root - except AttributeError: - self.__root = root = [] # sentinel node - root[:] = [root, root, None] - self.__map = {} - self.__update(*args, **kwds) - - def __setitem__(self, key, value, dict_setitem=dict.__setitem__): - 'od.__setitem__(i, y) <==> od[i]=y' - # Setting a new item creates a new link which goes at the end of the linked - # list, and the inherited dictionary is updated with the new key/value pair. - if key not in self: - root = self.__root - last = root[0] - last[1] = root[0] = self.__map[key] = [last, root, key] - dict_setitem(self, key, value) - - def __delitem__(self, key, dict_delitem=dict.__delitem__): - 'od.__delitem__(y) <==> del od[y]' - # Deleting an existing item uses self.__map to find the link which is - # then removed by updating the links in the predecessor and successor nodes. - dict_delitem(self, key) - link_prev, link_next, key = self.__map.pop(key) - link_prev[1] = link_next - link_next[0] = link_prev - - def __iter__(self): - 'od.__iter__() <==> iter(od)' - root = self.__root - curr = root[1] - while curr is not root: - yield curr[2] - curr = curr[1] - - def __reversed__(self): - 'od.__reversed__() <==> reversed(od)' - root = self.__root - curr = root[0] - while curr is not root: - yield curr[2] - curr = curr[0] - - def clear(self): - 'od.clear() -> None. Remove all items from od.' - try: - for node in self.__map.itervalues(): - del node[:] - root = self.__root - root[:] = [root, root, None] - self.__map.clear() - except AttributeError: - pass - dict.clear(self) - - def popitem(self, last=True): - '''od.popitem() -> (k, v), return and remove a (key, value) pair. - Pairs are returned in LIFO order if last is true or FIFO order if false. - - ''' - if not self: - raise KeyError('dictionary is empty') - root = self.__root - if last: - link = root[0] - link_prev = link[0] - link_prev[1] = root - root[0] = link_prev - else: - link = root[1] - link_next = link[1] - root[1] = link_next - link_next[0] = root - key = link[2] - del self.__map[key] - value = dict.pop(self, key) - return key, value - - # -- the following methods do not depend on the internal structure -- - - def keys(self): - 'od.keys() -> list of keys in od' - return list(self) - - def values(self): - 'od.values() -> list of values in od' - return [self[key] for key in self] - - def items(self): - 'od.items() -> list of (key, value) pairs in od' - return [(key, self[key]) for key in self] - - def iterkeys(self): - 'od.iterkeys() -> an iterator over the keys in od' - return iter(self) - - def itervalues(self): - 'od.itervalues -> an iterator over the values in od' - for k in self: - yield self[k] - - def items(self): - 'od.items -> an iterator over the (key, value) items in od' - for k in self: - yield (k, self[k]) - - # Suppress 'OrderedDict.update: Method has no argument': - # pylint: disable=E0211 - def update(*args, **kwds): - '''od.update(E, **F) -> None. Update od from dict/iterable E and F. - - If E is a dict instance, does: for k in E: od[k] = E[k] - If E has a .keys() method, does: for k in E.keys(): od[k] = E[k] - Or if E is an iterable of items, does: for k, v in E: od[k] = v - In either case, this is followed by: for k, v in F.items(): od[k] = v - - ''' - if len(args) > 2: - raise TypeError('update() takes at most 2 positional ' - 'arguments (%d given)' % (len(args),)) - elif not args: - raise TypeError('update() takes at least 1 argument (0 given)') - self = args[0] - # Make progressively weaker assumptions about "other" - other = () - if len(args) == 2: - other = args[1] - if isinstance(other, dict): - for key in other: - self[key] = other[key] - elif hasattr(other, 'keys'): - for key in other.keys(): - self[key] = other[key] - else: - for key, value in other: - self[key] = value - for key, value in kwds.items(): - self[key] = value - - __update = update # let subclasses override update without breaking __init__ - - __marker = object() - - def pop(self, key, default=__marker): - '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value. - If key is not found, d is returned if given, otherwise KeyError is raised. - - ''' - if key in self: - result = self[key] - del self[key] - return result - if default is self.__marker: - raise KeyError(key) - return default - - def setdefault(self, key, default=None): - 'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od' - if key in self: - return self[key] - self[key] = default - return default - - def __repr__(self, _repr_running={}): - 'od.__repr__() <==> repr(od)' - call_key = id(self), _get_ident() - if call_key in _repr_running: - return '...' - _repr_running[call_key] = 1 - try: - if not self: - return '%s()' % (self.__class__.__name__,) - return '%s(%r)' % (self.__class__.__name__, self.items()) - finally: - del _repr_running[call_key] - - def __reduce__(self): - 'Return state information for pickling' - items = [[k, self[k]] for k in self] - inst_dict = vars(self).copy() - for k in vars(OrderedDict()): - inst_dict.pop(k, None) - if inst_dict: - return (self.__class__, (items,), inst_dict) - return self.__class__, (items,) - - def copy(self): - 'od.copy() -> a shallow copy of od' - return self.__class__(self) - - @classmethod - def fromkeys(cls, iterable, value=None): - '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S - and values equal to v (which defaults to None). - - ''' - d = cls() - for key in iterable: - d[key] = value - return d - - def __eq__(self, other): - '''od.__eq__(y) <==> od==y. Comparison to another OD is order-sensitive - while comparison to a regular mapping is order-insensitive. - - ''' - if isinstance(other, OrderedDict): - return len(self)==len(other) and self.items() == other.items() - return dict.__eq__(self, other) - - def __ne__(self, other): - return not self == other - - # -- the following methods are only used in Python 2.7 -- - - def viewkeys(self): - "od.viewkeys() -> a set-like object providing a view on od's keys" - return KeysView(self) - - def viewvalues(self): - "od.viewvalues() -> an object providing a view on od's values" - return ValuesView(self) - - def viewitems(self): - "od.viewitems() -> a set-like object providing a view on od's items" - return ItemsView(self) - diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py index bca0b9e346a5ba..0a6daf203931e6 100755 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py @@ -20,6 +20,7 @@ import sys BASE_DIR = os.path.dirname(os.path.abspath(__file__)) +PY3 = bytes != str # A regex matching an argument corresponding to the output filename passed to # link.exe. @@ -124,6 +125,8 @@ def ExecLinkWrapper(self, arch, use_separate_mspdbsrv, *args): stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = link.communicate() + if PY3: + out = out.decode('utf-8') for line in out.splitlines(): if (not line.startswith(' Creating library ') and not line.startswith('Generating code') and @@ -215,6 +218,8 @@ def ExecManifestWrapper(self, arch, *args): popen = subprocess.Popen(args, shell=True, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = popen.communicate() + if PY3: + out = out.decode('utf-8') for line in out.splitlines(): if line and 'manifest authoring warning 81010002' not in line: print(line) @@ -247,6 +252,8 @@ def ExecMidlWrapper(self, arch, outdir, tlb, h, dlldata, iid, proxy, idl, popen = subprocess.Popen(args, shell=True, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = popen.communicate() + if PY3: + out = out.decode('utf-8') # Filter junk out of stdout, and write filtered versions. Output we want # to filter is pairs of lines that look like this: # Processing C:\Program Files (x86)\Microsoft SDKs\...\include\objidl.idl @@ -266,6 +273,8 @@ def ExecAsmWrapper(self, arch, *args): popen = subprocess.Popen(args, shell=True, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = popen.communicate() + if PY3: + out = out.decode('utf-8') for line in out.splitlines(): if (not line.startswith('Copyright (C) Microsoft Corporation') and not line.startswith('Microsoft (R) Macro Assembler') and @@ -281,6 +290,8 @@ def ExecRcWrapper(self, arch, *args): popen = subprocess.Popen(args, shell=True, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = popen.communicate() + if PY3: + out = out.decode('utf-8') for line in out.splitlines(): if (not line.startswith('Microsoft (R) Windows (R) Resource Compiler') and not line.startswith('Copyright (C) Microsoft Corporation') and diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py index 74735c033a90b1..60171649900aae 100644 --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py @@ -437,7 +437,7 @@ def _GetSdkVersionInfoItem(self, sdk, infoitem): # most sensible route and should still do the right thing. try: return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem]) - except: + except GypError: pass def _SdkRoot(self, configname): @@ -855,7 +855,8 @@ def GetLdflags(self, configname, product_dir, gyp_to_build_path, arch=None): # These flags reflect the compilation options used by xcode to compile # extensions. ldflags.append('-lpkstart') - if XcodeVersion() < '0900': + xcode_version, _ = XcodeVersion() + if xcode_version < '0900': ldflags.append(sdk_root + '/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit') ldflags.append('-fapplication-extension') @@ -1088,15 +1089,15 @@ def GetExtraPlistItems(self, configname=None): cache = {} cache['BuildMachineOSBuild'] = self._BuildMachineOSBuild() - xcode, xcode_build = XcodeVersion() - cache['DTXcode'] = xcode + xcode_version, xcode_build = XcodeVersion() + cache['DTXcode'] = xcode_version cache['DTXcodeBuild'] = xcode_build sdk_root = self._SdkRoot(configname) if not sdk_root: sdk_root = self._DefaultSdkRoot() cache['DTSDKName'] = sdk_root - if xcode >= '0430': + if xcode_version >= '0430': cache['DTSDKBuild'] = self._GetSdkVersionInfoItem( sdk_root, 'ProductBuildVersion') else: @@ -1126,7 +1127,7 @@ def _DefaultSdkRoot(self): project, then the environment variable was empty. Starting with this version, Xcode uses the name of the newest SDK installed. """ - xcode_version, xcode_build = XcodeVersion() + xcode_version, _ = XcodeVersion() if xcode_version < '0500': return '' default_sdk_path = self._XcodeSdkPath('') @@ -1135,7 +1136,7 @@ def _DefaultSdkRoot(self): return default_sdk_root try: all_sdks = GetStdout(['xcodebuild', '-showsdks']) - except: + except GypError: # If xcodebuild fails, there will be no valid SDKs return '' for line in all_sdks.splitlines(): @@ -1263,10 +1264,12 @@ def XcodeVersion(): # Xcode 3.2.6 # Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0 # BuildVersion: 10M2518 - # Convert that to '0463', '4H1503'. + # Convert that to ('0463', '4H1503') or ('0326', '10M2518'). global XCODE_VERSION_CACHE if XCODE_VERSION_CACHE: return XCODE_VERSION_CACHE + version = "" + build = "" try: version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines() # In some circumstances xcodebuild exits 0 but doesn't return @@ -1276,21 +1279,16 @@ def XcodeVersion(): # checking that version. if len(version_list) < 2: raise GypError("xcodebuild returned unexpected results") - except: - version = CLTVersion() - if version: - version = ".".join(version.split(".")[:3]) - else: + version = version_list[0].split()[-1] # Last word on first line + build = version_list[-1].split()[-1] # Last word on last line + except GypError: # Xcode not installed so look for XCode Command Line Tools + version = CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322 + if not version: raise GypError("No Xcode or CLT version detected!") - # The CLT has no build information, so we return an empty string. - version_list = [version, ''] - version = version_list[0] - build = version_list[-1] - # Be careful to convert "4.2" to "0420" and "10.0" to "1000": - version = format(''.join((version.split()[-1].split('.') + ['0', '0'])[:3]), - '>04s') - if build: - build = build.split()[-1] + # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100": + version = version.split(".")[:3] # Just major, minor, micro + version[0] = version[0].zfill(2) # Add a leading zero if major is one digit + version = ("".join(version) + "00")[:4] # Limit to exactly four characters XCODE_VERSION_CACHE = (version, build) return XCODE_VERSION_CACHE @@ -1314,7 +1312,7 @@ def CLTVersion(): try: output = GetStdout(['/usr/sbin/pkgutil', '--pkg-info', key]) return re.search(regex, output).groupdict()['version'] - except: + except GypError: continue @@ -1524,7 +1522,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration, install_name_base = xcode_settings.GetInstallNameBase() if install_name_base: env['DYLIB_INSTALL_NAME_BASE'] = install_name_base - if XcodeVersion() >= '0500' and not env.get('SDKROOT'): + xcode_version, _ = XcodeVersion() + if xcode_version >= '0500' and not env.get('SDKROOT'): sdk_root = xcode_settings._SdkRoot(configuration) if not sdk_root: sdk_root = xcode_settings._XcodeSdkPath('') diff --git a/deps/npm/node_modules/node-gyp/lib/Find-VisualStudio.cs b/deps/npm/node_modules/node-gyp/lib/Find-VisualStudio.cs index 0a533f42d6a4ff..d2e45a76275f53 100644 --- a/deps/npm/node_modules/node-gyp/lib/Find-VisualStudio.cs +++ b/deps/npm/node_modules/node-gyp/lib/Find-VisualStudio.cs @@ -205,7 +205,14 @@ public static void PrintJson() return; } - instances.Add(InstanceJson(rgelt[0])); + try + { + instances.Add(InstanceJson(rgelt[0])); + } + catch (COMException) + { + // Ignore instances that can't be queried. + } } } diff --git a/deps/npm/node_modules/node-gyp/lib/find-python.js b/deps/npm/node_modules/node-gyp/lib/find-python.js index e79bc50d5a1d54..fabc4630f15d44 100644 --- a/deps/npm/node_modules/node-gyp/lib/find-python.js +++ b/deps/npm/node_modules/node-gyp/lib/find-python.js @@ -226,7 +226,7 @@ PythonFinder.prototype = { } this.addLog(`- version is "${version}"`) - const range = semver.Range(this.semverRange) + const range = new semver.Range(this.semverRange) var valid = false try { valid = range.test(version) diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js index b8705328806661..c919c1058811ee 100644 --- a/deps/npm/node_modules/node-gyp/lib/install.js +++ b/deps/npm/node_modules/node-gyp/lib/install.js @@ -11,6 +11,7 @@ const request = require('request') const mkdir = require('mkdirp') const processRelease = require('./process-release') const win = process.platform === 'win32' +const getProxyFromURI = require('./proxy') function install (fs, gyp, argv, callback) { var release = processRelease(argv, gyp, process.version, process.release) @@ -224,8 +225,8 @@ function install (fs, gyp, argv, callback) { var installVersionPath = path.resolve(devDir, 'installVersion') fs.writeFile(installVersionPath, gyp.package.installVersion + '\n', deref) - // Only download SHASUMS.txt if not using tarPath override - if (!tarPath) { + // Only download SHASUMS.txt if we downloaded something in need of SHA verification + if (!tarPath || win) { // download SHASUMS.txt async++ downloadShasums(deref) @@ -323,7 +324,7 @@ function install (fs, gyp, argv, callback) { req.on('error', done) req.on('response', function (res) { - if (res.statusCode === 404) { + if (res.statusCode === 403 || res.statusCode === 404) { if (arch === 'arm64') { // Arm64 is a newer platform on Windows and not all node distributions provide it. log.verbose(`${name} was not found in ${libUrl}`) @@ -410,10 +411,7 @@ function download (gyp, env, url) { } // basic support for a proxy server - var proxyUrl = gyp.opts.proxy || - env.http_proxy || - env.HTTP_PROXY || - env.npm_config_proxy + var proxyUrl = getProxyFromURI(gyp, env, url) if (proxyUrl) { if (/^https?:\/\//i.test(proxyUrl)) { log.verbose('download', 'using proxy url: "%s"', proxyUrl) diff --git a/deps/npm/node_modules/node-gyp/lib/node-gyp.js b/deps/npm/node_modules/node-gyp/lib/node-gyp.js index 9d24103900f702..81fc590919ba8e 100644 --- a/deps/npm/node_modules/node-gyp/lib/node-gyp.js +++ b/deps/npm/node_modules/node-gyp/lib/node-gyp.js @@ -67,6 +67,7 @@ proto.configDefs = { ensure: Boolean, // 'install' solution: String, // 'build' (windows only) proxy: String, // 'install' + noproxy: String, // 'install' devdir: String, // everywhere nodedir: String, // 'configure' loglevel: String, // everywhere diff --git a/deps/npm/node_modules/node-gyp/lib/proxy.js b/deps/npm/node_modules/node-gyp/lib/proxy.js new file mode 100644 index 00000000000000..92d9ed2f7f0855 --- /dev/null +++ b/deps/npm/node_modules/node-gyp/lib/proxy.js @@ -0,0 +1,92 @@ +'use strict' +// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js + +const url = require('url') + +function formatHostname (hostname) { + // canonicalize the hostname, so that 'oogle.com' won't match 'google.com' + return hostname.replace(/^\.*/, '.').toLowerCase() +} + +function parseNoProxyZone (zone) { + zone = zone.trim().toLowerCase() + + var zoneParts = zone.split(':', 2) + var zoneHost = formatHostname(zoneParts[0]) + var zonePort = zoneParts[1] + var hasPort = zone.indexOf(':') > -1 + + return { hostname: zoneHost, port: zonePort, hasPort: hasPort } +} + +function uriInNoProxy (uri, noProxy) { + var port = uri.port || (uri.protocol === 'https:' ? '443' : '80') + var hostname = formatHostname(uri.hostname) + var noProxyList = noProxy.split(',') + + // iterate through the noProxyList until it finds a match. + return noProxyList.map(parseNoProxyZone).some(function (noProxyZone) { + var isMatchedAt = hostname.indexOf(noProxyZone.hostname) + var hostnameMatched = ( + isMatchedAt > -1 && + (isMatchedAt === hostname.length - noProxyZone.hostname.length) + ) + + if (noProxyZone.hasPort) { + return (port === noProxyZone.port) && hostnameMatched + } + + return hostnameMatched + }) +} + +function getProxyFromURI (gyp, env, uri) { + // If a string URI/URL was given, parse it into a URL object + if (typeof uri === 'string') { + // eslint-disable-next-line + uri = url.parse(uri) + } + + // Decide the proper request proxy to use based on the request URI object and the + // environmental variables (NO_PROXY, HTTP_PROXY, etc.) + // respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html) + + var noProxy = gyp.opts.noproxy || env.NO_PROXY || env.no_proxy || env.npm_config_noproxy || '' + + // if the noProxy is a wildcard then return null + + if (noProxy === '*') { + return null + } + + // if the noProxy is not empty and the uri is found return null + + if (noProxy !== '' && uriInNoProxy(uri, noProxy)) { + return null + } + + // Check for HTTP or HTTPS Proxy in environment Else default to null + + if (uri.protocol === 'http:') { + return gyp.opts.proxy || + env.HTTP_PROXY || + env.http_proxy || + env.npm_config_proxy || null + } + + if (uri.protocol === 'https:') { + return gyp.opts.proxy || + env.HTTPS_PROXY || + env.https_proxy || + env.HTTP_PROXY || + env.http_proxy || + env.npm_config_proxy || null + } + + // if none of that works, return null + // (What uri protocol are you using then?) + + return null +} + +module.exports = getProxyFromURI diff --git a/deps/npm/node_modules/node-gyp/macOS_Catalina.md b/deps/npm/node_modules/node-gyp/macOS_Catalina.md new file mode 100644 index 00000000000000..d948f76caa074d --- /dev/null +++ b/deps/npm/node_modules/node-gyp/macOS_Catalina.md @@ -0,0 +1,83 @@ +# Installation notes for macOS Catalina (v10.15) + +_This document specifically refers to upgrades from previous versions of macOS to Catalina (10.15). It should be removed from the source repository when Catalina ceases to be the latest macOS version or when future Catalina versions no longer raise these issues._ + +**Upgrading to macOS Catalina may cause normal `node-gyp` installations to fail.** + +### Is my Mac running macOS Catalina? +Let's first make sure that your Mac is running Catalina: +``` +% sw_vers + ProductName: Mac OS X + ProductVersion: 10.15 + BuildVersion: 19A602 +``` +If `ProductVersion` is less then `10.15` then this document is not for you. Normal install docs for `node-gyp` on macOS can be found at https://github.com/nodejs/node-gyp#on-macos + + +### The acid test +To see if `Xcode Command Line Tools` is installed in a way that will work with `node-gyp`, run: +1. `/usr/sbin/pkgutil --packages | grep CL` + * `com.apple.pkg.CLTools_Executables` should be listed. If it isn't, this test failed. +2. `/usr/sbin/pkgutil --pkg-info com.apple.pkg.CLTools_Executables` + * `version: 11.0.0` (or later) should be listed. If it isn't, this test failed. + +If both tests succeeded, _you are done_! You should be ready to install `node-gyp`. + +If either test failed, there is a problem with your Xcode Command Line Tools installation. [Continue to Solutions](#Solutions). + +### Solutions +There are three ways to install the Xcode libraries `node-gyp` needs on macOS. People running Catalina have had success with some but not others in a way that has been unpredictable. + +1. With the full Xcode (~7.6 GB download) from the `App Store` app. +2. With the _much_ smaller Xcode Command Line Tools via `xcode-select --install` +3. With the _much_ smaller Xcode Command Line Tools via manual download. **For people running the latest version of Catalina (10.15.2 at the time of this writing), this has worked when the other two solutions haven't.** + +### Installing `node-gyp` using the full Xcode +1. `xcodebuild -version` should show `Xcode 11.1` or later. + * If not, then install/upgrade Xcode from the App Store app. +2. Open the Xcode app and... + * Under __Preferences > Locations__ select the tools if their location is empty. + * Allow Xcode app to do an essential install of the most recent compiler tools. +3. Once all installations are _complete_, quit out of Xcode. +4. `sudo xcodebuild -license accept` # If you agree with the licensing terms. +5. `softwareupdate -l` # No listing is a good sign. + * If Xcode or Tools upgrades are listed, use "Software Upgrade" to install them. +6. `xcode-select -version` # Should return `xcode-select version 2370` or later. +7. `xcode-select -print-path` # Should return `/Applications/Xcode.app/Contents/Developer` +8. Try the [_acid test_ steps above](#The-acid-test) to see if your Mac is ready. +9. If the _acid test_ does _not_ pass then... +10. `sudo xcode-select --reset` # Enter root password. No output is normal. +11. Repeat step 7 above. Is the path different this time? Repeat the _acid test_. + +### Installing `node-gyp` using the Xcode Command Line Tools via `xcode-select --install` +1. If the _acid test_ has not succeeded, then try `xcode-select --install` +2. Wait until the install process is _complete_. +3. `softwareupdate -l` # No listing is a good sign. + * If Xcode or Tools upgrades are listed, use "Software Update" to install them. +4. `xcode-select -version` # Should return `xcode-select version 2370` or later. +5. `xcode-select -print-path` # Should return `/Library/Developer/CommandLineTools` +6. Try the [_acid test_ steps above](#The-acid-test) to see if your Mac is ready. +7. If the _acid test_ does _not_ pass then... +8. `sudo xcode-select --reset` # Enter root password. No output is normal. +9. Repeat step 5 above. Is the path different this time? Repeat the _acid test_. + +### Installing `node-gyp` using the Xcode Command Line Tools via manual download +1. Download the appropriate version of the "Command Line Tools for Xcode" for your version of Catalina from developer.apple.com/download. As of MacOS 10.15.2, that's Command_Line_Tools_for_Xcode_11.3.dmg +2. Install the package. +3. Run the _acid test_. + +### I did all that and the acid test still does not pass :-( +1. `sudo rm -rf $(xcode-select -print-path)` # Enter root password. No output is normal. +2. `xcode-select --install` +3. If the [_acid test_](#The-acid-test) still does _not_ pass then... +4. `npm explore npm -g -- npm install node-gyp@latest` +5. `npm explore npm -g -- npm explore npm-lifecycle -- npm install node-gyp@latest` +6. If the _acid test_ still does _not_ pass then... +7. Add a comment to https://github.com/nodejs/node-gyp/issues/1927 so we can improve. + +Lessons learned from: +* https://github.com/nodejs/node-gyp/issues/1779 +* https://github.com/nodejs/node-gyp/issues/1861 +* https://github.com/nodejs/node-gyp/issues/1927 and elsewhere +* Thanks to @rrrix for discovering Solution 3 diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/nopt/.npmignore deleted file mode 100644 index 3c3629e647f5dd..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/.npmignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/.travis.yml b/deps/npm/node_modules/node-gyp/node_modules/nopt/.travis.yml deleted file mode 100644 index 99f2bbf5068a8c..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: node_js -language: node_js -node_js: - - '0.8' - - '0.10' - - '0.12' - - 'iojs' -before_install: - - npm install -g npm@latest diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/nopt/LICENSE deleted file mode 100644 index 19129e315fe593..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -The ISC License - -Copyright (c) Isaac Z. Schlueter and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/README.md b/deps/npm/node_modules/node-gyp/node_modules/nopt/README.md deleted file mode 100644 index f21a4b31c5d482..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/README.md +++ /dev/null @@ -1,211 +0,0 @@ -If you want to write an option parser, and have it be good, there are -two ways to do it. The Right Way, and the Wrong Way. - -The Wrong Way is to sit down and write an option parser. We've all done -that. - -The Right Way is to write some complex configurable program with so many -options that you hit the limit of your frustration just trying to -manage them all, and defer it with duct-tape solutions until you see -exactly to the core of the problem, and finally snap and write an -awesome option parser. - -If you want to write an option parser, don't write an option parser. -Write a package manager, or a source control system, or a service -restarter, or an operating system. You probably won't end up with a -good one of those, but if you don't give up, and you are relentless and -diligent enough in your procrastination, you may just end up with a very -nice option parser. - -## USAGE - - // my-program.js - var nopt = require("nopt") - , Stream = require("stream").Stream - , path = require("path") - , knownOpts = { "foo" : [String, null] - , "bar" : [Stream, Number] - , "baz" : path - , "bloo" : [ "big", "medium", "small" ] - , "flag" : Boolean - , "pick" : Boolean - , "many1" : [String, Array] - , "many2" : [path] - } - , shortHands = { "foofoo" : ["--foo", "Mr. Foo"] - , "b7" : ["--bar", "7"] - , "m" : ["--bloo", "medium"] - , "p" : ["--pick"] - , "f" : ["--flag"] - } - // everything is optional. - // knownOpts and shorthands default to {} - // arg list defaults to process.argv - // slice defaults to 2 - , parsed = nopt(knownOpts, shortHands, process.argv, 2) - console.log(parsed) - -This would give you support for any of the following: - -```bash -$ node my-program.js --foo "blerp" --no-flag -{ "foo" : "blerp", "flag" : false } - -$ node my-program.js ---bar 7 --foo "Mr. Hand" --flag -{ bar: 7, foo: "Mr. Hand", flag: true } - -$ node my-program.js --foo "blerp" -f -----p -{ foo: "blerp", flag: true, pick: true } - -$ node my-program.js -fp --foofoo -{ foo: "Mr. Foo", flag: true, pick: true } - -$ node my-program.js --foofoo -- -fp # -- stops the flag parsing. -{ foo: "Mr. Foo", argv: { remain: ["-fp"] } } - -$ node my-program.js --blatzk -fp # unknown opts are ok. -{ blatzk: true, flag: true, pick: true } - -$ node my-program.js --blatzk=1000 -fp # but you need to use = if they have a value -{ blatzk: 1000, flag: true, pick: true } - -$ node my-program.js --no-blatzk -fp # unless they start with "no-" -{ blatzk: false, flag: true, pick: true } - -$ node my-program.js --baz b/a/z # known paths are resolved. -{ baz: "/Users/isaacs/b/a/z" } - -# if Array is one of the types, then it can take many -# values, and will always be an array. The other types provided -# specify what types are allowed in the list. - -$ node my-program.js --many1 5 --many1 null --many1 foo -{ many1: ["5", "null", "foo"] } - -$ node my-program.js --many2 foo --many2 bar -{ many2: ["/path/to/foo", "path/to/bar"] } -``` - -Read the tests at the bottom of `lib/nopt.js` for more examples of -what this puppy can do. - -## Types - -The following types are supported, and defined on `nopt.typeDefs` - -* String: A normal string. No parsing is done. -* path: A file system path. Gets resolved against cwd if not absolute. -* url: A url. If it doesn't parse, it isn't accepted. -* Number: Must be numeric. -* Date: Must parse as a date. If it does, and `Date` is one of the options, - then it will return a Date object, not a string. -* Boolean: Must be either `true` or `false`. If an option is a boolean, - then it does not need a value, and its presence will imply `true` as - the value. To negate boolean flags, do `--no-whatever` or `--whatever - false` -* NaN: Means that the option is strictly not allowed. Any value will - fail. -* Stream: An object matching the "Stream" class in node. Valuable - for use when validating programmatically. (npm uses this to let you - supply any WriteStream on the `outfd` and `logfd` config options.) -* Array: If `Array` is specified as one of the types, then the value - will be parsed as a list of options. This means that multiple values - can be specified, and that the value will always be an array. - -If a type is an array of values not on this list, then those are -considered valid values. For instance, in the example above, the -`--bloo` option can only be one of `"big"`, `"medium"`, or `"small"`, -and any other value will be rejected. - -When parsing unknown fields, `"true"`, `"false"`, and `"null"` will be -interpreted as their JavaScript equivalents. - -You can also mix types and values, or multiple types, in a list. For -instance `{ blah: [Number, null] }` would allow a value to be set to -either a Number or null. When types are ordered, this implies a -preference, and the first type that can be used to properly interpret -the value will be used. - -To define a new type, add it to `nopt.typeDefs`. Each item in that -hash is an object with a `type` member and a `validate` method. The -`type` member is an object that matches what goes in the type list. The -`validate` method is a function that gets called with `validate(data, -key, val)`. Validate methods should assign `data[key]` to the valid -value of `val` if it can be handled properly, or return boolean -`false` if it cannot. - -You can also call `nopt.clean(data, types, typeDefs)` to clean up a -config object and remove its invalid properties. - -## Error Handling - -By default, nopt outputs a warning to standard error when invalid values for -known options are found. You can change this behavior by assigning a method -to `nopt.invalidHandler`. This method will be called with -the offending `nopt.invalidHandler(key, val, types)`. - -If no `nopt.invalidHandler` is assigned, then it will console.error -its whining. If it is assigned to boolean `false` then the warning is -suppressed. - -## Abbreviations - -Yes, they are supported. If you define options like this: - -```javascript -{ "foolhardyelephants" : Boolean -, "pileofmonkeys" : Boolean } -``` - -Then this will work: - -```bash -node program.js --foolhar --pil -node program.js --no-f --pileofmon -# etc. -``` - -## Shorthands - -Shorthands are a hash of shorter option names to a snippet of args that -they expand to. - -If multiple one-character shorthands are all combined, and the -combination does not unambiguously match any other option or shorthand, -then they will be broken up into their constituent parts. For example: - -```json -{ "s" : ["--loglevel", "silent"] -, "g" : "--global" -, "f" : "--force" -, "p" : "--parseable" -, "l" : "--long" -} -``` - -```bash -npm ls -sgflp -# just like doing this: -npm ls --loglevel silent --global --force --long --parseable -``` - -## The Rest of the args - -The config object returned by nopt is given a special member called -`argv`, which is an object with the following fields: - -* `remain`: The remaining args after all the parsing has occurred. -* `original`: The args as they originally appeared. -* `cooked`: The args after flags and shorthands are expanded. - -## Slicing - -Node programs are called with more or less the exact argv as it appears -in C land, after the v8 and node-specific options have been plucked off. -As such, `argv[0]` is always `node` and `argv[1]` is always the -JavaScript program being run. - -That's usually not very useful to you. So they're sliced off by -default. If you want them, then you can pass in `0` as the last -argument, or any other number that you'd like to slice off the start of -the list. diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js b/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js deleted file mode 100755 index 3232d4c570fdcb..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env node -var nopt = require("../lib/nopt") - , path = require("path") - , types = { num: Number - , bool: Boolean - , help: Boolean - , list: Array - , "num-list": [Number, Array] - , "str-list": [String, Array] - , "bool-list": [Boolean, Array] - , str: String - , clear: Boolean - , config: Boolean - , length: Number - , file: path - } - , shorthands = { s: [ "--str", "astring" ] - , b: [ "--bool" ] - , nb: [ "--no-bool" ] - , tft: [ "--bool-list", "--no-bool-list", "--bool-list", "true" ] - , "?": ["--help"] - , h: ["--help"] - , H: ["--help"] - , n: [ "--num", "125" ] - , c: ["--config"] - , l: ["--length"] - , f: ["--file"] - } - , parsed = nopt( types - , shorthands - , process.argv - , 2 ) - -console.log("parsed", parsed) - -if (parsed.help) { - console.log("") - console.log("nopt cli tester") - console.log("") - console.log("types") - console.log(Object.keys(types).map(function M (t) { - var type = types[t] - if (Array.isArray(type)) { - return [t, type.map(function (type) { return type.name })] - } - return [t, type && type.name] - }).reduce(function (s, i) { - s[i[0]] = i[1] - return s - }, {})) - console.log("") - console.log("shorthands") - console.log(shorthands) -} diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/examples/my-program.js b/deps/npm/node_modules/node-gyp/node_modules/nopt/examples/my-program.js deleted file mode 100755 index 142447e18e756c..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/examples/my-program.js +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env node - -//process.env.DEBUG_NOPT = 1 - -// my-program.js -var nopt = require("../lib/nopt") - , Stream = require("stream").Stream - , path = require("path") - , knownOpts = { "foo" : [String, null] - , "bar" : [Stream, Number] - , "baz" : path - , "bloo" : [ "big", "medium", "small" ] - , "flag" : Boolean - , "pick" : Boolean - } - , shortHands = { "foofoo" : ["--foo", "Mr. Foo"] - , "b7" : ["--bar", "7"] - , "m" : ["--bloo", "medium"] - , "p" : ["--pick"] - , "f" : ["--flag", "true"] - , "g" : ["--flag"] - , "s" : "--flag" - } - // everything is optional. - // knownOpts and shorthands default to {} - // arg list defaults to process.argv - // slice defaults to 2 - , parsed = nopt(knownOpts, shortHands, process.argv, 2) - -console.log("parsed =\n"+ require("util").inspect(parsed)) diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/lib/nopt.js b/deps/npm/node_modules/node-gyp/node_modules/nopt/lib/nopt.js deleted file mode 100644 index 97707e784243bc..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/lib/nopt.js +++ /dev/null @@ -1,415 +0,0 @@ -// info about each config option. - -var debug = process.env.DEBUG_NOPT || process.env.NOPT_DEBUG - ? function () { console.error.apply(console, arguments) } - : function () {} - -var url = require("url") - , path = require("path") - , Stream = require("stream").Stream - , abbrev = require("abbrev") - -module.exports = exports = nopt -exports.clean = clean - -exports.typeDefs = - { String : { type: String, validate: validateString } - , Boolean : { type: Boolean, validate: validateBoolean } - , url : { type: url, validate: validateUrl } - , Number : { type: Number, validate: validateNumber } - , path : { type: path, validate: validatePath } - , Stream : { type: Stream, validate: validateStream } - , Date : { type: Date, validate: validateDate } - } - -function nopt (types, shorthands, args, slice) { - args = args || process.argv - types = types || {} - shorthands = shorthands || {} - if (typeof slice !== "number") slice = 2 - - debug(types, shorthands, args, slice) - - args = args.slice(slice) - var data = {} - , key - , remain = [] - , cooked = args - , original = args.slice(0) - - parse(args, data, remain, types, shorthands) - // now data is full - clean(data, types, exports.typeDefs) - data.argv = {remain:remain,cooked:cooked,original:original} - Object.defineProperty(data.argv, 'toString', { value: function () { - return this.original.map(JSON.stringify).join(" ") - }, enumerable: false }) - return data -} - -function clean (data, types, typeDefs) { - typeDefs = typeDefs || exports.typeDefs - var remove = {} - , typeDefault = [false, true, null, String, Array] - - Object.keys(data).forEach(function (k) { - if (k === "argv") return - var val = data[k] - , isArray = Array.isArray(val) - , type = types[k] - if (!isArray) val = [val] - if (!type) type = typeDefault - if (type === Array) type = typeDefault.concat(Array) - if (!Array.isArray(type)) type = [type] - - debug("val=%j", val) - debug("types=", type) - val = val.map(function (val) { - // if it's an unknown value, then parse false/true/null/numbers/dates - if (typeof val === "string") { - debug("string %j", val) - val = val.trim() - if ((val === "null" && ~type.indexOf(null)) - || (val === "true" && - (~type.indexOf(true) || ~type.indexOf(Boolean))) - || (val === "false" && - (~type.indexOf(false) || ~type.indexOf(Boolean)))) { - val = JSON.parse(val) - debug("jsonable %j", val) - } else if (~type.indexOf(Number) && !isNaN(val)) { - debug("convert to number", val) - val = +val - } else if (~type.indexOf(Date) && !isNaN(Date.parse(val))) { - debug("convert to date", val) - val = new Date(val) - } - } - - if (!types.hasOwnProperty(k)) { - return val - } - - // allow `--no-blah` to set 'blah' to null if null is allowed - if (val === false && ~type.indexOf(null) && - !(~type.indexOf(false) || ~type.indexOf(Boolean))) { - val = null - } - - var d = {} - d[k] = val - debug("prevalidated val", d, val, types[k]) - if (!validate(d, k, val, types[k], typeDefs)) { - if (exports.invalidHandler) { - exports.invalidHandler(k, val, types[k], data) - } else if (exports.invalidHandler !== false) { - debug("invalid: "+k+"="+val, types[k]) - } - return remove - } - debug("validated val", d, val, types[k]) - return d[k] - }).filter(function (val) { return val !== remove }) - - if (!val.length) delete data[k] - else if (isArray) { - debug(isArray, data[k], val) - data[k] = val - } else data[k] = val[0] - - debug("k=%s val=%j", k, val, data[k]) - }) -} - -function validateString (data, k, val) { - data[k] = String(val) -} - -function validatePath (data, k, val) { - if (val === true) return false - if (val === null) return true - - val = String(val) - var homePattern = process.platform === 'win32' ? /^~(\/|\\)/ : /^~\// - if (val.match(homePattern) && process.env.HOME) { - val = path.resolve(process.env.HOME, val.substr(2)) - } - data[k] = path.resolve(String(val)) - return true -} - -function validateNumber (data, k, val) { - debug("validate Number %j %j %j", k, val, isNaN(val)) - if (isNaN(val)) return false - data[k] = +val -} - -function validateDate (data, k, val) { - debug("validate Date %j %j %j", k, val, Date.parse(val)) - var s = Date.parse(val) - if (isNaN(s)) return false - data[k] = new Date(val) -} - -function validateBoolean (data, k, val) { - if (val instanceof Boolean) val = val.valueOf() - else if (typeof val === "string") { - if (!isNaN(val)) val = !!(+val) - else if (val === "null" || val === "false") val = false - else val = true - } else val = !!val - data[k] = val -} - -function validateUrl (data, k, val) { - val = url.parse(String(val)) - if (!val.host) return false - data[k] = val.href -} - -function validateStream (data, k, val) { - if (!(val instanceof Stream)) return false - data[k] = val -} - -function validate (data, k, val, type, typeDefs) { - // arrays are lists of types. - if (Array.isArray(type)) { - for (var i = 0, l = type.length; i < l; i ++) { - if (type[i] === Array) continue - if (validate(data, k, val, type[i], typeDefs)) return true - } - delete data[k] - return false - } - - // an array of anything? - if (type === Array) return true - - // NaN is poisonous. Means that something is not allowed. - if (type !== type) { - debug("Poison NaN", k, val, type) - delete data[k] - return false - } - - // explicit list of values - if (val === type) { - debug("Explicitly allowed %j", val) - // if (isArray) (data[k] = data[k] || []).push(val) - // else data[k] = val - data[k] = val - return true - } - - // now go through the list of typeDefs, validate against each one. - var ok = false - , types = Object.keys(typeDefs) - for (var i = 0, l = types.length; i < l; i ++) { - debug("test type %j %j %j", k, val, types[i]) - var t = typeDefs[types[i]] - if (t && - ((type && type.name && t.type && t.type.name) ? (type.name === t.type.name) : (type === t.type))) { - var d = {} - ok = false !== t.validate(d, k, val) - val = d[k] - if (ok) { - // if (isArray) (data[k] = data[k] || []).push(val) - // else data[k] = val - data[k] = val - break - } - } - } - debug("OK? %j (%j %j %j)", ok, k, val, types[i]) - - if (!ok) delete data[k] - return ok -} - -function parse (args, data, remain, types, shorthands) { - debug("parse", args, data, remain) - - var key = null - , abbrevs = abbrev(Object.keys(types)) - , shortAbbr = abbrev(Object.keys(shorthands)) - - for (var i = 0; i < args.length; i ++) { - var arg = args[i] - debug("arg", arg) - - if (arg.match(/^-{2,}$/)) { - // done with keys. - // the rest are args. - remain.push.apply(remain, args.slice(i + 1)) - args[i] = "--" - break - } - var hadEq = false - if (arg.charAt(0) === "-" && arg.length > 1) { - if (arg.indexOf("=") !== -1) { - hadEq = true - var v = arg.split("=") - arg = v.shift() - v = v.join("=") - args.splice.apply(args, [i, 1].concat([arg, v])) - } - - // see if it's a shorthand - // if so, splice and back up to re-parse it. - var shRes = resolveShort(arg, shorthands, shortAbbr, abbrevs) - debug("arg=%j shRes=%j", arg, shRes) - if (shRes) { - debug(arg, shRes) - args.splice.apply(args, [i, 1].concat(shRes)) - if (arg !== shRes[0]) { - i -- - continue - } - } - arg = arg.replace(/^-+/, "") - var no = null - while (arg.toLowerCase().indexOf("no-") === 0) { - no = !no - arg = arg.substr(3) - } - - if (abbrevs[arg]) arg = abbrevs[arg] - - var isArray = types[arg] === Array || - Array.isArray(types[arg]) && types[arg].indexOf(Array) !== -1 - - // allow unknown things to be arrays if specified multiple times. - if (!types.hasOwnProperty(arg) && data.hasOwnProperty(arg)) { - if (!Array.isArray(data[arg])) - data[arg] = [data[arg]] - isArray = true - } - - var val - , la = args[i + 1] - - var isBool = typeof no === 'boolean' || - types[arg] === Boolean || - Array.isArray(types[arg]) && types[arg].indexOf(Boolean) !== -1 || - (typeof types[arg] === 'undefined' && !hadEq) || - (la === "false" && - (types[arg] === null || - Array.isArray(types[arg]) && ~types[arg].indexOf(null))) - - if (isBool) { - // just set and move along - val = !no - // however, also support --bool true or --bool false - if (la === "true" || la === "false") { - val = JSON.parse(la) - la = null - if (no) val = !val - i ++ - } - - // also support "foo":[Boolean, "bar"] and "--foo bar" - if (Array.isArray(types[arg]) && la) { - if (~types[arg].indexOf(la)) { - // an explicit type - val = la - i ++ - } else if ( la === "null" && ~types[arg].indexOf(null) ) { - // null allowed - val = null - i ++ - } else if ( !la.match(/^-{2,}[^-]/) && - !isNaN(la) && - ~types[arg].indexOf(Number) ) { - // number - val = +la - i ++ - } else if ( !la.match(/^-[^-]/) && ~types[arg].indexOf(String) ) { - // string - val = la - i ++ - } - } - - if (isArray) (data[arg] = data[arg] || []).push(val) - else data[arg] = val - - continue - } - - if (types[arg] === String && la === undefined) - la = "" - - if (la && la.match(/^-{2,}$/)) { - la = undefined - i -- - } - - val = la === undefined ? true : la - if (isArray) (data[arg] = data[arg] || []).push(val) - else data[arg] = val - - i ++ - continue - } - remain.push(arg) - } -} - -function resolveShort (arg, shorthands, shortAbbr, abbrevs) { - // handle single-char shorthands glommed together, like - // npm ls -glp, but only if there is one dash, and only if - // all of the chars are single-char shorthands, and it's - // not a match to some other abbrev. - arg = arg.replace(/^-+/, '') - - // if it's an exact known option, then don't go any further - if (abbrevs[arg] === arg) - return null - - // if it's an exact known shortopt, same deal - if (shorthands[arg]) { - // make it an array, if it's a list of words - if (shorthands[arg] && !Array.isArray(shorthands[arg])) - shorthands[arg] = shorthands[arg].split(/\s+/) - - return shorthands[arg] - } - - // first check to see if this arg is a set of single-char shorthands - var singles = shorthands.___singles - if (!singles) { - singles = Object.keys(shorthands).filter(function (s) { - return s.length === 1 - }).reduce(function (l,r) { - l[r] = true - return l - }, {}) - shorthands.___singles = singles - debug('shorthand singles', singles) - } - - var chrs = arg.split("").filter(function (c) { - return singles[c] - }) - - if (chrs.join("") === arg) return chrs.map(function (c) { - return shorthands[c] - }).reduce(function (l, r) { - return l.concat(r) - }, []) - - - // if it's an arg abbrev, and not a literal shorthand, then prefer the arg - if (abbrevs[arg] && !shorthands[arg]) - return null - - // if it's an abbr for a shorthand, then use that - if (shortAbbr[arg]) - arg = shortAbbr[arg] - - // make it an array, if it's a list of words - if (shorthands[arg] && !Array.isArray(shorthands[arg])) - shorthands[arg] = shorthands[arg].split(/\s+/) - - return shorthands[arg] -} diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/package.json b/deps/npm/node_modules/node-gyp/node_modules/nopt/package.json deleted file mode 100644 index 5179f473b1bbd4..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/package.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "_from": "nopt@2 || 3", - "_id": "nopt@3.0.6", - "_inBundle": false, - "_integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "_location": "/node-gyp/nopt", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "nopt@2 || 3", - "name": "nopt", - "escapedName": "nopt", - "rawSpec": "2 || 3", - "saveSpec": null, - "fetchSpec": "2 || 3" - }, - "_requiredBy": [ - "/node-gyp" - ], - "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9", - "_spec": "nopt@2 || 3", - "_where": "/Users/rebecca/code/npm/node_modules/node-gyp", - "author": { - "name": "Isaac Z. Schlueter", - "email": "i@izs.me", - "url": "http://blog.izs.me/" - }, - "bin": { - "nopt": "./bin/nopt.js" - }, - "bugs": { - "url": "https://github.com/npm/nopt/issues" - }, - "bundleDependencies": false, - "dependencies": { - "abbrev": "1" - }, - "deprecated": false, - "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.", - "devDependencies": { - "tap": "^1.2.0" - }, - "homepage": "https://github.com/npm/nopt#readme", - "license": "ISC", - "main": "lib/nopt.js", - "name": "nopt", - "repository": { - "type": "git", - "url": "git+https://github.com/npm/nopt.git" - }, - "scripts": { - "test": "tap test/*.js" - }, - "version": "3.0.6" -} diff --git a/deps/npm/node_modules/node-gyp/node_modules/nopt/test/basic.js b/deps/npm/node_modules/node-gyp/node_modules/nopt/test/basic.js deleted file mode 100644 index d399de9209932c..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/nopt/test/basic.js +++ /dev/null @@ -1,273 +0,0 @@ -var nopt = require("../") - , test = require('tap').test - - -test("passing a string results in a string", function (t) { - var parsed = nopt({ key: String }, {}, ["--key", "myvalue"], 0) - t.same(parsed.key, "myvalue") - t.end() -}) - -// https://github.com/npm/nopt/issues/31 -test("Empty String results in empty string, not true", function (t) { - var parsed = nopt({ empty: String }, {}, ["--empty"], 0) - t.same(parsed.empty, "") - t.end() -}) - -test("~ path is resolved to $HOME", function (t) { - var path = require("path") - if (!process.env.HOME) process.env.HOME = "/tmp" - var parsed = nopt({key: path}, {}, ["--key=~/val"], 0) - t.same(parsed.key, path.resolve(process.env.HOME, "val")) - t.end() -}) - -// https://github.com/npm/nopt/issues/24 -test("Unknown options are not parsed as numbers", function (t) { - var parsed = nopt({"parse-me": Number}, null, ['--leave-as-is=1.20', '--parse-me=1.20'], 0) - t.equal(parsed['leave-as-is'], '1.20') - t.equal(parsed['parse-me'], 1.2) - t.end() -}); - -// https://github.com/npm/nopt/issues/48 -test("Check types based on name of type", function (t) { - var parsed = nopt({"parse-me": {name: "Number"}}, null, ['--parse-me=1.20'], 0) - t.equal(parsed['parse-me'], 1.2) - t.end() -}) - - -test("Missing types are not parsed", function (t) { - var parsed = nopt({"parse-me": {}}, null, ['--parse-me=1.20'], 0) - //should only contain argv - t.equal(Object.keys(parsed).length, 1) - t.end() -}) - -test("Types passed without a name are not parsed", function (t) { - var parsed = nopt({"parse-me": {}}, {}, ['--parse-me=1.20'], 0) - //should only contain argv - t.equal(Object.keys(parsed).length, 1) - t.end() -}) - -test("other tests", function (t) { - - var util = require("util") - , Stream = require("stream") - , path = require("path") - , url = require("url") - - , shorthands = - { s : ["--loglevel", "silent"] - , d : ["--loglevel", "info"] - , dd : ["--loglevel", "verbose"] - , ddd : ["--loglevel", "silly"] - , noreg : ["--no-registry"] - , reg : ["--registry"] - , "no-reg" : ["--no-registry"] - , silent : ["--loglevel", "silent"] - , verbose : ["--loglevel", "verbose"] - , h : ["--usage"] - , H : ["--usage"] - , "?" : ["--usage"] - , help : ["--usage"] - , v : ["--version"] - , f : ["--force"] - , desc : ["--description"] - , "no-desc" : ["--no-description"] - , "local" : ["--no-global"] - , l : ["--long"] - , p : ["--parseable"] - , porcelain : ["--parseable"] - , g : ["--global"] - } - - , types = - { aoa: Array - , nullstream: [null, Stream] - , date: Date - , str: String - , browser : String - , cache : path - , color : ["always", Boolean] - , depth : Number - , description : Boolean - , dev : Boolean - , editor : path - , force : Boolean - , global : Boolean - , globalconfig : path - , group : [String, Number] - , gzipbin : String - , logfd : [Number, Stream] - , loglevel : ["silent","win","error","warn","info","verbose","silly"] - , long : Boolean - , "node-version" : [false, String] - , npaturl : url - , npat : Boolean - , "onload-script" : [false, String] - , outfd : [Number, Stream] - , parseable : Boolean - , pre: Boolean - , prefix: path - , proxy : url - , "rebuild-bundle" : Boolean - , registry : url - , searchopts : String - , searchexclude: [null, String] - , shell : path - , t: [Array, String] - , tag : String - , tar : String - , tmp : path - , "unsafe-perm" : Boolean - , usage : Boolean - , user : String - , username : String - , userconfig : path - , version : Boolean - , viewer: path - , _exit : Boolean - , path: path - } - - ; [["-v", {version:true}, []] - ,["---v", {version:true}, []] - ,["ls -s --no-reg connect -d", - {loglevel:"info",registry:null},["ls","connect"]] - ,["ls ---s foo",{loglevel:"silent"},["ls","foo"]] - ,["ls --registry blargle", {}, ["ls"]] - ,["--no-registry", {registry:null}, []] - ,["--no-color true", {color:false}, []] - ,["--no-color false", {color:true}, []] - ,["--no-color", {color:false}, []] - ,["--color false", {color:false}, []] - ,["--color --logfd 7", {logfd:7,color:true}, []] - ,["--color=true", {color:true}, []] - ,["--logfd=10", {logfd:10}, []] - ,["--tmp=/tmp -tar=gtar",{tmp:"/tmp",tar:"gtar"},[]] - ,["--tmp=tmp -tar=gtar", - {tmp:path.resolve(process.cwd(), "tmp"),tar:"gtar"},[]] - ,["--logfd x", {}, []] - ,["a -true -- -no-false", {true:true},["a","-no-false"]] - ,["a -no-false", {false:false},["a"]] - ,["a -no-no-true", {true:true}, ["a"]] - ,["a -no-no-no-false", {false:false}, ["a"]] - ,["---NO-no-No-no-no-no-nO-no-no"+ - "-No-no-no-no-no-no-no-no-no"+ - "-no-no-no-no-NO-NO-no-no-no-no-no-no"+ - "-no-body-can-do-the-boogaloo-like-I-do" - ,{"body-can-do-the-boogaloo-like-I-do":false}, []] - ,["we are -no-strangers-to-love "+ - "--you-know=the-rules --and=so-do-i "+ - "---im-thinking-of=a-full-commitment "+ - "--no-you-would-get-this-from-any-other-guy "+ - "--no-gonna-give-you-up "+ - "-no-gonna-let-you-down=true "+ - "--no-no-gonna-run-around false "+ - "--desert-you=false "+ - "--make-you-cry false "+ - "--no-tell-a-lie "+ - "--no-no-and-hurt-you false" - ,{"strangers-to-love":false - ,"you-know":"the-rules" - ,"and":"so-do-i" - ,"you-would-get-this-from-any-other-guy":false - ,"gonna-give-you-up":false - ,"gonna-let-you-down":false - ,"gonna-run-around":false - ,"desert-you":false - ,"make-you-cry":false - ,"tell-a-lie":false - ,"and-hurt-you":false - },["we", "are"]] - ,["-t one -t two -t three" - ,{t: ["one", "two", "three"]} - ,[]] - ,["-t one -t null -t three four five null" - ,{t: ["one", "null", "three"]} - ,["four", "five", "null"]] - ,["-t foo" - ,{t:["foo"]} - ,[]] - ,["--no-t" - ,{t:["false"]} - ,[]] - ,["-no-no-t" - ,{t:["true"]} - ,[]] - ,["-aoa one -aoa null -aoa 100" - ,{aoa:["one", null, '100']} - ,[]] - ,["-str 100" - ,{str:"100"} - ,[]] - ,["--color always" - ,{color:"always"} - ,[]] - ,["--no-nullstream" - ,{nullstream:null} - ,[]] - ,["--nullstream false" - ,{nullstream:null} - ,[]] - ,["--notadate=2011-01-25" - ,{notadate: "2011-01-25"} - ,[]] - ,["--date 2011-01-25" - ,{date: new Date("2011-01-25")} - ,[]] - ,["-cl 1" - ,{config: true, length: 1} - ,[] - ,{config: Boolean, length: Number, clear: Boolean} - ,{c: "--config", l: "--length"}] - ,["--acount bla" - ,{"acount":true} - ,["bla"] - ,{account: Boolean, credentials: Boolean, options: String} - ,{a:"--account", c:"--credentials",o:"--options"}] - ,["--clear" - ,{clear:true} - ,[] - ,{clear:Boolean,con:Boolean,len:Boolean,exp:Boolean,add:Boolean,rep:Boolean} - ,{c:"--con",l:"--len",e:"--exp",a:"--add",r:"--rep"}] - ,["--file -" - ,{"file":"-"} - ,[] - ,{file:String} - ,{}] - ,["--file -" - ,{"file":true} - ,["-"] - ,{file:Boolean} - ,{}] - ,["--path" - ,{"path":null} - ,[]] - ,["--path ." - ,{"path":process.cwd()} - ,[]] - ].forEach(function (test) { - var argv = test[0].split(/\s+/) - , opts = test[1] - , rem = test[2] - , actual = nopt(test[3] || types, test[4] || shorthands, argv, 0) - , parsed = actual.argv - delete actual.argv - for (var i in opts) { - var e = JSON.stringify(opts[i]) - , a = JSON.stringify(actual[i] === undefined ? null : actual[i]) - if (e && typeof e === "object") { - t.deepEqual(e, a) - } else { - t.equal(e, a) - } - } - t.deepEqual(rem, parsed.remain) - }) - t.end() -}) diff --git a/deps/npm/node_modules/node-gyp/node_modules/semver/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/semver/LICENSE deleted file mode 100644 index 19129e315fe593..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/semver/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -The ISC License - -Copyright (c) Isaac Z. Schlueter and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/deps/npm/node_modules/node-gyp/node_modules/semver/README.md b/deps/npm/node_modules/node-gyp/node_modules/semver/README.md deleted file mode 100644 index cbd956549dbb01..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/semver/README.md +++ /dev/null @@ -1,350 +0,0 @@ -semver(1) -- The semantic versioner for npm -=========================================== - -## Usage - - $ npm install semver - $ node - var semver = require('semver') - - semver.valid('1.2.3') // '1.2.3' - semver.valid('a.b.c') // null - semver.clean(' =v1.2.3 ') // '1.2.3' - semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true - semver.gt('1.2.3', '9.8.7') // false - semver.lt('1.2.3', '9.8.7') // true - -As a command-line utility: - - $ semver -h - - SemVer 5.1.0 - - A JavaScript implementation of the http://semver.org/ specification - Copyright Isaac Z. Schlueter - - Usage: semver [options] [ [...]] - Prints valid versions sorted by SemVer precedence - - Options: - -r --range - Print versions that match the specified range. - - -i --increment [] - Increment a version by the specified level. Level can - be one of: major, minor, patch, premajor, preminor, - prepatch, or prerelease. Default level is 'patch'. - Only one version may be specified. - - --preid - Identifier to be used to prefix premajor, preminor, - prepatch or prerelease version increments. - - -l --loose - Interpret versions and ranges loosely - - Program exits successfully if any valid version satisfies - all supplied ranges, and prints all satisfying versions. - - If no satisfying versions are found, then exits failure. - - Versions are printed in ascending order, so supplying - multiple versions to the utility will just sort them. - -## Versions - -A "version" is described by the `v2.0.0` specification found at -. - -A leading `"="` or `"v"` character is stripped off and ignored. - -## Ranges - -A `version range` is a set of `comparators` which specify versions -that satisfy the range. - -A `comparator` is composed of an `operator` and a `version`. The set -of primitive `operators` is: - -* `<` Less than -* `<=` Less than or equal to -* `>` Greater than -* `>=` Greater than or equal to -* `=` Equal. If no operator is specified, then equality is assumed, - so this operator is optional, but MAY be included. - -For example, the comparator `>=1.2.7` would match the versions -`1.2.7`, `1.2.8`, `2.5.3`, and `1.3.9`, but not the versions `1.2.6` -or `1.1.0`. - -Comparators can be joined by whitespace to form a `comparator set`, -which is satisfied by the **intersection** of all of the comparators -it includes. - -A range is composed of one or more comparator sets, joined by `||`. A -version matches a range if and only if every comparator in at least -one of the `||`-separated comparator sets is satisfied by the version. - -For example, the range `>=1.2.7 <1.3.0` would match the versions -`1.2.7`, `1.2.8`, and `1.2.99`, but not the versions `1.2.6`, `1.3.0`, -or `1.1.0`. - -The range `1.2.7 || >=1.2.9 <2.0.0` would match the versions `1.2.7`, -`1.2.9`, and `1.4.6`, but not the versions `1.2.8` or `2.0.0`. - -### Prerelease Tags - -If a version has a prerelease tag (for example, `1.2.3-alpha.3`) then -it will only be allowed to satisfy comparator sets if at least one -comparator with the same `[major, minor, patch]` tuple also has a -prerelease tag. - -For example, the range `>1.2.3-alpha.3` would be allowed to match the -version `1.2.3-alpha.7`, but it would *not* be satisfied by -`3.4.5-alpha.9`, even though `3.4.5-alpha.9` is technically "greater -than" `1.2.3-alpha.3` according to the SemVer sort rules. The version -range only accepts prerelease tags on the `1.2.3` version. The -version `3.4.5` *would* satisfy the range, because it does not have a -prerelease flag, and `3.4.5` is greater than `1.2.3-alpha.7`. - -The purpose for this behavior is twofold. First, prerelease versions -frequently are updated very quickly, and contain many breaking changes -that are (by the author's design) not yet fit for public consumption. -Therefore, by default, they are excluded from range matching -semantics. - -Second, a user who has opted into using a prerelease version has -clearly indicated the intent to use *that specific* set of -alpha/beta/rc versions. By including a prerelease tag in the range, -the user is indicating that they are aware of the risk. However, it -is still not appropriate to assume that they have opted into taking a -similar risk on the *next* set of prerelease versions. - -#### Prerelease Identifiers - -The method `.inc` takes an additional `identifier` string argument that -will append the value of the string as a prerelease identifier: - -```javascript -> semver.inc('1.2.3', 'prerelease', 'beta') -'1.2.4-beta.0' -``` - -command-line example: - -```shell -$ semver 1.2.3 -i prerelease --preid beta -1.2.4-beta.0 -``` - -Which then can be used to increment further: - -```shell -$ semver 1.2.4-beta.0 -i prerelease -1.2.4-beta.1 -``` - -### Advanced Range Syntax - -Advanced range syntax desugars to primitive comparators in -deterministic ways. - -Advanced ranges may be combined in the same way as primitive -comparators using white space or `||`. - -#### Hyphen Ranges `X.Y.Z - A.B.C` - -Specifies an inclusive set. - -* `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4` - -If a partial version is provided as the first version in the inclusive -range, then the missing pieces are replaced with zeroes. - -* `1.2 - 2.3.4` := `>=1.2.0 <=2.3.4` - -If a partial version is provided as the second version in the -inclusive range, then all versions that start with the supplied parts -of the tuple are accepted, but nothing that would be greater than the -provided tuple parts. - -* `1.2.3 - 2.3` := `>=1.2.3 <2.4.0` -* `1.2.3 - 2` := `>=1.2.3 <3.0.0` - -#### X-Ranges `1.2.x` `1.X` `1.2.*` `*` - -Any of `X`, `x`, or `*` may be used to "stand in" for one of the -numeric values in the `[major, minor, patch]` tuple. - -* `*` := `>=0.0.0` (Any version satisfies) -* `1.x` := `>=1.0.0 <2.0.0` (Matching major version) -* `1.2.x` := `>=1.2.0 <1.3.0` (Matching major and minor versions) - -A partial version range is treated as an X-Range, so the special -character is in fact optional. - -* `""` (empty string) := `*` := `>=0.0.0` -* `1` := `1.x.x` := `>=1.0.0 <2.0.0` -* `1.2` := `1.2.x` := `>=1.2.0 <1.3.0` - -#### Tilde Ranges `~1.2.3` `~1.2` `~1` - -Allows patch-level changes if a minor version is specified on the -comparator. Allows minor-level changes if not. - -* `~1.2.3` := `>=1.2.3 <1.(2+1).0` := `>=1.2.3 <1.3.0` -* `~1.2` := `>=1.2.0 <1.(2+1).0` := `>=1.2.0 <1.3.0` (Same as `1.2.x`) -* `~1` := `>=1.0.0 <(1+1).0.0` := `>=1.0.0 <2.0.0` (Same as `1.x`) -* `~0.2.3` := `>=0.2.3 <0.(2+1).0` := `>=0.2.3 <0.3.0` -* `~0.2` := `>=0.2.0 <0.(2+1).0` := `>=0.2.0 <0.3.0` (Same as `0.2.x`) -* `~0` := `>=0.0.0 <(0+1).0.0` := `>=0.0.0 <1.0.0` (Same as `0.x`) -* `~1.2.3-beta.2` := `>=1.2.3-beta.2 <1.3.0` Note that prereleases in - the `1.2.3` version will be allowed, if they are greater than or - equal to `beta.2`. So, `1.2.3-beta.4` would be allowed, but - `1.2.4-beta.2` would not, because it is a prerelease of a - different `[major, minor, patch]` tuple. - -#### Caret Ranges `^1.2.3` `^0.2.5` `^0.0.4` - -Allows changes that do not modify the left-most non-zero digit in the -`[major, minor, patch]` tuple. In other words, this allows patch and -minor updates for versions `1.0.0` and above, patch updates for -versions `0.X >=0.1.0`, and *no* updates for versions `0.0.X`. - -Many authors treat a `0.x` version as if the `x` were the major -"breaking-change" indicator. - -Caret ranges are ideal when an author may make breaking changes -between `0.2.4` and `0.3.0` releases, which is a common practice. -However, it presumes that there will *not* be breaking changes between -`0.2.4` and `0.2.5`. It allows for changes that are presumed to be -additive (but non-breaking), according to commonly observed practices. - -* `^1.2.3` := `>=1.2.3 <2.0.0` -* `^0.2.3` := `>=0.2.3 <0.3.0` -* `^0.0.3` := `>=0.0.3 <0.0.4` -* `^1.2.3-beta.2` := `>=1.2.3-beta.2 <2.0.0` Note that prereleases in - the `1.2.3` version will be allowed, if they are greater than or - equal to `beta.2`. So, `1.2.3-beta.4` would be allowed, but - `1.2.4-beta.2` would not, because it is a prerelease of a - different `[major, minor, patch]` tuple. -* `^0.0.3-beta` := `>=0.0.3-beta <0.0.4` Note that prereleases in the - `0.0.3` version *only* will be allowed, if they are greater than or - equal to `beta`. So, `0.0.3-pr.2` would be allowed. - -When parsing caret ranges, a missing `patch` value desugars to the -number `0`, but will allow flexibility within that value, even if the -major and minor versions are both `0`. - -* `^1.2.x` := `>=1.2.0 <2.0.0` -* `^0.0.x` := `>=0.0.0 <0.1.0` -* `^0.0` := `>=0.0.0 <0.1.0` - -A missing `minor` and `patch` values will desugar to zero, but also -allow flexibility within those values, even if the major version is -zero. - -* `^1.x` := `>=1.0.0 <2.0.0` -* `^0.x` := `>=0.0.0 <1.0.0` - -### Range Grammar - -Putting all this together, here is a Backus-Naur grammar for ranges, -for the benefit of parser authors: - -```bnf -range-set ::= range ( logical-or range ) * -logical-or ::= ( ' ' ) * '||' ( ' ' ) * -range ::= hyphen | simple ( ' ' simple ) * | '' -hyphen ::= partial ' - ' partial -simple ::= primitive | partial | tilde | caret -primitive ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial -partial ::= xr ( '.' xr ( '.' xr qualifier ? )? )? -xr ::= 'x' | 'X' | '*' | nr -nr ::= '0' | ['1'-'9'] ( ['0'-'9'] ) * -tilde ::= '~' partial -caret ::= '^' partial -qualifier ::= ( '-' pre )? ( '+' build )? -pre ::= parts -build ::= parts -parts ::= part ( '.' part ) * -part ::= nr | [-0-9A-Za-z]+ -``` - -## Functions - -All methods and classes take a final `loose` boolean argument that, if -true, will be more forgiving about not-quite-valid semver strings. -The resulting output will always be 100% strict, of course. - -Strict-mode Comparators and Ranges will be strict about the SemVer -strings that they parse. - -* `valid(v)`: Return the parsed version, or null if it's not valid. -* `inc(v, release)`: Return the version incremented by the release - type (`major`, `premajor`, `minor`, `preminor`, `patch`, - `prepatch`, or `prerelease`), or null if it's not valid - * `premajor` in one call will bump the version up to the next major - version and down to a prerelease of that major version. - `preminor`, and `prepatch` work the same way. - * If called from a non-prerelease version, the `prerelease` will work the - same as `prepatch`. It increments the patch version, then makes a - prerelease. If the input version is already a prerelease it simply - increments it. -* `prerelease(v)`: Returns an array of prerelease components, or null - if none exist. Example: `prerelease('1.2.3-alpha.1') -> ['alpha', 1]` -* `major(v)`: Return the major version number. -* `minor(v)`: Return the minor version number. -* `patch(v)`: Return the patch version number. - -### Comparison - -* `gt(v1, v2)`: `v1 > v2` -* `gte(v1, v2)`: `v1 >= v2` -* `lt(v1, v2)`: `v1 < v2` -* `lte(v1, v2)`: `v1 <= v2` -* `eq(v1, v2)`: `v1 == v2` This is true if they're logically equivalent, - even if they're not the exact same string. You already know how to - compare strings. -* `neq(v1, v2)`: `v1 != v2` The opposite of `eq`. -* `cmp(v1, comparator, v2)`: Pass in a comparison string, and it'll call - the corresponding function above. `"==="` and `"!=="` do simple - string comparison, but are included for completeness. Throws if an - invalid comparison string is provided. -* `compare(v1, v2)`: Return `0` if `v1 == v2`, or `1` if `v1` is greater, or `-1` if - `v2` is greater. Sorts in ascending order if passed to `Array.sort()`. -* `rcompare(v1, v2)`: The reverse of compare. Sorts an array of versions - in descending order when passed to `Array.sort()`. -* `diff(v1, v2)`: Returns difference between two versions by the release type - (`major`, `premajor`, `minor`, `preminor`, `patch`, `prepatch`, or `prerelease`), - or null if the versions are the same. - - -### Ranges - -* `validRange(range)`: Return the valid range or null if it's not valid -* `satisfies(version, range)`: Return true if the version satisfies the - range. -* `maxSatisfying(versions, range)`: Return the highest version in the list - that satisfies the range, or `null` if none of them do. -* `minSatisfying(versions, range)`: Return the lowest version in the list - that satisfies the range, or `null` if none of them do. -* `gtr(version, range)`: Return `true` if version is greater than all the - versions possible in the range. -* `ltr(version, range)`: Return `true` if version is less than all the - versions possible in the range. -* `outside(version, range, hilo)`: Return true if the version is outside - the bounds of the range in either the high or low direction. The - `hilo` argument must be either the string `'>'` or `'<'`. (This is - the function called by `gtr` and `ltr`.) - -Note that, since ranges may be non-contiguous, a version might not be -greater than a range, less than a range, *or* satisfy a range! For -example, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9` -until `2.0.0`, so the version `1.2.10` would not be greater than the -range (because `2.0.1` satisfies, which is higher), nor less than the -range (since `1.2.8` satisfies, which is lower), and it also does not -satisfy the range. - -If you want to know if a version satisfies or does not satisfy a -range, use the `satisfies(version, range)` function. diff --git a/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver b/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver deleted file mode 100755 index c5f2e857e82790..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver +++ /dev/null @@ -1,133 +0,0 @@ -#!/usr/bin/env node -// Standalone semver comparison program. -// Exits successfully and prints matching version(s) if -// any supplied version is valid and passes all tests. - -var argv = process.argv.slice(2) - , versions = [] - , range = [] - , gt = [] - , lt = [] - , eq = [] - , inc = null - , version = require("../package.json").version - , loose = false - , identifier = undefined - , semver = require("../semver") - , reverse = false - -main() - -function main () { - if (!argv.length) return help() - while (argv.length) { - var a = argv.shift() - var i = a.indexOf('=') - if (i !== -1) { - a = a.slice(0, i) - argv.unshift(a.slice(i + 1)) - } - switch (a) { - case "-rv": case "-rev": case "--rev": case "--reverse": - reverse = true - break - case "-l": case "--loose": - loose = true - break - case "-v": case "--version": - versions.push(argv.shift()) - break - case "-i": case "--inc": case "--increment": - switch (argv[0]) { - case "major": case "minor": case "patch": case "prerelease": - case "premajor": case "preminor": case "prepatch": - inc = argv.shift() - break - default: - inc = "patch" - break - } - break - case "--preid": - identifier = argv.shift() - break - case "-r": case "--range": - range.push(argv.shift()) - break - case "-h": case "--help": case "-?": - return help() - default: - versions.push(a) - break - } - } - - versions = versions.filter(function (v) { - return semver.valid(v, loose) - }) - if (!versions.length) return fail() - if (inc && (versions.length !== 1 || range.length)) - return failInc() - - for (var i = 0, l = range.length; i < l ; i ++) { - versions = versions.filter(function (v) { - return semver.satisfies(v, range[i], loose) - }) - if (!versions.length) return fail() - } - return success(versions) -} - -function failInc () { - console.error("--inc can only be used on a single version with no range") - fail() -} - -function fail () { process.exit(1) } - -function success () { - var compare = reverse ? "rcompare" : "compare" - versions.sort(function (a, b) { - return semver[compare](a, b, loose) - }).map(function (v) { - return semver.clean(v, loose) - }).map(function (v) { - return inc ? semver.inc(v, inc, loose, identifier) : v - }).forEach(function (v,i,_) { console.log(v) }) -} - -function help () { - console.log(["SemVer " + version - ,"" - ,"A JavaScript implementation of the http://semver.org/ specification" - ,"Copyright Isaac Z. Schlueter" - ,"" - ,"Usage: semver [options] [ [...]]" - ,"Prints valid versions sorted by SemVer precedence" - ,"" - ,"Options:" - ,"-r --range " - ," Print versions that match the specified range." - ,"" - ,"-i --increment []" - ," Increment a version by the specified level. Level can" - ," be one of: major, minor, patch, premajor, preminor," - ," prepatch, or prerelease. Default level is 'patch'." - ," Only one version may be specified." - ,"" - ,"--preid " - ," Identifier to be used to prefix premajor, preminor," - ," prepatch or prerelease version increments." - ,"" - ,"-l --loose" - ," Interpret versions and ranges loosely" - ,"" - ,"Program exits successfully if any valid version satisfies" - ,"all supplied ranges, and prints all satisfying versions." - ,"" - ,"If no satisfying versions are found, then exits failure." - ,"" - ,"Versions are printed in ascending order, so supplying" - ,"multiple versions to the utility will just sort them." - ].join("\n")) -} diff --git a/deps/npm/node_modules/node-gyp/node_modules/semver/package.json b/deps/npm/node_modules/node-gyp/node_modules/semver/package.json deleted file mode 100644 index 8793bae37c297c..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/semver/package.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "_from": "semver@~5.3.0", - "_id": "semver@5.3.0", - "_inBundle": false, - "_integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "_location": "/node-gyp/semver", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "semver@~5.3.0", - "name": "semver", - "escapedName": "semver", - "rawSpec": "~5.3.0", - "saveSpec": null, - "fetchSpec": "~5.3.0" - }, - "_requiredBy": [ - "/node-gyp" - ], - "_resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "_shasum": "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f", - "_spec": "semver@~5.3.0", - "_where": "/Users/rebecca/code/npm/node_modules/node-gyp", - "bin": { - "semver": "./bin/semver" - }, - "bugs": { - "url": "https://github.com/npm/node-semver/issues" - }, - "bundleDependencies": false, - "deprecated": false, - "description": "The semantic version parser used by npm.", - "devDependencies": { - "tap": "^2.0.0" - }, - "files": [ - "bin", - "range.bnf", - "semver.js" - ], - "homepage": "https://github.com/npm/node-semver#readme", - "license": "ISC", - "main": "semver.js", - "name": "semver", - "repository": { - "type": "git", - "url": "git+https://github.com/npm/node-semver.git" - }, - "scripts": { - "test": "tap test/*.js" - }, - "version": "5.3.0" -} diff --git a/deps/npm/node_modules/node-gyp/node_modules/semver/range.bnf b/deps/npm/node_modules/node-gyp/node_modules/semver/range.bnf deleted file mode 100644 index 25ebd5c8325488..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/semver/range.bnf +++ /dev/null @@ -1,16 +0,0 @@ -range-set ::= range ( logical-or range ) * -logical-or ::= ( ' ' ) * '||' ( ' ' ) * -range ::= hyphen | simple ( ' ' simple ) * | '' -hyphen ::= partial ' - ' partial -simple ::= primitive | partial | tilde | caret -primitive ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial -partial ::= xr ( '.' xr ( '.' xr qualifier ? )? )? -xr ::= 'x' | 'X' | '*' | nr -nr ::= '0' | ['1'-'9'] ( ['0'-'9'] ) * -tilde ::= '~' partial -caret ::= '^' partial -qualifier ::= ( '-' pre )? ( '+' build )? -pre ::= parts -build ::= parts -parts ::= part ( '.' part ) * -part ::= nr | [-0-9A-Za-z]+ diff --git a/deps/npm/node_modules/node-gyp/node_modules/semver/semver.js b/deps/npm/node_modules/node-gyp/node_modules/semver/semver.js deleted file mode 100644 index 5f1a3c5c9e5dc9..00000000000000 --- a/deps/npm/node_modules/node-gyp/node_modules/semver/semver.js +++ /dev/null @@ -1,1203 +0,0 @@ -exports = module.exports = SemVer; - -// The debug function is excluded entirely from the minified version. -/* nomin */ var debug; -/* nomin */ if (typeof process === 'object' && - /* nomin */ process.env && - /* nomin */ process.env.NODE_DEBUG && - /* nomin */ /\bsemver\b/i.test(process.env.NODE_DEBUG)) - /* nomin */ debug = function() { - /* nomin */ var args = Array.prototype.slice.call(arguments, 0); - /* nomin */ args.unshift('SEMVER'); - /* nomin */ console.log.apply(console, args); - /* nomin */ }; -/* nomin */ else - /* nomin */ debug = function() {}; - -// Note: this is the semver.org version of the spec that it implements -// Not necessarily the package version of this code. -exports.SEMVER_SPEC_VERSION = '2.0.0'; - -var MAX_LENGTH = 256; -var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991; - -// The actual regexps go on exports.re -var re = exports.re = []; -var src = exports.src = []; -var R = 0; - -// The following Regular Expressions can be used for tokenizing, -// validating, and parsing SemVer version strings. - -// ## Numeric Identifier -// A single `0`, or a non-zero digit followed by zero or more digits. - -var NUMERICIDENTIFIER = R++; -src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'; -var NUMERICIDENTIFIERLOOSE = R++; -src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'; - - -// ## Non-numeric Identifier -// Zero or more digits, followed by a letter or hyphen, and then zero or -// more letters, digits, or hyphens. - -var NONNUMERICIDENTIFIER = R++; -src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'; - - -// ## Main Version -// Three dot-separated numeric identifiers. - -var MAINVERSION = R++; -src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' + - '(' + src[NUMERICIDENTIFIER] + ')\\.' + - '(' + src[NUMERICIDENTIFIER] + ')'; - -var MAINVERSIONLOOSE = R++; -src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' + - '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' + - '(' + src[NUMERICIDENTIFIERLOOSE] + ')'; - -// ## Pre-release Version Identifier -// A numeric identifier, or a non-numeric identifier. - -var PRERELEASEIDENTIFIER = R++; -src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] + - '|' + src[NONNUMERICIDENTIFIER] + ')'; - -var PRERELEASEIDENTIFIERLOOSE = R++; -src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] + - '|' + src[NONNUMERICIDENTIFIER] + ')'; - - -// ## Pre-release Version -// Hyphen, followed by one or more dot-separated pre-release version -// identifiers. - -var PRERELEASE = R++; -src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] + - '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'; - -var PRERELEASELOOSE = R++; -src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] + - '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'; - -// ## Build Metadata Identifier -// Any combination of digits, letters, or hyphens. - -var BUILDIDENTIFIER = R++; -src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'; - -// ## Build Metadata -// Plus sign, followed by one or more period-separated build metadata -// identifiers. - -var BUILD = R++; -src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] + - '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'; - - -// ## Full Version String -// A main version, followed optionally by a pre-release version and -// build metadata. - -// Note that the only major, minor, patch, and pre-release sections of -// the version string are capturing groups. The build metadata is not a -// capturing group, because it should not ever be used in version -// comparison. - -var FULL = R++; -var FULLPLAIN = 'v?' + src[MAINVERSION] + - src[PRERELEASE] + '?' + - src[BUILD] + '?'; - -src[FULL] = '^' + FULLPLAIN + '$'; - -// like full, but allows v1.2.3 and =1.2.3, which people do sometimes. -// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty -// common in the npm registry. -var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] + - src[PRERELEASELOOSE] + '?' + - src[BUILD] + '?'; - -var LOOSE = R++; -src[LOOSE] = '^' + LOOSEPLAIN + '$'; - -var GTLT = R++; -src[GTLT] = '((?:<|>)?=?)'; - -// Something like "2.*" or "1.2.x". -// Note that "x.x" is a valid xRange identifer, meaning "any version" -// Only the first item is strictly required. -var XRANGEIDENTIFIERLOOSE = R++; -src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*'; -var XRANGEIDENTIFIER = R++; -src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*'; - -var XRANGEPLAIN = R++; -src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' + - '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' + - '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' + - '(?:' + src[PRERELEASE] + ')?' + - src[BUILD] + '?' + - ')?)?'; - -var XRANGEPLAINLOOSE = R++; -src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' + - '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' + - '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' + - '(?:' + src[PRERELEASELOOSE] + ')?' + - src[BUILD] + '?' + - ')?)?'; - -var XRANGE = R++; -src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'; -var XRANGELOOSE = R++; -src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'; - -// Tilde ranges. -// Meaning is "reasonably at or greater than" -var LONETILDE = R++; -src[LONETILDE] = '(?:~>?)'; - -var TILDETRIM = R++; -src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'; -re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g'); -var tildeTrimReplace = '$1~'; - -var TILDE = R++; -src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'; -var TILDELOOSE = R++; -src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'; - -// Caret ranges. -// Meaning is "at least and backwards compatible with" -var LONECARET = R++; -src[LONECARET] = '(?:\\^)'; - -var CARETTRIM = R++; -src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'; -re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g'); -var caretTrimReplace = '$1^'; - -var CARET = R++; -src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'; -var CARETLOOSE = R++; -src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'; - -// A simple gt/lt/eq thing, or just "" to indicate "any version" -var COMPARATORLOOSE = R++; -src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$'; -var COMPARATOR = R++; -src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$'; - - -// An expression to strip any whitespace between the gtlt and the thing -// it modifies, so that `> 1.2.3` ==> `>1.2.3` -var COMPARATORTRIM = R++; -src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] + - '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')'; - -// this one has to use the /g flag -re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g'); -var comparatorTrimReplace = '$1$2$3'; - - -// Something like `1.2.3 - 1.2.4` -// Note that these all use the loose form, because they'll be -// checked against either the strict or loose comparator form -// later. -var HYPHENRANGE = R++; -src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' + - '\\s+-\\s+' + - '(' + src[XRANGEPLAIN] + ')' + - '\\s*$'; - -var HYPHENRANGELOOSE = R++; -src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' + - '\\s+-\\s+' + - '(' + src[XRANGEPLAINLOOSE] + ')' + - '\\s*$'; - -// Star ranges basically just allow anything at all. -var STAR = R++; -src[STAR] = '(<|>)?=?\\s*\\*'; - -// Compile to actual regexp objects. -// All are flag-free, unless they were created above with a flag. -for (var i = 0; i < R; i++) { - debug(i, src[i]); - if (!re[i]) - re[i] = new RegExp(src[i]); -} - -exports.parse = parse; -function parse(version, loose) { - if (version instanceof SemVer) - return version; - - if (typeof version !== 'string') - return null; - - if (version.length > MAX_LENGTH) - return null; - - var r = loose ? re[LOOSE] : re[FULL]; - if (!r.test(version)) - return null; - - try { - return new SemVer(version, loose); - } catch (er) { - return null; - } -} - -exports.valid = valid; -function valid(version, loose) { - var v = parse(version, loose); - return v ? v.version : null; -} - - -exports.clean = clean; -function clean(version, loose) { - var s = parse(version.trim().replace(/^[=v]+/, ''), loose); - return s ? s.version : null; -} - -exports.SemVer = SemVer; - -function SemVer(version, loose) { - if (version instanceof SemVer) { - if (version.loose === loose) - return version; - else - version = version.version; - } else if (typeof version !== 'string') { - throw new TypeError('Invalid Version: ' + version); - } - - if (version.length > MAX_LENGTH) - throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters') - - if (!(this instanceof SemVer)) - return new SemVer(version, loose); - - debug('SemVer', version, loose); - this.loose = loose; - var m = version.trim().match(loose ? re[LOOSE] : re[FULL]); - - if (!m) - throw new TypeError('Invalid Version: ' + version); - - this.raw = version; - - // these are actually numbers - this.major = +m[1]; - this.minor = +m[2]; - this.patch = +m[3]; - - if (this.major > MAX_SAFE_INTEGER || this.major < 0) - throw new TypeError('Invalid major version') - - if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) - throw new TypeError('Invalid minor version') - - if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) - throw new TypeError('Invalid patch version') - - // numberify any prerelease numeric ids - if (!m[4]) - this.prerelease = []; - else - this.prerelease = m[4].split('.').map(function(id) { - if (/^[0-9]+$/.test(id)) { - var num = +id; - if (num >= 0 && num < MAX_SAFE_INTEGER) - return num; - } - return id; - }); - - this.build = m[5] ? m[5].split('.') : []; - this.format(); -} - -SemVer.prototype.format = function() { - this.version = this.major + '.' + this.minor + '.' + this.patch; - if (this.prerelease.length) - this.version += '-' + this.prerelease.join('.'); - return this.version; -}; - -SemVer.prototype.toString = function() { - return this.version; -}; - -SemVer.prototype.compare = function(other) { - debug('SemVer.compare', this.version, this.loose, other); - if (!(other instanceof SemVer)) - other = new SemVer(other, this.loose); - - return this.compareMain(other) || this.comparePre(other); -}; - -SemVer.prototype.compareMain = function(other) { - if (!(other instanceof SemVer)) - other = new SemVer(other, this.loose); - - return compareIdentifiers(this.major, other.major) || - compareIdentifiers(this.minor, other.minor) || - compareIdentifiers(this.patch, other.patch); -}; - -SemVer.prototype.comparePre = function(other) { - if (!(other instanceof SemVer)) - other = new SemVer(other, this.loose); - - // NOT having a prerelease is > having one - if (this.prerelease.length && !other.prerelease.length) - return -1; - else if (!this.prerelease.length && other.prerelease.length) - return 1; - else if (!this.prerelease.length && !other.prerelease.length) - return 0; - - var i = 0; - do { - var a = this.prerelease[i]; - var b = other.prerelease[i]; - debug('prerelease compare', i, a, b); - if (a === undefined && b === undefined) - return 0; - else if (b === undefined) - return 1; - else if (a === undefined) - return -1; - else if (a === b) - continue; - else - return compareIdentifiers(a, b); - } while (++i); -}; - -// preminor will bump the version up to the next minor release, and immediately -// down to pre-release. premajor and prepatch work the same way. -SemVer.prototype.inc = function(release, identifier) { - switch (release) { - case 'premajor': - this.prerelease.length = 0; - this.patch = 0; - this.minor = 0; - this.major++; - this.inc('pre', identifier); - break; - case 'preminor': - this.prerelease.length = 0; - this.patch = 0; - this.minor++; - this.inc('pre', identifier); - break; - case 'prepatch': - // If this is already a prerelease, it will bump to the next version - // drop any prereleases that might already exist, since they are not - // relevant at this point. - this.prerelease.length = 0; - this.inc('patch', identifier); - this.inc('pre', identifier); - break; - // If the input is a non-prerelease version, this acts the same as - // prepatch. - case 'prerelease': - if (this.prerelease.length === 0) - this.inc('patch', identifier); - this.inc('pre', identifier); - break; - - case 'major': - // If this is a pre-major version, bump up to the same major version. - // Otherwise increment major. - // 1.0.0-5 bumps to 1.0.0 - // 1.1.0 bumps to 2.0.0 - if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0) - this.major++; - this.minor = 0; - this.patch = 0; - this.prerelease = []; - break; - case 'minor': - // If this is a pre-minor version, bump up to the same minor version. - // Otherwise increment minor. - // 1.2.0-5 bumps to 1.2.0 - // 1.2.1 bumps to 1.3.0 - if (this.patch !== 0 || this.prerelease.length === 0) - this.minor++; - this.patch = 0; - this.prerelease = []; - break; - case 'patch': - // If this is not a pre-release version, it will increment the patch. - // If it is a pre-release it will bump up to the same patch version. - // 1.2.0-5 patches to 1.2.0 - // 1.2.0 patches to 1.2.1 - if (this.prerelease.length === 0) - this.patch++; - this.prerelease = []; - break; - // This probably shouldn't be used publicly. - // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction. - case 'pre': - if (this.prerelease.length === 0) - this.prerelease = [0]; - else { - var i = this.prerelease.length; - while (--i >= 0) { - if (typeof this.prerelease[i] === 'number') { - this.prerelease[i]++; - i = -2; - } - } - if (i === -1) // didn't increment anything - this.prerelease.push(0); - } - if (identifier) { - // 1.2.0-beta.1 bumps to 1.2.0-beta.2, - // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0 - if (this.prerelease[0] === identifier) { - if (isNaN(this.prerelease[1])) - this.prerelease = [identifier, 0]; - } else - this.prerelease = [identifier, 0]; - } - break; - - default: - throw new Error('invalid increment argument: ' + release); - } - this.format(); - this.raw = this.version; - return this; -}; - -exports.inc = inc; -function inc(version, release, loose, identifier) { - if (typeof(loose) === 'string') { - identifier = loose; - loose = undefined; - } - - try { - return new SemVer(version, loose).inc(release, identifier).version; - } catch (er) { - return null; - } -} - -exports.diff = diff; -function diff(version1, version2) { - if (eq(version1, version2)) { - return null; - } else { - var v1 = parse(version1); - var v2 = parse(version2); - if (v1.prerelease.length || v2.prerelease.length) { - for (var key in v1) { - if (key === 'major' || key === 'minor' || key === 'patch') { - if (v1[key] !== v2[key]) { - return 'pre'+key; - } - } - } - return 'prerelease'; - } - for (var key in v1) { - if (key === 'major' || key === 'minor' || key === 'patch') { - if (v1[key] !== v2[key]) { - return key; - } - } - } - } -} - -exports.compareIdentifiers = compareIdentifiers; - -var numeric = /^[0-9]+$/; -function compareIdentifiers(a, b) { - var anum = numeric.test(a); - var bnum = numeric.test(b); - - if (anum && bnum) { - a = +a; - b = +b; - } - - return (anum && !bnum) ? -1 : - (bnum && !anum) ? 1 : - a < b ? -1 : - a > b ? 1 : - 0; -} - -exports.rcompareIdentifiers = rcompareIdentifiers; -function rcompareIdentifiers(a, b) { - return compareIdentifiers(b, a); -} - -exports.major = major; -function major(a, loose) { - return new SemVer(a, loose).major; -} - -exports.minor = minor; -function minor(a, loose) { - return new SemVer(a, loose).minor; -} - -exports.patch = patch; -function patch(a, loose) { - return new SemVer(a, loose).patch; -} - -exports.compare = compare; -function compare(a, b, loose) { - return new SemVer(a, loose).compare(b); -} - -exports.compareLoose = compareLoose; -function compareLoose(a, b) { - return compare(a, b, true); -} - -exports.rcompare = rcompare; -function rcompare(a, b, loose) { - return compare(b, a, loose); -} - -exports.sort = sort; -function sort(list, loose) { - return list.sort(function(a, b) { - return exports.compare(a, b, loose); - }); -} - -exports.rsort = rsort; -function rsort(list, loose) { - return list.sort(function(a, b) { - return exports.rcompare(a, b, loose); - }); -} - -exports.gt = gt; -function gt(a, b, loose) { - return compare(a, b, loose) > 0; -} - -exports.lt = lt; -function lt(a, b, loose) { - return compare(a, b, loose) < 0; -} - -exports.eq = eq; -function eq(a, b, loose) { - return compare(a, b, loose) === 0; -} - -exports.neq = neq; -function neq(a, b, loose) { - return compare(a, b, loose) !== 0; -} - -exports.gte = gte; -function gte(a, b, loose) { - return compare(a, b, loose) >= 0; -} - -exports.lte = lte; -function lte(a, b, loose) { - return compare(a, b, loose) <= 0; -} - -exports.cmp = cmp; -function cmp(a, op, b, loose) { - var ret; - switch (op) { - case '===': - if (typeof a === 'object') a = a.version; - if (typeof b === 'object') b = b.version; - ret = a === b; - break; - case '!==': - if (typeof a === 'object') a = a.version; - if (typeof b === 'object') b = b.version; - ret = a !== b; - break; - case '': case '=': case '==': ret = eq(a, b, loose); break; - case '!=': ret = neq(a, b, loose); break; - case '>': ret = gt(a, b, loose); break; - case '>=': ret = gte(a, b, loose); break; - case '<': ret = lt(a, b, loose); break; - case '<=': ret = lte(a, b, loose); break; - default: throw new TypeError('Invalid operator: ' + op); - } - return ret; -} - -exports.Comparator = Comparator; -function Comparator(comp, loose) { - if (comp instanceof Comparator) { - if (comp.loose === loose) - return comp; - else - comp = comp.value; - } - - if (!(this instanceof Comparator)) - return new Comparator(comp, loose); - - debug('comparator', comp, loose); - this.loose = loose; - this.parse(comp); - - if (this.semver === ANY) - this.value = ''; - else - this.value = this.operator + this.semver.version; - - debug('comp', this); -} - -var ANY = {}; -Comparator.prototype.parse = function(comp) { - var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]; - var m = comp.match(r); - - if (!m) - throw new TypeError('Invalid comparator: ' + comp); - - this.operator = m[1]; - if (this.operator === '=') - this.operator = ''; - - // if it literally is just '>' or '' then allow anything. - if (!m[2]) - this.semver = ANY; - else - this.semver = new SemVer(m[2], this.loose); -}; - -Comparator.prototype.toString = function() { - return this.value; -}; - -Comparator.prototype.test = function(version) { - debug('Comparator.test', version, this.loose); - - if (this.semver === ANY) - return true; - - if (typeof version === 'string') - version = new SemVer(version, this.loose); - - return cmp(version, this.operator, this.semver, this.loose); -}; - - -exports.Range = Range; -function Range(range, loose) { - if ((range instanceof Range) && range.loose === loose) - return range; - - if (!(this instanceof Range)) - return new Range(range, loose); - - this.loose = loose; - - // First, split based on boolean or || - this.raw = range; - this.set = range.split(/\s*\|\|\s*/).map(function(range) { - return this.parseRange(range.trim()); - }, this).filter(function(c) { - // throw out any that are not relevant for whatever reason - return c.length; - }); - - if (!this.set.length) { - throw new TypeError('Invalid SemVer Range: ' + range); - } - - this.format(); -} - -Range.prototype.format = function() { - this.range = this.set.map(function(comps) { - return comps.join(' ').trim(); - }).join('||').trim(); - return this.range; -}; - -Range.prototype.toString = function() { - return this.range; -}; - -Range.prototype.parseRange = function(range) { - var loose = this.loose; - range = range.trim(); - debug('range', range, loose); - // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4` - var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE]; - range = range.replace(hr, hyphenReplace); - debug('hyphen replace', range); - // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5` - range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace); - debug('comparator trim', range, re[COMPARATORTRIM]); - - // `~ 1.2.3` => `~1.2.3` - range = range.replace(re[TILDETRIM], tildeTrimReplace); - - // `^ 1.2.3` => `^1.2.3` - range = range.replace(re[CARETTRIM], caretTrimReplace); - - // normalize spaces - range = range.split(/\s+/).join(' '); - - // At this point, the range is completely trimmed and - // ready to be split into comparators. - - var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR]; - var set = range.split(' ').map(function(comp) { - return parseComparator(comp, loose); - }).join(' ').split(/\s+/); - if (this.loose) { - // in loose mode, throw out any that are not valid comparators - set = set.filter(function(comp) { - return !!comp.match(compRe); - }); - } - set = set.map(function(comp) { - return new Comparator(comp, loose); - }); - - return set; -}; - -// Mostly just for testing and legacy API reasons -exports.toComparators = toComparators; -function toComparators(range, loose) { - return new Range(range, loose).set.map(function(comp) { - return comp.map(function(c) { - return c.value; - }).join(' ').trim().split(' '); - }); -} - -// comprised of xranges, tildes, stars, and gtlt's at this point. -// already replaced the hyphen ranges -// turn into a set of JUST comparators. -function parseComparator(comp, loose) { - debug('comp', comp); - comp = replaceCarets(comp, loose); - debug('caret', comp); - comp = replaceTildes(comp, loose); - debug('tildes', comp); - comp = replaceXRanges(comp, loose); - debug('xrange', comp); - comp = replaceStars(comp, loose); - debug('stars', comp); - return comp; -} - -function isX(id) { - return !id || id.toLowerCase() === 'x' || id === '*'; -} - -// ~, ~> --> * (any, kinda silly) -// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0 -// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0 -// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0 -// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0 -// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0 -function replaceTildes(comp, loose) { - return comp.trim().split(/\s+/).map(function(comp) { - return replaceTilde(comp, loose); - }).join(' '); -} - -function replaceTilde(comp, loose) { - var r = loose ? re[TILDELOOSE] : re[TILDE]; - return comp.replace(r, function(_, M, m, p, pr) { - debug('tilde', comp, _, M, m, p, pr); - var ret; - - if (isX(M)) - ret = ''; - else if (isX(m)) - ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'; - else if (isX(p)) - // ~1.2 == >=1.2.0 <1.3.0 - ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'; - else if (pr) { - debug('replaceTilde pr', pr); - if (pr.charAt(0) !== '-') - pr = '-' + pr; - ret = '>=' + M + '.' + m + '.' + p + pr + - ' <' + M + '.' + (+m + 1) + '.0'; - } else - // ~1.2.3 == >=1.2.3 <1.3.0 - ret = '>=' + M + '.' + m + '.' + p + - ' <' + M + '.' + (+m + 1) + '.0'; - - debug('tilde return', ret); - return ret; - }); -} - -// ^ --> * (any, kinda silly) -// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0 -// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0 -// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0 -// ^1.2.3 --> >=1.2.3 <2.0.0 -// ^1.2.0 --> >=1.2.0 <2.0.0 -function replaceCarets(comp, loose) { - return comp.trim().split(/\s+/).map(function(comp) { - return replaceCaret(comp, loose); - }).join(' '); -} - -function replaceCaret(comp, loose) { - debug('caret', comp, loose); - var r = loose ? re[CARETLOOSE] : re[CARET]; - return comp.replace(r, function(_, M, m, p, pr) { - debug('caret', comp, _, M, m, p, pr); - var ret; - - if (isX(M)) - ret = ''; - else if (isX(m)) - ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'; - else if (isX(p)) { - if (M === '0') - ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'; - else - ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0'; - } else if (pr) { - debug('replaceCaret pr', pr); - if (pr.charAt(0) !== '-') - pr = '-' + pr; - if (M === '0') { - if (m === '0') - ret = '>=' + M + '.' + m + '.' + p + pr + - ' <' + M + '.' + m + '.' + (+p + 1); - else - ret = '>=' + M + '.' + m + '.' + p + pr + - ' <' + M + '.' + (+m + 1) + '.0'; - } else - ret = '>=' + M + '.' + m + '.' + p + pr + - ' <' + (+M + 1) + '.0.0'; - } else { - debug('no pr'); - if (M === '0') { - if (m === '0') - ret = '>=' + M + '.' + m + '.' + p + - ' <' + M + '.' + m + '.' + (+p + 1); - else - ret = '>=' + M + '.' + m + '.' + p + - ' <' + M + '.' + (+m + 1) + '.0'; - } else - ret = '>=' + M + '.' + m + '.' + p + - ' <' + (+M + 1) + '.0.0'; - } - - debug('caret return', ret); - return ret; - }); -} - -function replaceXRanges(comp, loose) { - debug('replaceXRanges', comp, loose); - return comp.split(/\s+/).map(function(comp) { - return replaceXRange(comp, loose); - }).join(' '); -} - -function replaceXRange(comp, loose) { - comp = comp.trim(); - var r = loose ? re[XRANGELOOSE] : re[XRANGE]; - return comp.replace(r, function(ret, gtlt, M, m, p, pr) { - debug('xRange', comp, ret, gtlt, M, m, p, pr); - var xM = isX(M); - var xm = xM || isX(m); - var xp = xm || isX(p); - var anyX = xp; - - if (gtlt === '=' && anyX) - gtlt = ''; - - if (xM) { - if (gtlt === '>' || gtlt === '<') { - // nothing is allowed - ret = '<0.0.0'; - } else { - // nothing is forbidden - ret = '*'; - } - } else if (gtlt && anyX) { - // replace X with 0 - if (xm) - m = 0; - if (xp) - p = 0; - - if (gtlt === '>') { - // >1 => >=2.0.0 - // >1.2 => >=1.3.0 - // >1.2.3 => >= 1.2.4 - gtlt = '>='; - if (xm) { - M = +M + 1; - m = 0; - p = 0; - } else if (xp) { - m = +m + 1; - p = 0; - } - } else if (gtlt === '<=') { - // <=0.7.x is actually <0.8.0, since any 0.7.x should - // pass. Similarly, <=7.x is actually <8.0.0, etc. - gtlt = '<'; - if (xm) - M = +M + 1; - else - m = +m + 1; - } - - ret = gtlt + M + '.' + m + '.' + p; - } else if (xm) { - ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0'; - } else if (xp) { - ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0'; - } - - debug('xRange return', ret); - - return ret; - }); -} - -// Because * is AND-ed with everything else in the comparator, -// and '' means "any version", just remove the *s entirely. -function replaceStars(comp, loose) { - debug('replaceStars', comp, loose); - // Looseness is ignored here. star is always as loose as it gets! - return comp.trim().replace(re[STAR], ''); -} - -// This function is passed to string.replace(re[HYPHENRANGE]) -// M, m, patch, prerelease, build -// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5 -// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do -// 1.2 - 3.4 => >=1.2.0 <3.5.0 -function hyphenReplace($0, - from, fM, fm, fp, fpr, fb, - to, tM, tm, tp, tpr, tb) { - - if (isX(fM)) - from = ''; - else if (isX(fm)) - from = '>=' + fM + '.0.0'; - else if (isX(fp)) - from = '>=' + fM + '.' + fm + '.0'; - else - from = '>=' + from; - - if (isX(tM)) - to = ''; - else if (isX(tm)) - to = '<' + (+tM + 1) + '.0.0'; - else if (isX(tp)) - to = '<' + tM + '.' + (+tm + 1) + '.0'; - else if (tpr) - to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr; - else - to = '<=' + to; - - return (from + ' ' + to).trim(); -} - - -// if ANY of the sets match ALL of its comparators, then pass -Range.prototype.test = function(version) { - if (!version) - return false; - - if (typeof version === 'string') - version = new SemVer(version, this.loose); - - for (var i = 0; i < this.set.length; i++) { - if (testSet(this.set[i], version)) - return true; - } - return false; -}; - -function testSet(set, version) { - for (var i = 0; i < set.length; i++) { - if (!set[i].test(version)) - return false; - } - - if (version.prerelease.length) { - // Find the set of versions that are allowed to have prereleases - // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0 - // That should allow `1.2.3-pr.2` to pass. - // However, `1.2.4-alpha.notready` should NOT be allowed, - // even though it's within the range set by the comparators. - for (var i = 0; i < set.length; i++) { - debug(set[i].semver); - if (set[i].semver === ANY) - continue; - - if (set[i].semver.prerelease.length > 0) { - var allowed = set[i].semver; - if (allowed.major === version.major && - allowed.minor === version.minor && - allowed.patch === version.patch) - return true; - } - } - - // Version has a -pre, but it's not one of the ones we like. - return false; - } - - return true; -} - -exports.satisfies = satisfies; -function satisfies(version, range, loose) { - try { - range = new Range(range, loose); - } catch (er) { - return false; - } - return range.test(version); -} - -exports.maxSatisfying = maxSatisfying; -function maxSatisfying(versions, range, loose) { - return versions.filter(function(version) { - return satisfies(version, range, loose); - }).sort(function(a, b) { - return rcompare(a, b, loose); - })[0] || null; -} - -exports.minSatisfying = minSatisfying; -function minSatisfying(versions, range, loose) { - return versions.filter(function(version) { - return satisfies(version, range, loose); - }).sort(function(a, b) { - return compare(a, b, loose); - })[0] || null; -} - -exports.validRange = validRange; -function validRange(range, loose) { - try { - // Return '*' instead of '' so that truthiness works. - // This will throw if it's invalid anyway - return new Range(range, loose).range || '*'; - } catch (er) { - return null; - } -} - -// Determine if version is less than all the versions possible in the range -exports.ltr = ltr; -function ltr(version, range, loose) { - return outside(version, range, '<', loose); -} - -// Determine if version is greater than all the versions possible in the range. -exports.gtr = gtr; -function gtr(version, range, loose) { - return outside(version, range, '>', loose); -} - -exports.outside = outside; -function outside(version, range, hilo, loose) { - version = new SemVer(version, loose); - range = new Range(range, loose); - - var gtfn, ltefn, ltfn, comp, ecomp; - switch (hilo) { - case '>': - gtfn = gt; - ltefn = lte; - ltfn = lt; - comp = '>'; - ecomp = '>='; - break; - case '<': - gtfn = lt; - ltefn = gte; - ltfn = gt; - comp = '<'; - ecomp = '<='; - break; - default: - throw new TypeError('Must provide a hilo val of "<" or ">"'); - } - - // If it satisifes the range it is not outside - if (satisfies(version, range, loose)) { - return false; - } - - // From now on, variable terms are as if we're in "gtr" mode. - // but note that everything is flipped for the "ltr" function. - - for (var i = 0; i < range.set.length; ++i) { - var comparators = range.set[i]; - - var high = null; - var low = null; - - comparators.forEach(function(comparator) { - if (comparator.semver === ANY) { - comparator = new Comparator('>=0.0.0') - } - high = high || comparator; - low = low || comparator; - if (gtfn(comparator.semver, high.semver, loose)) { - high = comparator; - } else if (ltfn(comparator.semver, low.semver, loose)) { - low = comparator; - } - }); - - // If the edge version comparator has a operator then our version - // isn't outside it - if (high.operator === comp || high.operator === ecomp) { - return false; - } - - // If the lowest version comparator has an operator and our version - // is less than it then it isn't higher than the range - if ((!low.operator || low.operator === comp) && - ltefn(version, low.semver)) { - return false; - } else if (low.operator === ecomp && ltfn(version, low.semver)) { - return false; - } - } - return true; -} - -exports.prerelease = prerelease; -function prerelease(version, loose) { - var parsed = parse(version, loose); - return (parsed && parsed.prerelease.length) ? parsed.prerelease : null; -} diff --git a/deps/npm/node_modules/node-gyp/package.json b/deps/npm/node_modules/node-gyp/package.json index a5a39e3f2ba925..4638db5a3f4a30 100644 --- a/deps/npm/node_modules/node-gyp/package.json +++ b/deps/npm/node_modules/node-gyp/package.json @@ -1,63 +1,61 @@ { - "_from": "node-gyp@5.0.5", - "_id": "node-gyp@5.0.5", + "_from": "node-gyp@5.1.0", + "_id": "node-gyp@5.1.0", "_inBundle": false, - "_integrity": "sha512-WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw==", + "_integrity": "sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==", "_location": "/node-gyp", - "_phantomChildren": { - "abbrev": "1.1.1" - }, + "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "node-gyp@5.0.5", + "raw": "node-gyp@5.1.0", "name": "node-gyp", "escapedName": "node-gyp", - "rawSpec": "5.0.5", + "rawSpec": "5.1.0", "saveSpec": null, - "fetchSpec": "5.0.5" + "fetchSpec": "5.1.0" }, "_requiredBy": [ "#USER", "/", "/npm-lifecycle" ], - "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.5.tgz", - "_shasum": "f6cf1da246eb8c42b097d7cd4d6c3ce23a4163af", - "_spec": "node-gyp@5.0.5", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.0.tgz", + "_shasum": "8e31260a7af4a2e2f994b0673d4e0b3866156332", + "_spec": "node-gyp@5.1.0", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", "url": "http://tootallnate.net" }, "bin": { - "node-gyp": "./bin/node-gyp.js" + "node-gyp": "bin/node-gyp.js" }, "bugs": { "url": "https://github.com/nodejs/node-gyp/issues" }, "bundleDependencies": false, "dependencies": { - "env-paths": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.2", + "mkdirp": "^0.5.1", + "nopt": "^4.0.1", + "npmlog": "^4.1.2", + "request": "^2.88.0", + "rimraf": "^2.6.3", + "semver": "^5.7.1", "tar": "^4.4.12", - "which": "1" + "which": "^1.3.1" }, "deprecated": false, "description": "Node.js native addon build tool", "devDependencies": { - "bindings": "~1.2.1", - "nan": "^2.0.0", - "require-inject": "~1.3.0", - "standard": "~14.3.1", + "bindings": "^1.5.0", + "nan": "^2.14.0", + "require-inject": "^1.4.4", + "standard": "^14.3.1", "tap": "~12.7.0" }, "engines": { @@ -86,5 +84,5 @@ "lint": "standard */*.js test/**/*.js", "test": "npm run lint && tap --timeout=120 test/test-*" }, - "version": "5.0.5" + "version": "5.1.0" } diff --git a/deps/npm/node_modules/node-gyp/test/common.js b/deps/npm/node_modules/node-gyp/test/common.js new file mode 100644 index 00000000000000..b714ee29029d36 --- /dev/null +++ b/deps/npm/node_modules/node-gyp/test/common.js @@ -0,0 +1,3 @@ +const envPaths = require('env-paths') + +module.exports.devDir = () => envPaths('node-gyp', { suffix: '' }).cache diff --git a/deps/npm/node_modules/node-gyp/test/docker.sh b/deps/npm/node_modules/node-gyp/test/docker.sh deleted file mode 100755 index 67014209d00038..00000000000000 --- a/deps/npm/node_modules/node-gyp/test/docker.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash - -#set -e - -test_node_versions="6.17.0 8.15.1 10.15.3 11.12.0" - -myuid=$(id -u) -mygid=$(id -g) -__dirname="$(CDPATH= cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -dot_node_gyp=${__dirname}/.node-gyp/ - -# borrows from https://github.com/rvagg/dnt/ - -# Simple setup function for a container: -# setup_container(image id, base image, commands to run to set up) -setup_container() { - local container_id="$1" - local base_container="$2" - local run_cmd="$3" - - # Does this image exist? If yes, ignore - docker inspect "$container_id" &> /dev/null - if [[ $? -eq 0 ]]; then - echo "Found existing container [$container_id]" - else - # No such image, so make it - echo "Did not find container [$container_id], creating..." - docker run -i $base_container /bin/bash -c "$run_cmd" - sleep 2 - docker commit $(docker ps -l -q) $container_id - fi -} - -# Run tests inside each of the versioned containers, copy cwd into npm's copy of node-gyp -# so it'll be invoked by npm when a compile is needed -# run_tests(version, test-commands) -run_tests() { - local version="$1" - local run_cmd="$2" - - run_cmd="rsync -aAXx --delete --exclude .git --exclude build /node-gyp-src/ /usr/lib/node_modules/npm/node_modules/node-gyp/; - /bin/su -s /bin/bash node-gyp -c 'cd && ${run_cmd}'" - - rm -rf $dot_node_gyp - mkdir $dot_node_gyp - - docker run \ - --rm -i \ - -v ~/.npm/:/node-gyp/.npm/ \ - -v ${dot_node_gyp}:/node-gyp/.node-gyp/ \ - -v $(pwd):/node-gyp-src/:ro \ - node-gyp-test/${version} /bin/bash -c "${run_cmd}" -} - -# A base image with build tools and a user account -setup_container "node-gyp-test/base" "ubuntu:14.04" " - adduser --gecos node-gyp --home /node-gyp/ --disabled-login node-gyp --uid $myuid && - echo "node-gyp:node-gyp" | chpasswd && - apt-get update && - apt-get install -y build-essential python git rsync curl -" - -# An image on top of the base containing clones of repos we want to use for testing -setup_container "node-gyp-test/clones" "node-gyp-test/base" " - cd /node-gyp/ && git clone https://github.com/justmoon/node-bignum.git && - cd /node-gyp/ && git clone https://github.com/bnoordhuis/node-buffertools.git && - chown -R node-gyp.node-gyp /node-gyp/ -" - -# An image for each of the node versions we want to test with that version installed and the latest npm -for v in $test_node_versions; do - setup_container "node-gyp-test/${v}" "node-gyp-test/clones" " - curl -sL https://nodejs.org/dist/v${v}/node-v${v}-linux-x64.tar.gz | tar -zxv --strip-components=1 -C /usr/ && - npm install npm@latest -g && - node -v && npm -v - " -done - -# Test use of --target=x.y.z to compile against alternate versions -test_download_node_version() { - local run_with_ver="$1" - local expected_dir="$2" - local expected_ver="$3" - run_tests $run_with_ver "cd node-buffertools && npm install --loglevel=info --target=${expected_ver}" - local node_ver=$(cat "${dot_node_gyp}${expected_dir}/node_version.h" | grep '#define NODE_\w*_VERSION [0-9]*$') - node_ver=$(echo $node_ver | sed 's/#define NODE_[A-Z]*_VERSION //g' | sed 's/ /./g') - if [ "X$(echo $node_ver)" != "X${expected_ver}" ]; then - echo "Did not download v${expected_ver} using --target, instead got: $(echo $node_ver)" - exit 1 - fi - echo "Verified correct download of [v${node_ver}]" -} - -test_download_node_version "0.12.7" "0.10.30/src" "0.10.30" -# should download the headers file -test_download_node_version "4.3.0" "4.3.0/include/node" "4.3.0" -test_download_node_version "5.6.0" "5.6.0/include/node" "5.6.0" - -# TODO: test --dist-url by starting up a localhost server and serving up tarballs - -# testing --dist-url, using simple-proxy.js to make localhost work as a distribution -# point for tarballs -# we can test whether it uses the proxy because after 2 connections the proxy will -# die and therefore should not be running at the end of the test, `nc` can tell us this -run_tests "0.12.7" " - (node /node-gyp-src/test/simple-proxy.js 8080 /boombar/ https://nodejs.org/dist/ &) && - cd node-buffertools && - NODEJS_ORG_MIRROR=http://localhost:8080/boombar/ /node-gyp-src/bin/node-gyp.js --loglevel=info rebuild && - nc -z localhost 8080 && echo -e \"\\n\\n\\033[31mFAILED TO USE LOCAL PROXY\\033[39m\\n\\n\" -" - -rm -rf $dot_node_gyp diff --git a/deps/npm/node_modules/node-gyp/test/test-configure-python.js b/deps/npm/node_modules/node-gyp/test/test-configure-python.js index 518bf036d0ecb3..d08f9e5ed38efd 100644 --- a/deps/npm/node_modules/node-gyp/test/test-configure-python.js +++ b/deps/npm/node_modules/node-gyp/test/test-configure-python.js @@ -2,6 +2,7 @@ const test = require('tap').test const path = require('path') +const devDir = require('./common').devDir() const gyp = require('../lib/node-gyp') const requireInject = require('require-inject') const configure = requireInject('../lib/configure', { @@ -30,6 +31,7 @@ test('configure PYTHONPATH with no existing env', function (t) { t.equal(process.env.PYTHONPATH, EXPECTED_PYPATH) return SPAWN_RESULT } + prog.devDir = devDir configure(prog, [], t.fail) }) @@ -49,6 +51,7 @@ test('configure PYTHONPATH with existing env of one dir', function (t) { return SPAWN_RESULT } + prog.devDir = devDir configure(prog, [], t.fail) }) @@ -70,5 +73,6 @@ test('configure PYTHONPATH with existing env of multiple dirs', function (t) { return SPAWN_RESULT } + prog.devDir = devDir configure(prog, [], t.fail) }) diff --git a/deps/npm/node_modules/node-gyp/test/test-download.js b/deps/npm/node_modules/node-gyp/test/test-download.js index dbffb20246267b..fe373e3280ce66 100644 --- a/deps/npm/node_modules/node-gyp/test/test-download.js +++ b/deps/npm/node_modules/node-gyp/test/test-download.js @@ -6,8 +6,13 @@ const path = require('path') const http = require('http') const https = require('https') const install = require('../lib/install') +const semver = require('semver') +const devDir = require('./common').devDir() +const rimraf = require('rimraf') +const gyp = require('../lib/node-gyp') +const log = require('npmlog') -require('npmlog').level = 'warn' +log.level = 'warn' test('download over http', function (t) { t.plan(2) @@ -85,6 +90,101 @@ test('download over https with custom ca', function (t) { }) }) +test('download over http with proxy', function (t) { + t.plan(2) + + var server = http.createServer(function (req, res) { + t.strictEqual(req.headers['user-agent'], + 'node-gyp v42 (node ' + process.version + ')') + res.end('ok') + pserver.close(function () { + server.close() + }) + }) + + var pserver = http.createServer(function (req, res) { + t.strictEqual(req.headers['user-agent'], + 'node-gyp v42 (node ' + process.version + ')') + res.end('proxy ok') + server.close(function () { + pserver.close() + }) + }) + + var host = 'localhost' + server.listen(0, host, function () { + var port = this.address().port + pserver.listen(port + 1, host, function () { + var gyp = { + opts: { + proxy: 'http://' + host + ':' + (port + 1) + }, + version: '42' + } + var url = 'http://' + host + ':' + port + var req = install.test.download(gyp, {}, url) + req.on('response', function (res) { + var body = '' + res.setEncoding('utf8') + res.on('data', function (data) { + body += data + }) + res.on('end', function () { + t.strictEqual(body, 'proxy ok') + }) + }) + }) + }) +}) + +test('download over http with noproxy', function (t) { + t.plan(2) + + var server = http.createServer(function (req, res) { + t.strictEqual(req.headers['user-agent'], + 'node-gyp v42 (node ' + process.version + ')') + res.end('ok') + pserver.close(function () { + server.close() + }) + }) + + var pserver = http.createServer(function (req, res) { + t.strictEqual(req.headers['user-agent'], + 'node-gyp v42 (node ' + process.version + ')') + res.end('proxy ok') + server.close(function () { + pserver.close() + }) + }) + + var host = 'localhost' + server.listen(0, host, function () { + var port = this.address().port + pserver.listen(port + 1, host, function () { + var gyp = { + opts: { + proxy: 'http://' + host + ':' + (port + 1), + noproxy: 'localhost' + }, + version: '42' + } + var url = 'http://' + host + ':' + port + var req = install.test.download(gyp, {}, url) + req.on('response', function (res) { + var body = '' + res.setEncoding('utf8') + res.on('data', function (data) { + body += data + }) + res.on('end', function () { + t.strictEqual(body, 'ok') + }) + }) + }) + }) +}) + test('download with missing cafile', function (t) { t.plan(1) var gyp = { @@ -103,3 +203,66 @@ test('check certificate splitting', function (t) { t.strictEqual(cas.length, 2) t.notStrictEqual(cas[0], cas[1]) }) + +// only run this test if we are running a version of Node with predictable version path behavior + +test('download headers (actual)', function (t) { + if (process.env.FAST_TEST || + process.release.name !== 'node' || + semver.prerelease(process.version) !== null || + semver.satisfies(process.version, '<10')) { + return t.skip('Skipping actual download of headers due to test environment configuration') + } + + t.plan(17) + + const expectedDir = path.join(devDir, process.version.replace(/^v/, '')) + rimraf(expectedDir, (err) => { + t.ifError(err) + + const prog = gyp() + prog.parseArgv([]) + prog.devDir = devDir + log.level = 'warn' + install(prog, [], (err) => { + t.ifError(err) + + fs.readFile(path.join(expectedDir, 'installVersion'), 'utf8', (err, data) => { + t.ifError(err) + t.strictEqual(data, '9\n', 'correct installVersion') + }) + + fs.readdir(path.join(expectedDir, 'include/node'), (err, list) => { + t.ifError(err) + + t.ok(list.includes('common.gypi')) + t.ok(list.includes('config.gypi')) + t.ok(list.includes('node.h')) + t.ok(list.includes('node_version.h')) + t.ok(list.includes('openssl')) + t.ok(list.includes('uv')) + t.ok(list.includes('uv.h')) + t.ok(list.includes('v8-platform.h')) + t.ok(list.includes('v8.h')) + t.ok(list.includes('zlib.h')) + }) + + fs.readFile(path.join(expectedDir, 'include/node/node_version.h'), 'utf8', (err, contents) => { + t.ifError(err) + + const lines = contents.split('\n') + + // extract the 3 version parts from the defines to build a valid version string and + // and check them against our current env version + const version = ['major', 'minor', 'patch'].reduce((version, type) => { + const re = new RegExp(`^#define\\sNODE_${type.toUpperCase()}_VERSION`) + const line = lines.find((l) => re.test(l)) + const i = line ? parseInt(line.replace(/^[^0-9]+([0-9]+).*$/, '$1'), 10) : 'ERROR' + return `${version}${type !== 'major' ? '.' : 'v'}${i}` + }, '') + + t.strictEqual(version, process.version) + }) + }) + }) +}) diff --git a/deps/npm/node_modules/npm-packlist/package.json b/deps/npm/node_modules/npm-packlist/package.json index c022dcef65b515..693c51b96140da 100644 --- a/deps/npm/node_modules/npm-packlist/package.json +++ b/deps/npm/node_modules/npm-packlist/package.json @@ -1,29 +1,29 @@ { - "_from": "npm-packlist@1.4.7", - "_id": "npm-packlist@1.4.7", + "_from": "npm-packlist@1.4.8", + "_id": "npm-packlist@1.4.8", "_inBundle": false, - "_integrity": "sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==", + "_integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", "_location": "/npm-packlist", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "npm-packlist@1.4.7", + "raw": "npm-packlist@1.4.8", "name": "npm-packlist", "escapedName": "npm-packlist", - "rawSpec": "1.4.7", + "rawSpec": "1.4.8", "saveSpec": null, - "fetchSpec": "1.4.7" + "fetchSpec": "1.4.8" }, "_requiredBy": [ "#USER", "/", "/pacote" ], - "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz", - "_shasum": "9e954365a06b80b18111ea900945af4f88ed4848", - "_spec": "npm-packlist@1.4.7", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "_shasum": "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e", + "_spec": "npm-packlist@1.4.8", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -35,7 +35,8 @@ "bundleDependencies": false, "dependencies": { "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" }, "deprecated": false, "description": "Get a list of the files to add from a folder into an npm package", @@ -71,5 +72,5 @@ "tap": { "jobs": 1 }, - "version": "1.4.7" + "version": "1.4.8" } diff --git a/deps/npm/node_modules/npm-profile/index.js b/deps/npm/node_modules/npm-profile/index.js index b7f753fb4d41da..d9c48c131bc927 100644 --- a/deps/npm/node_modules/npm-profile/index.js +++ b/deps/npm/node_modules/npm-profile/index.js @@ -1,7 +1,7 @@ 'use strict' const fetch = require('npm-registry-fetch') -const {HttpErrorBase} = require('npm-registry-fetch/errors.js') +const { HttpErrorBase } = require('npm-registry-fetch/errors.js') const os = require('os') const pudding = require('figgy-pudding') const validate = require('aproba') @@ -18,6 +18,16 @@ exports.listTokens = listTokens exports.removeToken = removeToken exports.createToken = createToken +const url = require('url') + +const isValidUrl = u => { + if (u && typeof u === 'string') { + const p = url.parse(u) + return p.slashes && p.host && p.path && /^https?:$/.test(p.protocol) + } + return false +} + const ProfileConfig = pudding({ creds: {}, hostname: {}, @@ -76,21 +86,16 @@ function webAuth (opener, opts, body) { })).then(res => { return Promise.all([res, res.json()]) }).then(([res, content]) => { - const {doneUrl, loginUrl} = content + const { doneUrl, loginUrl } = content process.emit('log', 'verbose', 'web auth', 'got response', content) - if ( - typeof doneUrl !== 'string' || - typeof loginUrl !== 'string' || - !doneUrl || - !loginUrl - ) { + if (!isValidUrl(doneUrl) || !isValidUrl(loginUrl)) { throw new WebLoginInvalidResponse('POST', res, content) } return content - }).then(({doneUrl, loginUrl}) => { + }).then(({ doneUrl, loginUrl }) => { process.emit('log', 'verbose', 'web auth', 'opening url pair') return opener(loginUrl).then( - () => webAuthCheckLogin(doneUrl, opts.concat({cache: false})) + () => webAuthCheckLogin(doneUrl, opts.concat({ cache: false })) ) }).catch(er => { if ((er.statusCode >= 400 && er.statusCode <= 499) || er.statusCode === 500) { @@ -183,7 +188,7 @@ function loginCouch (username, password, opts) { } if (err.code !== 'E409') throw err return fetch.json(target, opts.concat({ - query: {write: true} + query: { write: true } })).then(result => { Object.keys(result).forEach(function (k) { if (!body[k] || k === 'roles') { diff --git a/deps/npm/node_modules/npm-profile/package.json b/deps/npm/node_modules/npm-profile/package.json index 2f252aac85ab0d..e90e16ddf975d9 100644 --- a/deps/npm/node_modules/npm-profile/package.json +++ b/deps/npm/node_modules/npm-profile/package.json @@ -1,28 +1,29 @@ { - "_from": "npm-profile@4.0.2", - "_id": "npm-profile@4.0.2", + "_from": "npm-profile@4.0.4", + "_id": "npm-profile@4.0.4", "_inBundle": false, - "_integrity": "sha512-VRsC04pvRH+9cF+PoVh2nTmJjiG21yu59IHpsBpkxk+jaGAV8lxx96G4SDc0jOHAkfWLXbc6kIph3dGAuRnotQ==", + "_integrity": "sha512-Ta8xq8TLMpqssF0H60BXS1A90iMoM6GeKwsmravJ6wYjWwSzcYBTdyWa3DZCYqPutacBMEm7cxiOkiIeCUAHDQ==", "_location": "/npm-profile", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "npm-profile@4.0.2", + "raw": "npm-profile@4.0.4", "name": "npm-profile", "escapedName": "npm-profile", - "rawSpec": "4.0.2", + "rawSpec": "4.0.4", "saveSpec": null, - "fetchSpec": "4.0.2" + "fetchSpec": "4.0.4" }, "_requiredBy": [ "#USER", - "/" + "/", + "/libnpm" ], - "_resolved": "https://registry.npmjs.org/npm-profile/-/npm-profile-4.0.2.tgz", - "_shasum": "8272a71c19634d0dce9c35a5daf8ee589cbb0f52", - "_spec": "npm-profile@4.0.2", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/npm-profile/-/npm-profile-4.0.4.tgz", + "_shasum": "28ee94390e936df6d084263ee2061336a6a1581b", + "_spec": "npm-profile@4.0.4", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "author": { "name": "Rebecca Turner", "email": "me@re-becca.org", @@ -48,9 +49,12 @@ "license": "ISC", "main": "index.js", "name": "npm-profile", + "publishConfig": { + "tag": "legacy-v4" + }, "repository": { "type": "git", "url": "git+https://github.com/npm/npm-profile.git" }, - "version": "4.0.2" + "version": "4.0.4" } diff --git a/deps/npm/node_modules/npm-registry-fetch/CHANGELOG.md b/deps/npm/node_modules/npm-registry-fetch/CHANGELOG.md index 8eee50a4790a3c..3599c6b2fcac1b 100644 --- a/deps/npm/node_modules/npm-registry-fetch/CHANGELOG.md +++ b/deps/npm/node_modules/npm-registry-fetch/CHANGELOG.md @@ -2,6 +2,17 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [4.0.3](https://github.com/npm/registry-fetch/compare/v4.0.2...v4.0.3) (2020-02-13) + + +### Bug Fixes + +* always bypass cache when ?write=true ([ba8b4fe](https://github.com/npm/registry-fetch/commit/ba8b4fe)) +* use 30s default for timeout as per README ([69c2977](https://github.com/npm/registry-fetch/commit/69c2977)), closes [#20](https://github.com/npm/registry-fetch/issues/20) + + + ## [4.0.2](https://github.com/npm/registry-fetch/compare/v4.0.0...v4.0.2) (2019-10-04) diff --git a/deps/npm/node_modules/npm-registry-fetch/README.md b/deps/npm/node_modules/npm-registry-fetch/README.md index 0c3f4f9469955b..80ce64cda78efe 100644 --- a/deps/npm/node_modules/npm-registry-fetch/README.md +++ b/deps/npm/node_modules/npm-registry-fetch/README.md @@ -50,6 +50,25 @@ Happy hacking! ### API +#### Caching and `write=true` query strings + +Before performing any PUT or DELETE operation, npm clients first make a +GET request to the registry resource being updated, which includes +the query string `?write=true`. + +The semantics of this are, effectively, "I intend to write to this thing, +and need to know the latest current value, so that my write can land +cleanly". + +The public npm registry handles these `?write=true` requests by ensuring +that the cache is re-validated before sending a response. In order to +maintain the same behavior on the client, and not get tripped up by an +overeager local cache when we intend to write data to the registry, any +request that comes through `npm-registry-fetch` that contains `write=true` +in the query string will forcibly set the `prefer-online` option to `true`, +and set both `prefer-offline` and `offline` to false, so that any local +cached value will be revalidated. + #### `> fetch(url, [opts]) -> Promise` Performs a request to a given URL. @@ -391,6 +410,9 @@ Force offline mode: no network requests will be done during install. To allow This option is only really useful if you're also using [`opts.cache`](#opts-cache). +This option is set to `true` when the request includes `write=true` in the +query string. + ##### `opts.otp` * Type: Number | String @@ -402,7 +424,7 @@ account. ##### `opts.password` -* Alias: _password +* Alias: `_password` * Type: String * Default: null @@ -432,6 +454,9 @@ will be requested from the server. To force full offline mode, use This option is generally only useful if you're also using [`opts.cache`](#opts-cache). +This option is set to `false` when the request includes `write=true` in the +query string. + ##### `opts.prefer-online` * Type: Boolean @@ -443,6 +468,8 @@ for updates immediately even for fresh package data. This option is generally only useful if you're also using [`opts.cache`](#opts-cache). +This option is set to `true` when the request includes `write=true` in the +query string. ##### `opts.project-scope` @@ -606,4 +633,4 @@ See also [`opts.password`](#opts-password) * Default: null ** DEPRECATED ** This is a legacy authentication token supported only for -*compatibility. Please use [`opts.token`](#opts-token) instead. +compatibility. Please use [`opts.token`](#opts-token) instead. diff --git a/deps/npm/node_modules/npm-registry-fetch/config.js b/deps/npm/node_modules/npm-registry-fetch/config.js index 1c43b26eadd4c4..d7be3f9b38a167 100644 --- a/deps/npm/node_modules/npm-registry-fetch/config.js +++ b/deps/npm/node_modules/npm-registry-fetch/config.js @@ -75,7 +75,9 @@ module.exports = figgyPudding({ 'scope': {}, 'spec': {}, 'strict-ssl': {}, - 'timeout': {}, + 'timeout': { + default: 30 * 1000 + }, 'user-agent': { default: `${ pkg.name diff --git a/deps/npm/node_modules/npm-registry-fetch/index.js b/deps/npm/node_modules/npm-registry-fetch/index.js index c18487388b269f..9bd0ad32d7c9e9 100644 --- a/deps/npm/node_modules/npm-registry-fetch/index.js +++ b/deps/npm/node_modules/npm-registry-fetch/index.js @@ -53,26 +53,38 @@ function regFetch (uri, opts) { }) } } - if (opts.query) { - let q = opts.query + + let q = opts.query + if (q) { if (typeof q === 'string') { q = qs.parse(q) + } else if (typeof q !== 'object') { + throw new TypeError('invalid query option, must be string or object') } Object.keys(q).forEach(key => { if (q[key] === undefined) { delete q[key] } }) - if (Object.keys(q).length) { - const parsed = url.parse(uri) - parsed.search = '?' + qs.stringify( - parsed.query - ? Object.assign(qs.parse(parsed.query), q) - : q - ) - uri = url.format(parsed) + } + const parsed = url.parse(uri) + + const query = parsed.query ? Object.assign(qs.parse(parsed.query), q || {}) + : Object.keys(q || {}).length ? q + : null + + if (query) { + if (String(query.write) === 'true' && opts.method === 'GET') { + opts = opts.concat({ + offline: false, + 'prefer-offline': false, + 'prefer-online': true + }) } + parsed.search = '?' + qs.stringify(query) + uri = url.format(parsed) } + return opts.Promise.resolve(body).then(body => fetch(uri, { agent: opts.agent, algorithms: opts.algorithms, diff --git a/deps/npm/node_modules/npm-registry-fetch/package.json b/deps/npm/node_modules/npm-registry-fetch/package.json index 78e3100daa47f9..ca6c5f90c63527 100644 --- a/deps/npm/node_modules/npm-registry-fetch/package.json +++ b/deps/npm/node_modules/npm-registry-fetch/package.json @@ -1,19 +1,19 @@ { - "_from": "npm-registry-fetch@4.0.2", - "_id": "npm-registry-fetch@4.0.2", + "_from": "npm-registry-fetch@4.0.3", + "_id": "npm-registry-fetch@4.0.3", "_inBundle": false, - "_integrity": "sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==", + "_integrity": "sha512-WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==", "_location": "/npm-registry-fetch", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "npm-registry-fetch@4.0.2", + "raw": "npm-registry-fetch@4.0.3", "name": "npm-registry-fetch", "escapedName": "npm-registry-fetch", - "rawSpec": "4.0.2", + "rawSpec": "4.0.3", "saveSpec": null, - "fetchSpec": "4.0.2" + "fetchSpec": "4.0.3" }, "_requiredBy": [ "#USER", @@ -28,10 +28,10 @@ "/npm-profile", "/pacote" ], - "_resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz", - "_shasum": "2b1434f93ccbe6b6385f8e45f45db93e16921d7a", - "_spec": "npm-registry-fetch@4.0.2", - "_where": "/Users/mperrotte/npminc/cli", + "_resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz", + "_shasum": "3c2179e39e04f9348b1c2979545951d36bee8766", + "_spec": "npm-registry-fetch@4.0.3", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "author": { "name": "Kat Marchán", "email": "kzm@sykosomatic.org" @@ -86,6 +86,9 @@ "license": "ISC", "main": "index.js", "name": "npm-registry-fetch", + "publishConfig": { + "tag": "latest-v4" + }, "repository": { "type": "git", "url": "git+https://github.com/npm/registry-fetch.git" @@ -99,5 +102,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "4.0.2" + "version": "4.0.3" } diff --git a/deps/npm/node_modules/os-locale/index.js b/deps/npm/node_modules/os-locale/index.js index 1ada7a4949c7c6..8c73c99f20e2f1 100644 --- a/deps/npm/node_modules/os-locale/index.js +++ b/deps/npm/node_modules/os-locale/index.js @@ -3,33 +3,51 @@ const execa = require('execa'); const lcid = require('lcid'); const mem = require('mem'); -const defaultOpts = {spawn: true}; +const defaultOptions = {spawn: true}; const defaultLocale = 'en_US'; -function getEnvLocale(env) { - env = env || process.env; +function getEnvLocale(env = process.env) { return env.LC_ALL || env.LC_MESSAGES || env.LANG || env.LANGUAGE; } -function parseLocale(x) { - const env = x.split('\n').reduce((env, def) => { - def = def.split('='); - env[def[0]] = def[1].replace(/^"|"$/g, ''); +function parseLocale(string) { + const env = string.split('\n').reduce((env, def) => { + const [key, value] = def.split('='); + env[key] = value.replace(/^"|"$/g, ''); return env; }, {}); + return getEnvLocale(env); } -function getLocale(str) { - return (str && str.replace(/[.:].*/, '')); +function getLocale(string) { + return (string && string.replace(/[.:].*/, '')); +} + +function getLocales() { + return execa.stdout('locale', ['-a']); +} + +function getLocalesSync() { + return execa.sync('locale', ['-a']).stdout; +} + +function getSupportedLocale(locale, locales = '') { + return locales.includes(locale) ? locale : defaultLocale; } function getAppleLocale() { - return execa.stdout('defaults', ['read', '-g', 'AppleLocale']); + return Promise.all([ + execa.stdout('defaults', ['read', '-globalDomain', 'AppleLocale']), + getLocales() + ]).then(results => getSupportedLocale(results[0], results[1])); } function getAppleLocaleSync() { - return execa.sync('defaults', ['read', '-g', 'AppleLocale']).stdout; + return getSupportedLocale( + execa.sync('defaults', ['read', '-globalDomain', 'AppleLocale']).stdout, + getLocalesSync() + ); } function getUnixLocale() { @@ -58,17 +76,16 @@ function getWinLocale() { } function getWinLocaleSync() { - const stdout = execa.sync('wmic', ['os', 'get', 'locale']).stdout; + const {stdout} = execa.sync('wmic', ['os', 'get', 'locale']); const lcidCode = parseInt(stdout.replace('Locale', ''), 16); return lcid.from(lcidCode); } -module.exports = mem(opts => { - opts = opts || defaultOpts; +module.exports = mem((options = defaultOptions) => { const envLocale = getEnvLocale(); - let thenable; - if (envLocale || opts.spawn === false) { + let thenable; + if (envLocale || options.spawn === false) { thenable = Promise.resolve(getLocale(envLocale)); } else if (process.platform === 'win32') { thenable = getWinLocale(); @@ -76,25 +93,21 @@ module.exports = mem(opts => { thenable = getUnixLocale(); } - return thenable.then(locale => locale || defaultLocale) + return thenable + .then(locale => locale || defaultLocale) .catch(() => defaultLocale); }); -module.exports.sync = mem(opts => { - opts = opts || defaultOpts; +module.exports.sync = mem((options = defaultOptions) => { const envLocale = getEnvLocale(); - let res; - if (envLocale || opts.spawn === false) { + let res; + if (envLocale || options.spawn === false) { res = getLocale(envLocale); } else { try { - if (process.platform === 'win32') { - res = getWinLocaleSync(); - } else { - res = getUnixLocaleSync(); - } - } catch (err) {} + res = process.platform === 'win32' ? getWinLocaleSync() : getUnixLocaleSync(); + } catch (_) {} } return res || defaultLocale; diff --git a/deps/npm/node_modules/os-locale/license b/deps/npm/node_modules/os-locale/license index 654d0bfe943437..e7af2f77107d73 100644 --- a/deps/npm/node_modules/os-locale/license +++ b/deps/npm/node_modules/os-locale/license @@ -1,21 +1,9 @@ -The MIT License (MIT) +MIT License Copyright (c) Sindre Sorhus (sindresorhus.com) -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: +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 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. +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. diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/CHANGELOG.md b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/CHANGELOG.md new file mode 100644 index 00000000000000..ded9620b18d252 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/CHANGELOG.md @@ -0,0 +1,100 @@ +# Change Log + +All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + + +## [6.0.5](https://github.com/moxystudio/node-cross-spawn/compare/v6.0.4...v6.0.5) (2018-03-02) + + +### Bug Fixes + +* avoid using deprecated Buffer constructor ([#94](https://github.com/moxystudio/node-cross-spawn/issues/94)) ([d5770df](https://github.com/moxystudio/node-cross-spawn/commit/d5770df)), closes [/nodejs.org/api/deprecations.html#deprecations_dep0005](https://github.com//nodejs.org/api/deprecations.html/issues/deprecations_dep0005) + + + + +## [6.0.4](https://github.com/moxystudio/node-cross-spawn/compare/v6.0.3...v6.0.4) (2018-01-31) + + +### Bug Fixes + +* fix paths being incorrectly normalized on unix ([06ee3c6](https://github.com/moxystudio/node-cross-spawn/commit/06ee3c6)), closes [#90](https://github.com/moxystudio/node-cross-spawn/issues/90) + + + + +## [6.0.3](https://github.com/moxystudio/node-cross-spawn/compare/v6.0.2...v6.0.3) (2018-01-23) + + + + +## [6.0.2](https://github.com/moxystudio/node-cross-spawn/compare/v6.0.1...v6.0.2) (2018-01-23) + + + + +## [6.0.1](https://github.com/moxystudio/node-cross-spawn/compare/v6.0.0...v6.0.1) (2018-01-23) + + + + +# [6.0.0](https://github.com/moxystudio/node-cross-spawn/compare/5.1.0...6.0.0) (2018-01-23) + + +### Bug Fixes + +* fix certain arguments not being correctly escaped or causing batch syntax error ([900cf10](https://github.com/moxystudio/node-cross-spawn/commit/900cf10)), closes [#82](https://github.com/moxystudio/node-cross-spawn/issues/82) [#51](https://github.com/moxystudio/node-cross-spawn/issues/51) +* fix commands as posix relatixe paths not working correctly, e.g.: `./my-command` ([900cf10](https://github.com/moxystudio/node-cross-spawn/commit/900cf10)) +* fix `options` argument being mutated ([900cf10](https://github.com/moxystudio/node-cross-spawn/commit/900cf10)) +* fix commands resolution when PATH was actually Path ([900cf10](https://github.com/moxystudio/node-cross-spawn/commit/900cf10)) + + +### Features + +* improve compliance with node's ENOENT errors ([900cf10](https://github.com/moxystudio/node-cross-spawn/commit/900cf10)) +* improve detection of node's shell option support ([900cf10](https://github.com/moxystudio/node-cross-spawn/commit/900cf10)) + + +### Chores + +* upgrade tooling +* upgrate project to es6 (node v4) + + +### BREAKING CHANGES + +* remove support for older nodejs versions, only `node >= 4` is supported + + + +## [5.1.0](https://github.com/moxystudio/node-cross-spawn/compare/5.0.1...5.1.0) (2017-02-26) + + +### Bug Fixes + +* fix `options.shell` support for NodeJS [v4.8](https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V4.md#4.8.0) + + + +## [5.0.1](https://github.com/moxystudio/node-cross-spawn/compare/5.0.0...5.0.1) (2016-11-04) + + +### Bug Fixes + +* fix `options.shell` support for NodeJS v7 + + + +# [5.0.0](https://github.com/moxystudio/node-cross-spawn/compare/4.0.2...5.0.0) (2016-10-30) + + +## Features + +* add support for `options.shell` +* improve parsing of shebangs by using [`shebang-command`](https://github.com/kevva/shebang-command) module + + +## Chores + +* refactor some code to make it more clear +* update README caveats diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/LICENSE b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/LICENSE new file mode 100644 index 00000000000000..8407b9a30f51b0 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2018 Made With MOXY Lda + +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. diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/README.md b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/README.md new file mode 100644 index 00000000000000..72c718c9d5bec2 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/README.md @@ -0,0 +1,94 @@ +# cross-spawn + +[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Build status][appveyor-image]][appveyor-url] [![Coverage Status][codecov-image]][codecov-url] [![Dependency status][david-dm-image]][david-dm-url] [![Dev Dependency status][david-dm-dev-image]][david-dm-dev-url] [![Greenkeeper badge][greenkeeper-image]][greenkeeper-url] + +[npm-url]:https://npmjs.org/package/cross-spawn +[downloads-image]:http://img.shields.io/npm/dm/cross-spawn.svg +[npm-image]:http://img.shields.io/npm/v/cross-spawn.svg +[travis-url]:https://travis-ci.org/moxystudio/node-cross-spawn +[travis-image]:http://img.shields.io/travis/moxystudio/node-cross-spawn/master.svg +[appveyor-url]:https://ci.appveyor.com/project/satazor/node-cross-spawn +[appveyor-image]:https://img.shields.io/appveyor/ci/satazor/node-cross-spawn/master.svg +[codecov-url]:https://codecov.io/gh/moxystudio/node-cross-spawn +[codecov-image]:https://img.shields.io/codecov/c/github/moxystudio/node-cross-spawn/master.svg +[david-dm-url]:https://david-dm.org/moxystudio/node-cross-spawn +[david-dm-image]:https://img.shields.io/david/moxystudio/node-cross-spawn.svg +[david-dm-dev-url]:https://david-dm.org/moxystudio/node-cross-spawn?type=dev +[david-dm-dev-image]:https://img.shields.io/david/dev/moxystudio/node-cross-spawn.svg +[greenkeeper-image]:https://badges.greenkeeper.io/moxystudio/node-cross-spawn.svg +[greenkeeper-url]:https://greenkeeper.io/ + +A cross platform solution to node's spawn and spawnSync. + + +## Installation + +`$ npm install cross-spawn` + + +## Why + +Node has issues when using spawn on Windows: + +- It ignores [PATHEXT](https://github.com/joyent/node/issues/2318) +- It does not support [shebangs](https://en.wikipedia.org/wiki/Shebang_(Unix)) +- Has problems running commands with [spaces](https://github.com/nodejs/node/issues/7367) +- Has problems running commands with posix relative paths (e.g.: `./my-folder/my-executable`) +- Has an [issue](https://github.com/moxystudio/node-cross-spawn/issues/82) with command shims (files in `node_modules/.bin/`), where arguments with quotes and parenthesis would result in [invalid syntax error](https://github.com/moxystudio/node-cross-spawn/blob/e77b8f22a416db46b6196767bcd35601d7e11d54/test/index.test.js#L149) +- No `options.shell` support on node `` where `` must not contain any arguments. +If you would like to have the shebang support improved, feel free to contribute via a pull-request. + +Remember to always test your code on Windows! + + +## Tests + +`$ npm test` +`$ npm test -- --watch` during development + +## License + +Released under the [MIT License](http://www.opensource.org/licenses/mit-license.php). diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/index.js b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/index.js new file mode 100644 index 00000000000000..5509742ca9fa8f --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/index.js @@ -0,0 +1,39 @@ +'use strict'; + +const cp = require('child_process'); +const parse = require('./lib/parse'); +const enoent = require('./lib/enoent'); + +function spawn(command, args, options) { + // Parse the arguments + const parsed = parse(command, args, options); + + // Spawn the child process + const spawned = cp.spawn(parsed.command, parsed.args, parsed.options); + + // Hook into child process "exit" event to emit an error if the command + // does not exists, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16 + enoent.hookChildProcess(spawned, parsed); + + return spawned; +} + +function spawnSync(command, args, options) { + // Parse the arguments + const parsed = parse(command, args, options); + + // Spawn the child process + const result = cp.spawnSync(parsed.command, parsed.args, parsed.options); + + // Analyze if the command does not exist, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16 + result.error = result.error || enoent.verifyENOENTSync(result.status, parsed); + + return result; +} + +module.exports = spawn; +module.exports.spawn = spawn; +module.exports.sync = spawnSync; + +module.exports._parse = parse; +module.exports._enoent = enoent; diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/enoent.js b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/enoent.js new file mode 100644 index 00000000000000..14df9b623d0a20 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/enoent.js @@ -0,0 +1,59 @@ +'use strict'; + +const isWin = process.platform === 'win32'; + +function notFoundError(original, syscall) { + return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), { + code: 'ENOENT', + errno: 'ENOENT', + syscall: `${syscall} ${original.command}`, + path: original.command, + spawnargs: original.args, + }); +} + +function hookChildProcess(cp, parsed) { + if (!isWin) { + return; + } + + const originalEmit = cp.emit; + + cp.emit = function (name, arg1) { + // If emitting "exit" event and exit code is 1, we need to check if + // the command exists and emit an "error" instead + // See https://github.com/IndigoUnited/node-cross-spawn/issues/16 + if (name === 'exit') { + const err = verifyENOENT(arg1, parsed, 'spawn'); + + if (err) { + return originalEmit.call(cp, 'error', err); + } + } + + return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params + }; +} + +function verifyENOENT(status, parsed) { + if (isWin && status === 1 && !parsed.file) { + return notFoundError(parsed.original, 'spawn'); + } + + return null; +} + +function verifyENOENTSync(status, parsed) { + if (isWin && status === 1 && !parsed.file) { + return notFoundError(parsed.original, 'spawnSync'); + } + + return null; +} + +module.exports = { + hookChildProcess, + verifyENOENT, + verifyENOENTSync, + notFoundError, +}; diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/parse.js b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/parse.js new file mode 100644 index 00000000000000..962827a94e8c07 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/parse.js @@ -0,0 +1,125 @@ +'use strict'; + +const path = require('path'); +const niceTry = require('nice-try'); +const resolveCommand = require('./util/resolveCommand'); +const escape = require('./util/escape'); +const readShebang = require('./util/readShebang'); +const semver = require('semver'); + +const isWin = process.platform === 'win32'; +const isExecutableRegExp = /\.(?:com|exe)$/i; +const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i; + +// `options.shell` is supported in Node ^4.8.0, ^5.7.0 and >= 6.0.0 +const supportsShellOption = niceTry(() => semver.satisfies(process.version, '^4.8.0 || ^5.7.0 || >= 6.0.0', true)) || false; + +function detectShebang(parsed) { + parsed.file = resolveCommand(parsed); + + const shebang = parsed.file && readShebang(parsed.file); + + if (shebang) { + parsed.args.unshift(parsed.file); + parsed.command = shebang; + + return resolveCommand(parsed); + } + + return parsed.file; +} + +function parseNonShell(parsed) { + if (!isWin) { + return parsed; + } + + // Detect & add support for shebangs + const commandFile = detectShebang(parsed); + + // We don't need a shell if the command filename is an executable + const needsShell = !isExecutableRegExp.test(commandFile); + + // If a shell is required, use cmd.exe and take care of escaping everything correctly + // Note that `forceShell` is an hidden option used only in tests + if (parsed.options.forceShell || needsShell) { + // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/` + // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument + // Because the escape of metachars with ^ gets interpreted when the cmd.exe is first called, + // we need to double escape them + const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile); + + // Normalize posix paths into OS compatible paths (e.g.: foo/bar -> foo\bar) + // This is necessary otherwise it will always fail with ENOENT in those cases + parsed.command = path.normalize(parsed.command); + + // Escape command & arguments + parsed.command = escape.command(parsed.command); + parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars)); + + const shellCommand = [parsed.command].concat(parsed.args).join(' '); + + parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`]; + parsed.command = process.env.comspec || 'cmd.exe'; + parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped + } + + return parsed; +} + +function parseShell(parsed) { + // If node supports the shell option, there's no need to mimic its behavior + if (supportsShellOption) { + return parsed; + } + + // Mimic node shell option + // See https://github.com/nodejs/node/blob/b9f6a2dc059a1062776133f3d4fd848c4da7d150/lib/child_process.js#L335 + const shellCommand = [parsed.command].concat(parsed.args).join(' '); + + if (isWin) { + parsed.command = typeof parsed.options.shell === 'string' ? parsed.options.shell : process.env.comspec || 'cmd.exe'; + parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`]; + parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped + } else { + if (typeof parsed.options.shell === 'string') { + parsed.command = parsed.options.shell; + } else if (process.platform === 'android') { + parsed.command = '/system/bin/sh'; + } else { + parsed.command = '/bin/sh'; + } + + parsed.args = ['-c', shellCommand]; + } + + return parsed; +} + +function parse(command, args, options) { + // Normalize arguments, similar to nodejs + if (args && !Array.isArray(args)) { + options = args; + args = null; + } + + args = args ? args.slice(0) : []; // Clone array to avoid changing the original + options = Object.assign({}, options); // Clone object to avoid changing the original + + // Build our parsed object + const parsed = { + command, + args, + options, + file: undefined, + original: { + command, + args, + }, + }; + + // Delegate further parsing to shell or non-shell + return options.shell ? parseShell(parsed) : parseNonShell(parsed); +} + +module.exports = parse; diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/escape.js b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/escape.js new file mode 100644 index 00000000000000..b0bb84c3a14092 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/escape.js @@ -0,0 +1,45 @@ +'use strict'; + +// See http://www.robvanderwoude.com/escapechars.php +const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g; + +function escapeCommand(arg) { + // Escape meta chars + arg = arg.replace(metaCharsRegExp, '^$1'); + + return arg; +} + +function escapeArgument(arg, doubleEscapeMetaChars) { + // Convert to string + arg = `${arg}`; + + // Algorithm below is based on https://qntm.org/cmd + + // Sequence of backslashes followed by a double quote: + // double up all the backslashes and escape the double quote + arg = arg.replace(/(\\*)"/g, '$1$1\\"'); + + // Sequence of backslashes followed by the end of the string + // (which will become a double quote later): + // double up all the backslashes + arg = arg.replace(/(\\*)$/, '$1$1'); + + // All other backslashes occur literally + + // Quote the whole thing: + arg = `"${arg}"`; + + // Escape meta chars + arg = arg.replace(metaCharsRegExp, '^$1'); + + // Double escape meta chars if necessary + if (doubleEscapeMetaChars) { + arg = arg.replace(metaCharsRegExp, '^$1'); + } + + return arg; +} + +module.exports.command = escapeCommand; +module.exports.argument = escapeArgument; diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/readShebang.js b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/readShebang.js new file mode 100644 index 00000000000000..bd4f1280c9cadb --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/readShebang.js @@ -0,0 +1,32 @@ +'use strict'; + +const fs = require('fs'); +const shebangCommand = require('shebang-command'); + +function readShebang(command) { + // Read the first 150 bytes from the file + const size = 150; + let buffer; + + if (Buffer.alloc) { + // Node.js v4.5+ / v5.10+ + buffer = Buffer.alloc(size); + } else { + // Old Node.js API + buffer = new Buffer(size); + buffer.fill(0); // zero-fill + } + + let fd; + + try { + fd = fs.openSync(command, 'r'); + fs.readSync(fd, buffer, 0, size, 0); + fs.closeSync(fd); + } catch (e) { /* Empty */ } + + // Attempt to extract shebang (null is returned if not a shebang) + return shebangCommand(buffer.toString()); +} + +module.exports = readShebang; diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/resolveCommand.js b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/resolveCommand.js new file mode 100644 index 00000000000000..2fd5ad27056078 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/lib/util/resolveCommand.js @@ -0,0 +1,47 @@ +'use strict'; + +const path = require('path'); +const which = require('which'); +const pathKey = require('path-key')(); + +function resolveCommandAttempt(parsed, withoutPathExt) { + const cwd = process.cwd(); + const hasCustomCwd = parsed.options.cwd != null; + + // If a custom `cwd` was specified, we need to change the process cwd + // because `which` will do stat calls but does not support a custom cwd + if (hasCustomCwd) { + try { + process.chdir(parsed.options.cwd); + } catch (err) { + /* Empty */ + } + } + + let resolved; + + try { + resolved = which.sync(parsed.command, { + path: (parsed.options.env || process.env)[pathKey], + pathExt: withoutPathExt ? path.delimiter : undefined, + }); + } catch (e) { + /* Empty */ + } finally { + process.chdir(cwd); + } + + // If we successfully resolved, ensure that an absolute path is returned + // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it + if (resolved) { + resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved); + } + + return resolved; +} + +function resolveCommand(parsed) { + return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true); +} + +module.exports = resolveCommand; diff --git a/deps/npm/node_modules/os-locale/node_modules/cross-spawn/package.json b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/package.json new file mode 100644 index 00000000000000..3fdff9f498b270 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/cross-spawn/package.json @@ -0,0 +1,107 @@ +{ + "_from": "cross-spawn@^6.0.0", + "_id": "cross-spawn@6.0.5", + "_inBundle": false, + "_integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "_location": "/os-locale/cross-spawn", + "_phantomChildren": {}, + "_requested": { + "type": "range", + "registry": true, + "raw": "cross-spawn@^6.0.0", + "name": "cross-spawn", + "escapedName": "cross-spawn", + "rawSpec": "^6.0.0", + "saveSpec": null, + "fetchSpec": "^6.0.0" + }, + "_requiredBy": [ + "/os-locale/execa" + ], + "_resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "_shasum": "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4", + "_spec": "cross-spawn@^6.0.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/os-locale/node_modules/execa", + "author": { + "name": "André Cruz", + "email": "andre@moxy.studio" + }, + "bugs": { + "url": "https://github.com/moxystudio/node-cross-spawn/issues" + }, + "bundleDependencies": false, + "commitlint": { + "extends": [ + "@commitlint/config-conventional" + ] + }, + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "deprecated": false, + "description": "Cross platform child_process#spawn and child_process#spawnSync", + "devDependencies": { + "@commitlint/cli": "^6.0.0", + "@commitlint/config-conventional": "^6.0.2", + "babel-core": "^6.26.0", + "babel-jest": "^22.1.0", + "babel-preset-moxy": "^2.2.1", + "eslint": "^4.3.0", + "eslint-config-moxy": "^5.0.0", + "husky": "^0.14.3", + "jest": "^22.0.0", + "lint-staged": "^7.0.0", + "mkdirp": "^0.5.1", + "regenerator-runtime": "^0.11.1", + "rimraf": "^2.6.2", + "standard-version": "^4.2.0" + }, + "engines": { + "node": ">=4.8" + }, + "files": [ + "lib" + ], + "homepage": "https://github.com/moxystudio/node-cross-spawn", + "keywords": [ + "spawn", + "spawnSync", + "windows", + "cross-platform", + "path-ext", + "shebang", + "cmd", + "execute" + ], + "license": "MIT", + "lint-staged": { + "*.js": [ + "eslint --fix", + "git add" + ] + }, + "main": "index.js", + "name": "cross-spawn", + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/moxystudio/node-cross-spawn.git" + }, + "scripts": { + "commitmsg": "commitlint -e $GIT_PARAMS", + "lint": "eslint .", + "precommit": "lint-staged", + "prerelease": "npm t && npm run lint", + "release": "standard-version", + "test": "jest --env node --coverage" + }, + "standard-version": { + "scripts": { + "posttag": "git push --follow-tags origin master && npm publish" + } + }, + "version": "6.0.5" +} diff --git a/deps/npm/node_modules/os-locale/node_modules/execa/index.js b/deps/npm/node_modules/os-locale/node_modules/execa/index.js new file mode 100644 index 00000000000000..aad9ac88775cbc --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/execa/index.js @@ -0,0 +1,361 @@ +'use strict'; +const path = require('path'); +const childProcess = require('child_process'); +const crossSpawn = require('cross-spawn'); +const stripEof = require('strip-eof'); +const npmRunPath = require('npm-run-path'); +const isStream = require('is-stream'); +const _getStream = require('get-stream'); +const pFinally = require('p-finally'); +const onExit = require('signal-exit'); +const errname = require('./lib/errname'); +const stdio = require('./lib/stdio'); + +const TEN_MEGABYTES = 1000 * 1000 * 10; + +function handleArgs(cmd, args, opts) { + let parsed; + + opts = Object.assign({ + extendEnv: true, + env: {} + }, opts); + + if (opts.extendEnv) { + opts.env = Object.assign({}, process.env, opts.env); + } + + if (opts.__winShell === true) { + delete opts.__winShell; + parsed = { + command: cmd, + args, + options: opts, + file: cmd, + original: { + cmd, + args + } + }; + } else { + parsed = crossSpawn._parse(cmd, args, opts); + } + + opts = Object.assign({ + maxBuffer: TEN_MEGABYTES, + buffer: true, + stripEof: true, + preferLocal: true, + localDir: parsed.options.cwd || process.cwd(), + encoding: 'utf8', + reject: true, + cleanup: true + }, parsed.options); + + opts.stdio = stdio(opts); + + if (opts.preferLocal) { + opts.env = npmRunPath.env(Object.assign({}, opts, {cwd: opts.localDir})); + } + + if (opts.detached) { + // #115 + opts.cleanup = false; + } + + if (process.platform === 'win32' && path.basename(parsed.command) === 'cmd.exe') { + // #116 + parsed.args.unshift('/q'); + } + + return { + cmd: parsed.command, + args: parsed.args, + opts, + parsed + }; +} + +function handleInput(spawned, input) { + if (input === null || input === undefined) { + return; + } + + if (isStream(input)) { + input.pipe(spawned.stdin); + } else { + spawned.stdin.end(input); + } +} + +function handleOutput(opts, val) { + if (val && opts.stripEof) { + val = stripEof(val); + } + + return val; +} + +function handleShell(fn, cmd, opts) { + let file = '/bin/sh'; + let args = ['-c', cmd]; + + opts = Object.assign({}, opts); + + if (process.platform === 'win32') { + opts.__winShell = true; + file = process.env.comspec || 'cmd.exe'; + args = ['/s', '/c', `"${cmd}"`]; + opts.windowsVerbatimArguments = true; + } + + if (opts.shell) { + file = opts.shell; + delete opts.shell; + } + + return fn(file, args, opts); +} + +function getStream(process, stream, {encoding, buffer, maxBuffer}) { + if (!process[stream]) { + return null; + } + + let ret; + + if (!buffer) { + // TODO: Use `ret = util.promisify(stream.finished)(process[stream]);` when targeting Node.js 10 + ret = new Promise((resolve, reject) => { + process[stream] + .once('end', resolve) + .once('error', reject); + }); + } else if (encoding) { + ret = _getStream(process[stream], { + encoding, + maxBuffer + }); + } else { + ret = _getStream.buffer(process[stream], {maxBuffer}); + } + + return ret.catch(err => { + err.stream = stream; + err.message = `${stream} ${err.message}`; + throw err; + }); +} + +function makeError(result, options) { + const {stdout, stderr} = result; + + let err = result.error; + const {code, signal} = result; + + const {parsed, joinedCmd} = options; + const timedOut = options.timedOut || false; + + if (!err) { + let output = ''; + + if (Array.isArray(parsed.opts.stdio)) { + if (parsed.opts.stdio[2] !== 'inherit') { + output += output.length > 0 ? stderr : `\n${stderr}`; + } + + if (parsed.opts.stdio[1] !== 'inherit') { + output += `\n${stdout}`; + } + } else if (parsed.opts.stdio !== 'inherit') { + output = `\n${stderr}${stdout}`; + } + + err = new Error(`Command failed: ${joinedCmd}${output}`); + err.code = code < 0 ? errname(code) : code; + } + + err.stdout = stdout; + err.stderr = stderr; + err.failed = true; + err.signal = signal || null; + err.cmd = joinedCmd; + err.timedOut = timedOut; + + return err; +} + +function joinCmd(cmd, args) { + let joinedCmd = cmd; + + if (Array.isArray(args) && args.length > 0) { + joinedCmd += ' ' + args.join(' '); + } + + return joinedCmd; +} + +module.exports = (cmd, args, opts) => { + const parsed = handleArgs(cmd, args, opts); + const {encoding, buffer, maxBuffer} = parsed.opts; + const joinedCmd = joinCmd(cmd, args); + + let spawned; + try { + spawned = childProcess.spawn(parsed.cmd, parsed.args, parsed.opts); + } catch (err) { + return Promise.reject(err); + } + + let removeExitHandler; + if (parsed.opts.cleanup) { + removeExitHandler = onExit(() => { + spawned.kill(); + }); + } + + let timeoutId = null; + let timedOut = false; + + const cleanup = () => { + if (timeoutId) { + clearTimeout(timeoutId); + timeoutId = null; + } + + if (removeExitHandler) { + removeExitHandler(); + } + }; + + if (parsed.opts.timeout > 0) { + timeoutId = setTimeout(() => { + timeoutId = null; + timedOut = true; + spawned.kill(parsed.opts.killSignal); + }, parsed.opts.timeout); + } + + const processDone = new Promise(resolve => { + spawned.on('exit', (code, signal) => { + cleanup(); + resolve({code, signal}); + }); + + spawned.on('error', err => { + cleanup(); + resolve({error: err}); + }); + + if (spawned.stdin) { + spawned.stdin.on('error', err => { + cleanup(); + resolve({error: err}); + }); + } + }); + + function destroy() { + if (spawned.stdout) { + spawned.stdout.destroy(); + } + + if (spawned.stderr) { + spawned.stderr.destroy(); + } + } + + const handlePromise = () => pFinally(Promise.all([ + processDone, + getStream(spawned, 'stdout', {encoding, buffer, maxBuffer}), + getStream(spawned, 'stderr', {encoding, buffer, maxBuffer}) + ]).then(arr => { + const result = arr[0]; + result.stdout = arr[1]; + result.stderr = arr[2]; + + if (result.error || result.code !== 0 || result.signal !== null) { + const err = makeError(result, { + joinedCmd, + parsed, + timedOut + }); + + // TODO: missing some timeout logic for killed + // https://github.com/nodejs/node/blob/master/lib/child_process.js#L203 + // err.killed = spawned.killed || killed; + err.killed = err.killed || spawned.killed; + + if (!parsed.opts.reject) { + return err; + } + + throw err; + } + + return { + stdout: handleOutput(parsed.opts, result.stdout), + stderr: handleOutput(parsed.opts, result.stderr), + code: 0, + failed: false, + killed: false, + signal: null, + cmd: joinedCmd, + timedOut: false + }; + }), destroy); + + crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed); + + handleInput(spawned, parsed.opts.input); + + spawned.then = (onfulfilled, onrejected) => handlePromise().then(onfulfilled, onrejected); + spawned.catch = onrejected => handlePromise().catch(onrejected); + + return spawned; +}; + +// TODO: set `stderr: 'ignore'` when that option is implemented +module.exports.stdout = (...args) => module.exports(...args).then(x => x.stdout); + +// TODO: set `stdout: 'ignore'` when that option is implemented +module.exports.stderr = (...args) => module.exports(...args).then(x => x.stderr); + +module.exports.shell = (cmd, opts) => handleShell(module.exports, cmd, opts); + +module.exports.sync = (cmd, args, opts) => { + const parsed = handleArgs(cmd, args, opts); + const joinedCmd = joinCmd(cmd, args); + + if (isStream(parsed.opts.input)) { + throw new TypeError('The `input` option cannot be a stream in sync mode'); + } + + const result = childProcess.spawnSync(parsed.cmd, parsed.args, parsed.opts); + result.code = result.status; + + if (result.error || result.status !== 0 || result.signal !== null) { + const err = makeError(result, { + joinedCmd, + parsed + }); + + if (!parsed.opts.reject) { + return err; + } + + throw err; + } + + return { + stdout: handleOutput(parsed.opts, result.stdout), + stderr: handleOutput(parsed.opts, result.stderr), + code: 0, + failed: false, + signal: null, + cmd: joinedCmd, + timedOut: false + }; +}; + +module.exports.shellSync = (cmd, opts) => handleShell(module.exports.sync, cmd, opts); diff --git a/deps/npm/node_modules/os-locale/node_modules/execa/lib/errname.js b/deps/npm/node_modules/os-locale/node_modules/execa/lib/errname.js new file mode 100644 index 00000000000000..a93a435dfc6663 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/execa/lib/errname.js @@ -0,0 +1,38 @@ +'use strict'; +// Older verions of Node.js might not have `util.getSystemErrorName()`. +// In that case, fall back to a deprecated internal. +const util = require('util'); + +let uv; + +if (typeof util.getSystemErrorName === 'function') { + module.exports = util.getSystemErrorName; +} else { + try { + uv = process.binding('uv'); + + if (typeof uv.errname !== 'function') { + throw new TypeError('uv.errname is not a function'); + } + } catch (err) { + console.error('execa/lib/errname: unable to establish process.binding(\'uv\')', err); + uv = null; + } + + module.exports = code => errname(uv, code); +} + +// Used for testing the fallback behavior +module.exports.__test__ = errname; + +function errname(uv, code) { + if (uv) { + return uv.errname(code); + } + + if (!(code < 0)) { + throw new Error('err >= 0'); + } + + return `Unknown system error ${code}`; +} diff --git a/deps/npm/node_modules/os-locale/node_modules/execa/lib/stdio.js b/deps/npm/node_modules/os-locale/node_modules/execa/lib/stdio.js new file mode 100644 index 00000000000000..a82d46838ac9b9 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/execa/lib/stdio.js @@ -0,0 +1,41 @@ +'use strict'; +const alias = ['stdin', 'stdout', 'stderr']; + +const hasAlias = opts => alias.some(x => Boolean(opts[x])); + +module.exports = opts => { + if (!opts) { + return null; + } + + if (opts.stdio && hasAlias(opts)) { + throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${alias.map(x => `\`${x}\``).join(', ')}`); + } + + if (typeof opts.stdio === 'string') { + return opts.stdio; + } + + const stdio = opts.stdio || []; + + if (!Array.isArray(stdio)) { + throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``); + } + + const result = []; + const len = Math.max(stdio.length, alias.length); + + for (let i = 0; i < len; i++) { + let value = null; + + if (stdio[i] !== undefined) { + value = stdio[i]; + } else if (opts[alias[i]] !== undefined) { + value = opts[alias[i]]; + } + + result[i] = value; + } + + return result; +}; diff --git a/deps/npm/node_modules/os-locale/node_modules/execa/license b/deps/npm/node_modules/os-locale/node_modules/execa/license new file mode 100644 index 00000000000000..e7af2f77107d73 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/execa/license @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) Sindre Sorhus (sindresorhus.com) + +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. diff --git a/deps/npm/node_modules/os-locale/node_modules/execa/package.json b/deps/npm/node_modules/os-locale/node_modules/execa/package.json new file mode 100644 index 00000000000000..7ab0a5777c7cd5 --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/execa/package.json @@ -0,0 +1,101 @@ +{ + "_from": "execa@^1.0.0", + "_id": "execa@1.0.0", + "_inBundle": false, + "_integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "_location": "/os-locale/execa", + "_phantomChildren": {}, + "_requested": { + "type": "range", + "registry": true, + "raw": "execa@^1.0.0", + "name": "execa", + "escapedName": "execa", + "rawSpec": "^1.0.0", + "saveSpec": null, + "fetchSpec": "^1.0.0" + }, + "_requiredBy": [ + "/os-locale" + ], + "_resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "_shasum": "c6236a5bb4df6d6f15e88e7f017798216749ddd8", + "_spec": "execa@^1.0.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/os-locale", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "sindresorhus.com" + }, + "bugs": { + "url": "https://github.com/sindresorhus/execa/issues" + }, + "bundleDependencies": false, + "dependencies": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + }, + "deprecated": false, + "description": "A better `child_process`", + "devDependencies": { + "ava": "*", + "cat-names": "^1.0.2", + "coveralls": "^3.0.1", + "delay": "^3.0.0", + "is-running": "^2.0.0", + "nyc": "^13.0.1", + "tempfile": "^2.0.0", + "xo": "*" + }, + "engines": { + "node": ">=6" + }, + "files": [ + "index.js", + "lib" + ], + "homepage": "https://github.com/sindresorhus/execa#readme", + "keywords": [ + "exec", + "child", + "process", + "execute", + "fork", + "execfile", + "spawn", + "file", + "shell", + "bin", + "binary", + "binaries", + "npm", + "path", + "local" + ], + "license": "MIT", + "name": "execa", + "nyc": { + "reporter": [ + "text", + "lcov" + ], + "exclude": [ + "**/fixtures/**", + "**/test.js", + "**/test/**" + ] + }, + "repository": { + "type": "git", + "url": "git+https://github.com/sindresorhus/execa.git" + }, + "scripts": { + "test": "xo && nyc ava" + }, + "version": "1.0.0" +} diff --git a/deps/npm/node_modules/os-locale/node_modules/execa/readme.md b/deps/npm/node_modules/os-locale/node_modules/execa/readme.md new file mode 100644 index 00000000000000..f3f533d92915eb --- /dev/null +++ b/deps/npm/node_modules/os-locale/node_modules/execa/readme.md @@ -0,0 +1,327 @@ +# execa [![Build Status: Linux](https://travis-ci.org/sindresorhus/execa.svg?branch=master)](https://travis-ci.org/sindresorhus/execa) [![Build status: Windows](https://ci.appveyor.com/api/projects/status/x5ajamxtjtt93cqv/branch/master?svg=true)](https://ci.appveyor.com/project/sindresorhus/execa/branch/master) [![Coverage Status](https://coveralls.io/repos/github/sindresorhus/execa/badge.svg?branch=master)](https://coveralls.io/github/sindresorhus/execa?branch=master) + +> A better [`child_process`](https://nodejs.org/api/child_process.html) + + +## Why + +- Promise interface. +- [Strips EOF](https://github.com/sindresorhus/strip-eof) from the output so you don't have to `stdout.trim()`. +- Supports [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) binaries cross-platform. +- [Improved Windows support.](https://github.com/IndigoUnited/node-cross-spawn#why) +- Higher max buffer. 10 MB instead of 200 KB. +- [Executes locally installed binaries by name.](#preferlocal) +- [Cleans up spawned processes when the parent process dies.](#cleanup) + + +## Install + +``` +$ npm install execa +``` + + + + + + +## Usage + +```js +const execa = require('execa'); + +(async () => { + const {stdout} = await execa('echo', ['unicorns']); + console.log(stdout); + //=> 'unicorns' +})(); +``` + +Additional examples: + +```js +const execa = require('execa'); + +(async () => { + // Pipe the child process stdout to the current stdout + execa('echo', ['unicorns']).stdout.pipe(process.stdout); + + + // Run a shell command + const {stdout} = await execa.shell('echo unicorns'); + //=> 'unicorns' + + + // Catching an error + try { + await execa.shell('exit 3'); + } catch (error) { + console.log(error); + /* + { + message: 'Command failed: /bin/sh -c exit 3' + killed: false, + code: 3, + signal: null, + cmd: '/bin/sh -c exit 3', + stdout: '', + stderr: '', + timedOut: false + } + */ + } +})(); + +// Catching an error with a sync method +try { + execa.shellSync('exit 3'); +} catch (error) { + console.log(error); + /* + { + message: 'Command failed: /bin/sh -c exit 3' + code: 3, + signal: null, + cmd: '/bin/sh -c exit 3', + stdout: '', + stderr: '', + timedOut: false + } + */ +} +``` + + +## API + +### execa(file, [arguments], [options]) + +Execute a file. + +Think of this as a mix of `child_process.execFile` and `child_process.spawn`. + +Returns a [`child_process` instance](https://nodejs.org/api/child_process.html#child_process_class_childprocess), which is enhanced to also be a `Promise` for a result `Object` with `stdout` and `stderr` properties. + +### execa.stdout(file, [arguments], [options]) + +Same as `execa()`, but returns only `stdout`. + +### execa.stderr(file, [arguments], [options]) + +Same as `execa()`, but returns only `stderr`. + +### execa.shell(command, [options]) + +Execute a command through the system shell. Prefer `execa()` whenever possible, as it's both faster and safer. + +Returns a [`child_process` instance](https://nodejs.org/api/child_process.html#child_process_class_childprocess). + +The `child_process` instance is enhanced to also be promise for a result object with `stdout` and `stderr` properties. + +### execa.sync(file, [arguments], [options]) + +Execute a file synchronously. + +Returns the same result object as [`child_process.spawnSync`](https://nodejs.org/api/child_process.html#child_process_child_process_spawnsync_command_args_options). + +This method throws an `Error` if the command fails. + +### execa.shellSync(file, [options]) + +Execute a command synchronously through the system shell. + +Returns the same result object as [`child_process.spawnSync`](https://nodejs.org/api/child_process.html#child_process_child_process_spawnsync_command_args_options). + +### options + +Type: `Object` + +#### cwd + +Type: `string`
    +Default: `process.cwd()` + +Current working directory of the child process. + +#### env + +Type: `Object`
    +Default: `process.env` + +Environment key-value pairs. Extends automatically from `process.env`. Set `extendEnv` to `false` if you don't want this. + +#### extendEnv + +Type: `boolean`
    +Default: `true` + +Set to `false` if you don't want to extend the environment variables when providing the `env` property. + +#### argv0 + +Type: `string` + +Explicitly set the value of `argv[0]` sent to the child process. This will be set to `command` or `file` if not specified. + +#### stdio + +Type: `string[]` `string`
    +Default: `pipe` + +Child's [stdio](https://nodejs.org/api/child_process.html#child_process_options_stdio) configuration. + +#### detached + +Type: `boolean` + +Prepare child to run independently of its parent process. Specific behavior [depends on the platform](https://nodejs.org/api/child_process.html#child_process_options_detached). + +#### uid + +Type: `number` + +Sets the user identity of the process. + +#### gid + +Type: `number` + +Sets the group identity of the process. + +#### shell + +Type: `boolean` `string`
    +Default: `false` + +If `true`, runs `command` inside of a shell. Uses `/bin/sh` on UNIX and `cmd.exe` on Windows. A different shell can be specified as a string. The shell should understand the `-c` switch on UNIX or `/d /s /c` on Windows. + +#### stripEof + +Type: `boolean`
    +Default: `true` + +[Strip EOF](https://github.com/sindresorhus/strip-eof) (last newline) from the output. + +#### preferLocal + +Type: `boolean`
    +Default: `true` + +Prefer locally installed binaries when looking for a binary to execute.
    +If you `$ npm install foo`, you can then `execa('foo')`. + +#### localDir + +Type: `string`
    +Default: `process.cwd()` + +Preferred path to find locally installed binaries in (use with `preferLocal`). + +#### input + +Type: `string` `Buffer` `stream.Readable` + +Write some input to the `stdin` of your binary.
    +Streams are not allowed when using the synchronous methods. + +#### reject + +Type: `boolean`
    +Default: `true` + +Setting this to `false` resolves the promise with the error instead of rejecting it. + +#### cleanup + +Type: `boolean`
    +Default: `true` + +Keep track of the spawned process and `kill` it when the parent process exits. + +#### encoding + +Type: `string`
    +Default: `utf8` + +Specify the character encoding used to decode the `stdout` and `stderr` output. + +#### timeout + +Type: `number`
    +Default: `0` + +If timeout is greater than `0`, the parent will send the signal identified by the `killSignal` property (the default is `SIGTERM`) if the child runs longer than timeout milliseconds. + +#### buffer + +Type: `boolean`
    +Default: `true` + +Buffer the output from the spawned process. When buffering is disabled you must consume the output of the `stdout` and `stderr` streams because the promise will not be resolved/rejected until they have completed. + +#### maxBuffer + +Type: `number`
    +Default: `10000000` (10MB) + +Largest amount of data in bytes allowed on `stdout` or `stderr`. + +#### killSignal + +Type: `string` `number`
    +Default: `SIGTERM` + +Signal value to be used when the spawned process will be killed. + +#### stdin + +Type: `string` `number` `Stream` `undefined` `null`
    +Default: `pipe` + +Same options as [`stdio`](https://nodejs.org/dist/latest-v6.x/docs/api/child_process.html#child_process_options_stdio). + +#### stdout + +Type: `string` `number` `Stream` `undefined` `null`
    +Default: `pipe` + +Same options as [`stdio`](https://nodejs.org/dist/latest-v6.x/docs/api/child_process.html#child_process_options_stdio). + +#### stderr + +Type: `string` `number` `Stream` `undefined` `null`
    +Default: `pipe` + +Same options as [`stdio`](https://nodejs.org/dist/latest-v6.x/docs/api/child_process.html#child_process_options_stdio). + +#### windowsVerbatimArguments + +Type: `boolean`
    +Default: `false` + +If `true`, no quoting or escaping of arguments is done on Windows. Ignored on other platforms. This is set to `true` automatically when the `shell` option is `true`. + + +## Tips + +### Save and pipe output from a child process + +Let's say you want to show the output of a child process in real-time while also saving it to a variable. + +```js +const execa = require('execa'); +const getStream = require('get-stream'); + +const stream = execa('echo', ['foo']).stdout; + +stream.pipe(process.stdout); + +getStream(stream).then(value => { + console.log('child output:', value); +}); +``` + + +## License + +MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/deps/npm/node_modules/os-locale/package.json b/deps/npm/node_modules/os-locale/package.json index 3777aec6a39517..fb6646ec9974b8 100644 --- a/deps/npm/node_modules/os-locale/package.json +++ b/deps/npm/node_modules/os-locale/package.json @@ -1,27 +1,39 @@ { - "_from": "os-locale@^2.0.0", - "_id": "os-locale@2.1.0", + "_from": "os-locale@^3.1.0", + "_id": "os-locale@3.1.0", "_inBundle": false, - "_integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "_integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "_location": "/os-locale", - "_phantomChildren": {}, + "_phantomChildren": { + "get-stream": "4.1.0", + "is-stream": "1.1.0", + "nice-try": "1.0.5", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "path-key": "2.0.1", + "semver": "5.7.1", + "shebang-command": "1.2.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0", + "which": "1.3.1" + }, "_requested": { "type": "range", "registry": true, - "raw": "os-locale@^2.0.0", + "raw": "os-locale@^3.1.0", "name": "os-locale", "escapedName": "os-locale", - "rawSpec": "^2.0.0", + "rawSpec": "^3.1.0", "saveSpec": null, - "fetchSpec": "^2.0.0" + "fetchSpec": "^3.1.0" }, "_requiredBy": [ "/yargs" ], - "_resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "_shasum": "42bc2900a6b5b8bd17376c8e882b65afccf24bf2", - "_spec": "os-locale@^2.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/yargs", + "_resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "_shasum": "a802a6ee17f24c10483ab9935719cef4ed16bf1a", + "_spec": "os-locale@^3.1.0", + "_where": "/Users/mperrotte/npminc/cli/node_modules/yargs", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -32,19 +44,19 @@ }, "bundleDependencies": false, "dependencies": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" }, "deprecated": false, "description": "Get the system locale", "devDependencies": { - "ava": "*", - "import-fresh": "^2.0.0", - "xo": "*" + "ava": "^1.0.1", + "import-fresh": "^3.0.0", + "xo": "^0.23.0" }, "engines": { - "node": ">=4" + "node": ">=6" }, "files": [ "index.js" @@ -73,5 +85,5 @@ "scripts": { "test": "xo && ava" }, - "version": "2.1.0" + "version": "3.1.0" } diff --git a/deps/npm/node_modules/os-locale/readme.md b/deps/npm/node_modules/os-locale/readme.md index 7c80d33589e4bb..8f9c280eedb85e 100644 --- a/deps/npm/node_modules/os-locale/readme.md +++ b/deps/npm/node_modules/os-locale/readme.md @@ -6,11 +6,24 @@ Useful for localizing your module or app. POSIX systems: The returned locale refers to the [`LC_MESSAGE`](http://www.gnu.org/software/libc/manual/html_node/Locale-Categories.html#Locale-Categories) category, suitable for selecting the language used in the user interface for message translation. +--- + +
    + + Get professional support for 'os-locale' with a Tidelift subscription + +
    + + Tidelift helps make open source sustainable for maintainers while giving companies
    assurances about security, maintenance, and licensing for their dependencies. +
    +
    + +--- ## Install ``` -$ npm install --save os-locale +$ npm install os-locale ``` @@ -19,10 +32,10 @@ $ npm install --save os-locale ```js const osLocale = require('os-locale'); -osLocale().then(locale => { - console.log(locale); +(async () => { + console.log(await osLocale()); //=> 'en_US' -}); +})(); ``` @@ -48,6 +61,11 @@ Default: `true` Set to `false` to avoid spawning subprocesses and instead only resolve the locale from environment variables. +## Security + +To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure. + + ## License MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/deps/npm/node_modules/p-defer/index.js b/deps/npm/node_modules/p-defer/index.js new file mode 100644 index 00000000000000..eaef75e4e5f723 --- /dev/null +++ b/deps/npm/node_modules/p-defer/index.js @@ -0,0 +1,11 @@ +'use strict'; +module.exports = () => { + const ret = {}; + + ret.promise = new Promise((resolve, reject) => { + ret.resolve = resolve; + ret.reject = reject; + }); + + return ret; +}; diff --git a/deps/npm/node_modules/p-defer/license b/deps/npm/node_modules/p-defer/license new file mode 100644 index 00000000000000..654d0bfe943437 --- /dev/null +++ b/deps/npm/node_modules/p-defer/license @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) Sindre Sorhus (sindresorhus.com) + +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. diff --git a/deps/npm/node_modules/p-defer/package.json b/deps/npm/node_modules/p-defer/package.json new file mode 100644 index 00000000000000..ee706cd9308589 --- /dev/null +++ b/deps/npm/node_modules/p-defer/package.json @@ -0,0 +1,77 @@ +{ + "_args": [ + [ + "p-defer@1.0.0", + "/Users/mperrotte/npminc/cli" + ] + ], + "_development": true, + "_from": "p-defer@1.0.0", + "_id": "p-defer@1.0.0", + "_inBundle": false, + "_integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", + "_location": "/p-defer", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "p-defer@1.0.0", + "name": "p-defer", + "escapedName": "p-defer", + "rawSpec": "1.0.0", + "saveSpec": null, + "fetchSpec": "1.0.0" + }, + "_requiredBy": [ + "/map-age-cleaner" + ], + "_resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "_spec": "1.0.0", + "_where": "/Users/mperrotte/npminc/cli", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "sindresorhus.com" + }, + "bugs": { + "url": "https://github.com/sindresorhus/p-defer/issues" + }, + "description": "Create a deferred promise", + "devDependencies": { + "ava": "*", + "xo": "*" + }, + "engines": { + "node": ">=4" + }, + "files": [ + "index.js" + ], + "homepage": "https://github.com/sindresorhus/p-defer#readme", + "keywords": [ + "promise", + "defer", + "deferred", + "resolve", + "reject", + "lazy", + "later", + "async", + "await", + "promises", + "bluebird" + ], + "license": "MIT", + "name": "p-defer", + "repository": { + "type": "git", + "url": "git+https://github.com/sindresorhus/p-defer.git" + }, + "scripts": { + "test": "xo && ava" + }, + "version": "1.0.0", + "xo": { + "esnext": true + } +} diff --git a/deps/npm/node_modules/p-defer/readme.md b/deps/npm/node_modules/p-defer/readme.md new file mode 100644 index 00000000000000..b94f137129d9df --- /dev/null +++ b/deps/npm/node_modules/p-defer/readme.md @@ -0,0 +1,47 @@ +# p-defer [![Build Status](https://travis-ci.org/sindresorhus/p-defer.svg?branch=master)](https://travis-ci.org/sindresorhus/p-defer) + +> Create a deferred promise + +[**Don't use this unless you know what you're doing!**](https://github.com/petkaantonov/bluebird/wiki/Promise-anti-patterns#the-deferred-anti-pattern) Prefer the `Promise` constructor. + + +## Install + +``` +$ npm install --save p-defer +``` + + +## Usage + +```js +const pDefer = require('p-defer'); + +function delay(ms) { + const deferred = pDefer(); + setTimeout(deferred.resolve, ms, '🦄'); + return deferred.promise; +} + +delay(100).then(console.log); +//=> '🦄' +``` + +*The above is just an example. Use [`delay`](https://github.com/sindresorhus/delay) if you need to delay a promise.* + + +## API + +### pDefer() + +Returns an `Object` with a `promise` property and functions to `resolve()` and `reject()`. + + +## Related + +- [More…](https://github.com/sindresorhus/promise-fun) + + +## License + +MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/deps/npm/node_modules/p-is-promise/index.d.ts b/deps/npm/node_modules/p-is-promise/index.d.ts new file mode 100644 index 00000000000000..662d9e0c420f60 --- /dev/null +++ b/deps/npm/node_modules/p-is-promise/index.d.ts @@ -0,0 +1,23 @@ +declare const pIsPromise: { + /** + Check if `input` is a ES2015 promise. + + @param input - Value to be checked. + + @example + ``` + import isPromise = require('p-is-promise'); + + isPromise(Promise.resolve('🦄')); + //=> true + ``` + */ + (input: unknown): input is Promise; + + // TODO: Remove this for the next major release, refactor the whole definition to: + // declare function pIsPromise(input: unknown): input is Promise; + // export = pIsPromise; + default: typeof pIsPromise; +}; + +export = pIsPromise; diff --git a/deps/npm/node_modules/p-is-promise/index.js b/deps/npm/node_modules/p-is-promise/index.js new file mode 100644 index 00000000000000..389d38fc55f6f4 --- /dev/null +++ b/deps/npm/node_modules/p-is-promise/index.js @@ -0,0 +1,15 @@ +'use strict'; + +const isPromise = input => ( + input instanceof Promise || + ( + input !== null && + typeof input === 'object' && + typeof input.then === 'function' && + typeof input.catch === 'function' + ) +); + +module.exports = isPromise; +// TODO: Remove this for the next major release +module.exports.default = isPromise; diff --git a/deps/npm/node_modules/p-is-promise/license b/deps/npm/node_modules/p-is-promise/license new file mode 100644 index 00000000000000..e7af2f77107d73 --- /dev/null +++ b/deps/npm/node_modules/p-is-promise/license @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) Sindre Sorhus (sindresorhus.com) + +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. diff --git a/deps/npm/node_modules/p-is-promise/package.json b/deps/npm/node_modules/p-is-promise/package.json new file mode 100644 index 00000000000000..3315effdfb15df --- /dev/null +++ b/deps/npm/node_modules/p-is-promise/package.json @@ -0,0 +1,78 @@ +{ + "_args": [ + [ + "p-is-promise@2.1.0", + "/Users/mperrotte/npminc/cli" + ] + ], + "_development": true, + "_from": "p-is-promise@2.1.0", + "_id": "p-is-promise@2.1.0", + "_inBundle": false, + "_integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", + "_location": "/p-is-promise", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "p-is-promise@2.1.0", + "name": "p-is-promise", + "escapedName": "p-is-promise", + "rawSpec": "2.1.0", + "saveSpec": null, + "fetchSpec": "2.1.0" + }, + "_requiredBy": [ + "/nyc/mem" + ], + "_resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", + "_spec": "2.1.0", + "_where": "/Users/mperrotte/npminc/cli", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "sindresorhus.com" + }, + "bugs": { + "url": "https://github.com/sindresorhus/p-is-promise/issues" + }, + "description": "Check if something is a promise", + "devDependencies": { + "ava": "^1.4.1", + "bluebird": "^3.5.4", + "tsd": "^0.7.2", + "xo": "^0.24.0" + }, + "engines": { + "node": ">=6" + }, + "files": [ + "index.js", + "index.d.ts" + ], + "homepage": "https://github.com/sindresorhus/p-is-promise#readme", + "keywords": [ + "promise", + "is", + "detect", + "check", + "kind", + "type", + "thenable", + "es2015", + "async", + "await", + "promises", + "bluebird" + ], + "license": "MIT", + "name": "p-is-promise", + "repository": { + "type": "git", + "url": "git+https://github.com/sindresorhus/p-is-promise.git" + }, + "scripts": { + "test": "xo && ava && tsd" + }, + "version": "2.1.0" +} diff --git a/deps/npm/node_modules/p-is-promise/readme.md b/deps/npm/node_modules/p-is-promise/readme.md new file mode 100644 index 00000000000000..0e0e48171a919d --- /dev/null +++ b/deps/npm/node_modules/p-is-promise/readme.md @@ -0,0 +1,43 @@ +# p-is-promise [![Build Status](https://travis-ci.org/sindresorhus/p-is-promise.svg?branch=master)](https://travis-ci.org/sindresorhus/p-is-promise) + +> Check if something is a promise + +Why not [`is-promise`](https://github.com/then/is-promise)? That module [checks for a thenable](https://github.com/then/is-promise/issues/6), not an ES2015 promise. This one is stricter. + +You most likely don't need this. Just pass your value to `Promise.resolve()` and let it handle it. + +Can be useful if you need to create a fast path for a synchronous operation. + + +## Install + +``` +$ npm install p-is-promise +``` + + +## Usage + +```js +const pIsPromise = require('p-is-promise'); +const Bluebird = require('bluebird'); + +pIsPromise(Promise.resolve('🦄')); +//=> true + +pIsPromise(Bluebird.resolve('🦄')); +//=> true + +pIsPromise('🦄'); +//=> false +``` + + +## Related + +- [More…](https://github.com/sindresorhus/promise-fun) + + +## License + +MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/deps/npm/node_modules/pacote/CHANGELOG.md b/deps/npm/node_modules/pacote/CHANGELOG.md index 722a9fa168876e..b632c4eb47d116 100644 --- a/deps/npm/node_modules/pacote/CHANGELOG.md +++ b/deps/npm/node_modules/pacote/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [9.5.12](https://github.com/npm/pacote/compare/v9.5.11...v9.5.12) (2020-01-06) + + +### Bug Fixes + +* **git:** Do not drop uid/gid when executing in root-owned directory ([d2f4176](https://github.com/npm/pacote/commit/d2f4176)) + + + ## [9.5.11](https://github.com/npm/pacote/compare/v9.5.10...v9.5.11) (2019-12-09) diff --git a/deps/npm/node_modules/pacote/lib/util/git.js b/deps/npm/node_modules/pacote/lib/util/git.js index d2282bae15edad..7642eb2c856303 100644 --- a/deps/npm/node_modules/pacote/lib/util/git.js +++ b/deps/npm/node_modules/pacote/lib/util/git.js @@ -16,6 +16,7 @@ const promiseRetry = require('promise-retry') const uniqueFilename = require('unique-filename') const which = BB.promisify(require('which')) const semver = require('semver') +const inferOwner = require('infer-owner') const GOOD_ENV_VARS = new Set([ 'GIT_ASKPASS', @@ -181,10 +182,24 @@ function revs (repo, opts) { }) } +// infer the owner from the cwd git is operating in, if not the +// process cwd, but only if we're root. +// See: https://github.com/npm/cli/issues/624 +module.exports._cwdOwner = cwdOwner +function cwdOwner (gitOpts, opts) { + const isRoot = process.getuid && process.getuid() === 0 + if (!isRoot || !gitOpts.cwd) { return Promise.resolve() } + + return BB.resolve(inferOwner(gitOpts.cwd).then(owner => { + gitOpts.uid = owner.uid + gitOpts.gid = owner.gid + })) +} + module.exports._exec = execGit function execGit (gitArgs, gitOpts, opts) { opts = optCheck(opts) - return checkGit(opts).then(gitPath => { + return BB.resolve(cwdOwner(gitOpts, opts).then(() => checkGit(opts).then(gitPath => { return promiseRetry((retry, number) => { if (number !== 1) { opts.log.silly('pacote', 'Retrying git command: ' + gitArgs.join(' ') + ' attempt # ' + number) @@ -202,13 +217,13 @@ function execGit (gitArgs, gitOpts, opts) { maxTimeout: opts['fetch-retry-maxtimeout'], minTimeout: opts['fetch-retry-mintimeout'] }) - }) + }))) } module.exports._spawn = spawnGit function spawnGit (gitArgs, gitOpts, opts) { opts = optCheck(opts) - return checkGit(opts).then(gitPath => { + return BB.resolve(cwdOwner(gitOpts, opts).then(() => checkGit(opts).then(gitPath => { return promiseRetry((retry, number) => { if (number !== 1) { opts.log.silly('pacote', 'Retrying git command: ' + gitArgs.join(' ') + ' attempt # ' + number) @@ -231,7 +246,7 @@ function spawnGit (gitArgs, gitOpts, opts) { return stdout }) }, opts.retry) - }) + }))) } module.exports._mkOpts = mkOpts diff --git a/deps/npm/node_modules/pacote/package.json b/deps/npm/node_modules/pacote/package.json index 1efb87c5838e68..d558df21856cf0 100644 --- a/deps/npm/node_modules/pacote/package.json +++ b/deps/npm/node_modules/pacote/package.json @@ -1,8 +1,8 @@ { - "_from": "pacote@9.5.11", - "_id": "pacote@9.5.11", + "_from": "pacote@9.5.12", + "_id": "pacote@9.5.12", "_inBundle": false, - "_integrity": "sha512-DMDPvFKCjCg6zMS4IfzZyvT57O/bX8XGG00eEoy4K/S4Wj+qiN8KbnmKpsTvfS6OL9r5TAicxMKWbj1yV2Yh4g==", + "_integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==", "_location": "/pacote", "_phantomChildren": { "safe-buffer": "5.1.2", @@ -11,12 +11,12 @@ "_requested": { "type": "version", "registry": true, - "raw": "pacote@9.5.11", + "raw": "pacote@9.5.12", "name": "pacote", "escapedName": "pacote", - "rawSpec": "9.5.11", + "rawSpec": "9.5.12", "saveSpec": null, - "fetchSpec": "9.5.11" + "fetchSpec": "9.5.12" }, "_requiredBy": [ "#USER", @@ -24,10 +24,10 @@ "/libcipm", "/libnpm" ], - "_resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.11.tgz", - "_shasum": "524152077cb392c47b1fbe198aa28f778bef7ee1", - "_spec": "pacote@9.5.11", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz", + "_shasum": "1e11dd7a8d736bcc36b375a9804d41bb0377bf66", + "_spec": "pacote@9.5.12", + "_where": "/Users/ruyadorno/Documents/workspace/cli", "author": { "name": "Kat Marchán", "email": "kzm@sykosomatic.org" @@ -123,5 +123,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "9.5.11" + "version": "9.5.12" } diff --git a/deps/npm/node_modules/parallel-transform/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/parallel-transform/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/parallel-transform/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/rc/node_modules/minimist/example/parse.js b/deps/npm/node_modules/rc/node_modules/minimist/example/parse.js index abff3e8ee8f5ef..f7c8d49807f32e 100644 --- a/deps/npm/node_modules/rc/node_modules/minimist/example/parse.js +++ b/deps/npm/node_modules/rc/node_modules/minimist/example/parse.js @@ -1,2 +1,2 @@ var argv = require('../')(process.argv.slice(2)); -console.dir(argv); +console.log(argv); diff --git a/deps/npm/node_modules/rc/node_modules/minimist/index.js b/deps/npm/node_modules/rc/node_modules/minimist/index.js index 6a0559d58133a8..d2afe5e4d4056e 100644 --- a/deps/npm/node_modules/rc/node_modules/minimist/index.js +++ b/deps/npm/node_modules/rc/node_modules/minimist/index.js @@ -68,12 +68,21 @@ module.exports = function (args, opts) { function setKey (obj, keys, value) { var o = obj; - keys.slice(0,-1).forEach(function (key) { + for (var i = 0; i < keys.length-1; i++) { + var key = keys[i]; + if (key === '__proto__') return; if (o[key] === undefined) o[key] = {}; + if (o[key] === Object.prototype || o[key] === Number.prototype + || o[key] === String.prototype) o[key] = {}; + if (o[key] === Array.prototype) o[key] = []; o = o[key]; - }); + } var key = keys[keys.length - 1]; + if (key === '__proto__') return; + if (o === Object.prototype || o === Number.prototype + || o === String.prototype) o = {}; + if (o === Array.prototype) o = []; if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') { o[key] = value; } @@ -171,7 +180,7 @@ module.exports = function (args, opts) { setArg(key, args[i+1], arg); i++; } - else if (args[i+1] && /true|false/.test(args[i+1])) { + else if (args[i+1] && /^(true|false)$/.test(args[i+1])) { setArg(key, args[i+1] === 'true', arg); i++; } diff --git a/deps/npm/node_modules/rc/node_modules/minimist/package.json b/deps/npm/node_modules/rc/node_modules/minimist/package.json index e22b6fc47a309d..86e9c8ee28bd2d 100644 --- a/deps/npm/node_modules/rc/node_modules/minimist/package.json +++ b/deps/npm/node_modules/rc/node_modules/minimist/package.json @@ -1,8 +1,8 @@ { "_from": "minimist@^1.2.0", - "_id": "minimist@1.2.0", + "_id": "minimist@1.2.5", "_inBundle": false, - "_integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "_integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "_location": "/rc/minimist", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/rc" ], - "_resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "_shasum": "a35008b20f41383eec1fb914f4cd5df79a264284", + "_resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "_shasum": "67d66014b66a6a8aaa0c083c5fd58df4e4e97602", "_spec": "minimist@^1.2.0", - "_where": "/Users/rebecca/code/npm/node_modules/rc", + "_where": "/Users/ruyadorno/Documents/workspace/cli/node_modules/rc", "author": { "name": "James Halliday", "email": "mail@substack.net", @@ -69,5 +69,5 @@ "opera/12" ] }, - "version": "1.2.0" + "version": "1.2.5" } diff --git a/deps/npm/node_modules/rc/node_modules/minimist/readme.markdown b/deps/npm/node_modules/rc/node_modules/minimist/readme.markdown index 30a74cf8c158d7..5fd97ab11ee9d8 100644 --- a/deps/npm/node_modules/rc/node_modules/minimist/readme.markdown +++ b/deps/npm/node_modules/rc/node_modules/minimist/readme.markdown @@ -5,15 +5,11 @@ parse argument options This module is the guts of optimist's argument parser without all the fanciful decoration. -[![browser support](https://ci.testling.com/substack/minimist.png)](http://ci.testling.com/substack/minimist) - -[![build status](https://secure.travis-ci.org/substack/minimist.png)](http://travis-ci.org/substack/minimist) - # example ``` js var argv = require('minimist')(process.argv.slice(2)); -console.dir(argv); +console.log(argv); ``` ``` @@ -33,6 +29,13 @@ $ node example/parse.js -x 3 -y 4 -n5 -abc --beep=boop foo bar baz beep: 'boop' } ``` +# security + +Previous versions had a prototype pollution bug that could cause privilege +escalation in some circumstances when handling untrusted user input. + +Please use version 1.2.3 or later: https://snyk.io/vuln/SNYK-JS-MINIMIST-559764 + # methods ``` js @@ -65,19 +68,20 @@ argument names to use as aliases first non-option * `opts['--']` - when true, populate `argv._` with everything before the `--` and `argv['--']` with everything after the `--`. Here's an example: + + ``` + > require('./')('one two three -- four five --six'.split(' '), { '--': true }) + { _: [ 'one', 'two', 'three' ], + '--': [ 'four', 'five', '--six' ] } + ``` + + Note that with `opts['--']` set, parsing for arguments still stops after the + `--`. + * `opts.unknown` - a function which is invoked with a command line parameter not defined in the `opts` configuration object. If the function returns `false`, the unknown option is not added to `argv`. -``` -> require('./')('one two three -- four five --six'.split(' '), { '--': true }) -{ _: [ 'one', 'two', 'three' ], - '--': [ 'four', 'five', '--six' ] } -``` - -Note that with `opts['--']` set, parsing for arguments still stops after the -`--`. - # install With [npm](https://npmjs.org) do: diff --git a/deps/npm/node_modules/rc/node_modules/minimist/test/bool.js b/deps/npm/node_modules/rc/node_modules/minimist/test/bool.js index 14b0717cefd5e9..5f7dbde16cc914 100644 --- a/deps/npm/node_modules/rc/node_modules/minimist/test/bool.js +++ b/deps/npm/node_modules/rc/node_modules/minimist/test/bool.js @@ -164,3 +164,15 @@ test('boolean --boool=false', function (t) { t.same(parsed.boool, false); t.end(); }); + +test('boolean using something similar to true', function (t) { + var opts = { boolean: 'h' }; + var result = parse(['-h', 'true.txt'], opts); + var expected = { + h: true, + '_': ['true.txt'] + }; + + t.same(result, expected); + t.end(); +}); \ No newline at end of file diff --git a/deps/npm/node_modules/rc/node_modules/minimist/test/proto.js b/deps/npm/node_modules/rc/node_modules/minimist/test/proto.js new file mode 100644 index 00000000000000..8649107ecba1f0 --- /dev/null +++ b/deps/npm/node_modules/rc/node_modules/minimist/test/proto.js @@ -0,0 +1,44 @@ +var parse = require('../'); +var test = require('tape'); + +test('proto pollution', function (t) { + var argv = parse(['--__proto__.x','123']); + t.equal({}.x, undefined); + t.equal(argv.__proto__.x, undefined); + t.equal(argv.x, undefined); + t.end(); +}); + +test('proto pollution (array)', function (t) { + var argv = parse(['--x','4','--x','5','--x.__proto__.z','789']); + t.equal({}.z, undefined); + t.deepEqual(argv.x, [4,5]); + t.equal(argv.x.z, undefined); + t.equal(argv.x.__proto__.z, undefined); + t.end(); +}); + +test('proto pollution (number)', function (t) { + var argv = parse(['--x','5','--x.__proto__.z','100']); + t.equal({}.z, undefined); + t.equal((4).z, undefined); + t.equal(argv.x, 5); + t.equal(argv.x.z, undefined); + t.end(); +}); + +test('proto pollution (string)', function (t) { + var argv = parse(['--x','abc','--x.__proto__.z','def']); + t.equal({}.z, undefined); + t.equal('...'.z, undefined); + t.equal(argv.x, 'abc'); + t.equal(argv.x.z, undefined); + t.end(); +}); + +test('proto pollution (constructor)', function (t) { + var argv = parse(['--constructor.prototype.y','123']); + t.equal({}.y, undefined); + t.equal(argv.y, undefined); + t.end(); +}); diff --git a/deps/npm/node_modules/rc/package.json b/deps/npm/node_modules/rc/package.json index ba78e395b45d45..db6599e664b743 100644 --- a/deps/npm/node_modules/rc/package.json +++ b/deps/npm/node_modules/rc/package.json @@ -1,8 +1,8 @@ { "_from": "rc@^1.1.6", - "_id": "rc@1.2.7", + "_id": "rc@1.2.8", "_inBundle": false, - "_integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", + "_integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "_location": "/rc", "_phantomChildren": {}, "_requested": { @@ -19,17 +19,17 @@ "/registry-auth-token", "/registry-url" ], - "_resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", - "_shasum": "8a10ca30d588d00464360372b890d06dacd02297", + "_resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "_shasum": "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed", "_spec": "rc@^1.1.6", - "_where": "/Users/rebecca/code/npm/node_modules/registry-auth-token", + "_where": "/Users/ruyadorno/Documents/workspace/cli/node_modules/registry-auth-token", "author": { "name": "Dominic Tarr", "email": "dominic.tarr@gmail.com", "url": "dominictarr.com" }, "bin": { - "rc": "./cli.js" + "rc": "cli.js" }, "browser": "browser.js", "bugs": { @@ -37,7 +37,7 @@ }, "bundleDependencies": false, "dependencies": { - "deep-extend": "^0.5.1", + "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" @@ -61,5 +61,5 @@ "scripts": { "test": "set -e; node test/test.js; node test/ini.js; node test/nested-env-vars.js" }, - "version": "1.2.7" + "version": "1.2.8" } diff --git a/deps/npm/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/readable-stream/README.md b/deps/npm/node_modules/readable-stream/README.md index 28ccae16165828..6f035ab16f29dd 100644 --- a/deps/npm/node_modules/readable-stream/README.md +++ b/deps/npm/node_modules/readable-stream/README.md @@ -15,7 +15,7 @@ npm install --save readable-stream This package is a mirror of the streams implementations in Node.js. -Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v10.15.3/docs/api/stream.html). +Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v10.19.0/docs/api/stream.html). If you want to guarantee a stable streams base, regardless of what version of Node you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *"stream"* module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html). @@ -24,10 +24,7 @@ As of version 2.0.0 **readable-stream** uses semantic versioning. ## Version 3.x.x -v3.x.x of `readable-stream` supports Node 6, 8, and 10, as well as -evergreen browsers, IE 11 and latest Safari. The breaking changes -introduced by v3 are composed by the combined breaking changes in [Node v9](https://nodejs.org/en/blog/release/v9.0.0/) -and [Node v10](https://nodejs.org/en/blog/release/v10.0.0/), as follows: +v3.x.x of `readable-stream` is a cut from Node 10. This version supports Node 6, 8, and 10, as well as evergreen browsers, IE 11 and latest Safari. The breaking changes introduced by v3 are composed by the combined breaking changes in [Node v9](https://nodejs.org/en/blog/release/v9.0.0/) and [Node v10](https://nodejs.org/en/blog/release/v10.0.0/), as follows: 1. Error codes: https://github.com/nodejs/node/pull/13310, https://github.com/nodejs/node/pull/13291, @@ -51,9 +48,7 @@ and [Node v10](https://nodejs.org/en/blog/release/v10.0.0/), as follows: https://github.com/nodejs/node/pull/17979 ## Version 2.x.x - -v2.x.x of `readable-stream` supports all Node.js version from 0.8, as well as -evergreen browsers and IE 10 & 11. +v2.x.x of `readable-stream` is a cut of the stream module from Node 8 (there have been no semver-major changes from Node 4 to 8). This version supports all Node.js versions from 0.8, as well as evergreen browsers and IE 10 & 11. ### Big Thanks diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/readable-stream/lib/_stream_readable.js index 33f478d7e8c25a..192d451488f208 100644 --- a/deps/npm/node_modules/readable-stream/lib/_stream_readable.js +++ b/deps/npm/node_modules/readable-stream/lib/_stream_readable.js @@ -80,17 +80,16 @@ var _require$codes = require('../errors').codes, ERR_INVALID_ARG_TYPE = _require$codes.ERR_INVALID_ARG_TYPE, ERR_STREAM_PUSH_AFTER_EOF = _require$codes.ERR_STREAM_PUSH_AFTER_EOF, ERR_METHOD_NOT_IMPLEMENTED = _require$codes.ERR_METHOD_NOT_IMPLEMENTED, - ERR_STREAM_UNSHIFT_AFTER_END_EVENT = _require$codes.ERR_STREAM_UNSHIFT_AFTER_END_EVENT; - -var _require2 = require('../experimentalWarning'), - emitExperimentalWarning = _require2.emitExperimentalWarning; // Lazy loaded to improve the startup performance. + ERR_STREAM_UNSHIFT_AFTER_END_EVENT = _require$codes.ERR_STREAM_UNSHIFT_AFTER_END_EVENT; // Lazy loaded to improve the startup performance. var StringDecoder; var createReadableStreamAsyncIterator; +var from; require('inherits')(Readable, Stream); +var errorOrDestroy = destroyImpl.errorOrDestroy; var kProxyEvents = ['error', 'close', 'destroy', 'pause', 'resume']; function prependListener(emitter, event, fn) { @@ -144,7 +143,9 @@ function ReadableState(options, stream, isDuplex) { this.resumeScheduled = false; this.paused = true; // Should close be emitted on destroy. Defaults to true. - this.emitClose = options.emitClose !== false; // has it been destroyed + this.emitClose = options.emitClose !== false; // Should .destroy() be called after 'end' (and potentially 'finish') + + this.autoDestroy = !!options.autoDestroy; // has it been destroyed this.destroyed = false; // Crypto is kind of old and crusty. Historically, its default string // encoding is 'binary' so we have to make this configurable. @@ -257,16 +258,16 @@ function readableAddChunk(stream, chunk, encoding, addToFront, skipChunkCheck) { if (!skipChunkCheck) er = chunkInvalid(state, chunk); if (er) { - stream.emit('error', er); + errorOrDestroy(stream, er); } else if (state.objectMode || chunk && chunk.length > 0) { if (typeof chunk !== 'string' && !state.objectMode && Object.getPrototypeOf(chunk) !== Buffer.prototype) { chunk = _uint8ArrayToBuffer(chunk); } if (addToFront) { - if (state.endEmitted) stream.emit('error', new ERR_STREAM_UNSHIFT_AFTER_END_EVENT());else addChunk(stream, state, chunk, true); + if (state.endEmitted) errorOrDestroy(stream, new ERR_STREAM_UNSHIFT_AFTER_END_EVENT());else addChunk(stream, state, chunk, true); } else if (state.ended) { - stream.emit('error', new ERR_STREAM_PUSH_AFTER_EOF()); + errorOrDestroy(stream, new ERR_STREAM_PUSH_AFTER_EOF()); } else if (state.destroyed) { return false; } else { @@ -322,17 +323,32 @@ Readable.prototype.isPaused = function () { Readable.prototype.setEncoding = function (enc) { if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder; - this._readableState.decoder = new StringDecoder(enc); // if setEncoding(null), decoder.encoding equals utf8 + var decoder = new StringDecoder(enc); + this._readableState.decoder = decoder; // If setEncoding(null), decoder.encoding equals utf8 + + this._readableState.encoding = this._readableState.decoder.encoding; // Iterate over current buffer to convert already stored Buffers: + + var p = this._readableState.buffer.head; + var content = ''; + + while (p !== null) { + content += decoder.write(p.data); + p = p.next; + } + + this._readableState.buffer.clear(); - this._readableState.encoding = this._readableState.decoder.encoding; + if (content !== '') this._readableState.buffer.push(content); + this._readableState.length = content.length; return this; -}; // Don't raise the hwm > 8MB +}; // Don't raise the hwm > 1GB -var MAX_HWM = 0x800000; +var MAX_HWM = 0x40000000; function computeNewHighWaterMark(n) { if (n >= MAX_HWM) { + // TODO(ronag): Throw ERR_VALUE_OUT_OF_RANGE. n = MAX_HWM; } else { // Get the next highest power of 2 to prevent increasing hwm excessively in @@ -449,7 +465,7 @@ Readable.prototype.read = function (n) { if (n > 0) ret = fromList(n, state);else ret = null; if (ret === null) { - state.needReadable = true; + state.needReadable = state.length <= state.highWaterMark; n = 0; } else { state.length -= n; @@ -469,6 +485,7 @@ Readable.prototype.read = function (n) { }; function onEofChunk(stream, state) { + debug('onEofChunk'); if (state.ended) return; if (state.decoder) { @@ -503,6 +520,7 @@ function onEofChunk(stream, state) { function emitReadable(stream) { var state = stream._readableState; + debug('emitReadable', state.needReadable, state.emittedReadable); state.needReadable = false; if (!state.emittedReadable) { @@ -518,6 +536,7 @@ function emitReadable_(stream) { if (!state.destroyed && (state.length || state.ended)) { stream.emit('readable'); + state.emittedReadable = false; } // The stream needs another readable event if // 1. It is not flowing, as the flow mechanism will take // care of it. @@ -583,7 +602,7 @@ function maybeReadMore_(stream, state) { Readable.prototype._read = function (n) { - this.emit('error', new ERR_METHOD_NOT_IMPLEMENTED('_read()')); + errorOrDestroy(this, new ERR_METHOD_NOT_IMPLEMENTED('_read()')); }; Readable.prototype.pipe = function (dest, pipeOpts) { @@ -682,7 +701,7 @@ Readable.prototype.pipe = function (dest, pipeOpts) { debug('onerror', er); unpipe(); dest.removeListener('error', onerror); - if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er); + if (EElistenerCount(dest, 'error') === 0) errorOrDestroy(dest, er); } // Make sure our error handler is attached before userland ones. @@ -986,8 +1005,6 @@ Readable.prototype.wrap = function (stream) { if (typeof Symbol === 'function') { Readable.prototype[Symbol.asyncIterator] = function () { - emitExperimentalWarning('Readable[Symbol.asyncIterator]'); - if (createReadableStreamAsyncIterator === undefined) { createReadableStreamAsyncIterator = require('./internal/streams/async_iterator'); } @@ -1075,9 +1092,29 @@ function endReadableNT(state, stream) { state.endEmitted = true; stream.readable = false; stream.emit('end'); + + if (state.autoDestroy) { + // In case of duplex streams we need a way to detect + // if the writable side is ready for autoDestroy as well + var wState = stream._writableState; + + if (!wState || wState.autoDestroy && wState.finished) { + stream.destroy(); + } + } } } +if (typeof Symbol === 'function') { + Readable.from = function (iterable, opts) { + if (from === undefined) { + from = require('./internal/streams/from'); + } + + return from(Readable, iterable, opts); + }; +} + function indexOf(xs, x) { for (var i = 0, l = xs.length; i < l; i++) { if (xs[i] === x) return i; diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/readable-stream/lib/_stream_writable.js index b35447aedc3a95..a2634d7c24fd5e 100644 --- a/deps/npm/node_modules/readable-stream/lib/_stream_writable.js +++ b/deps/npm/node_modules/readable-stream/lib/_stream_writable.js @@ -94,6 +94,8 @@ var _require$codes = require('../errors').codes, ERR_STREAM_WRITE_AFTER_END = _require$codes.ERR_STREAM_WRITE_AFTER_END, ERR_UNKNOWN_ENCODING = _require$codes.ERR_UNKNOWN_ENCODING; +var errorOrDestroy = destroyImpl.errorOrDestroy; + require('inherits')(Writable, Stream); function nop() {} @@ -173,7 +175,9 @@ function WritableState(options, stream, isDuplex) { this.errorEmitted = false; // Should close be emitted on destroy. Defaults to true. - this.emitClose = options.emitClose !== false; // count buffered requests + this.emitClose = options.emitClose !== false; // Should .destroy() be called after 'finish' (and potentially 'end') + + this.autoDestroy = !!options.autoDestroy; // count buffered requests this.bufferedRequestCount = 0; // allocate the first CorkedRequest, there is always // one allocated and free to use, and we maintain at most two @@ -250,13 +254,13 @@ function Writable(options) { Writable.prototype.pipe = function () { - this.emit('error', new ERR_STREAM_CANNOT_PIPE()); + errorOrDestroy(this, new ERR_STREAM_CANNOT_PIPE()); }; function writeAfterEnd(stream, cb) { var er = new ERR_STREAM_WRITE_AFTER_END(); // TODO: defer error events consistently everywhere, not just the cb - stream.emit('error', er); + errorOrDestroy(stream, er); process.nextTick(cb, er); } // Checks that a user-supplied chunk is valid, especially for the particular // mode the stream is in. Currently this means that `null` is never accepted @@ -273,7 +277,7 @@ function validChunk(stream, state, chunk, cb) { } if (er) { - stream.emit('error', er); + errorOrDestroy(stream, er); process.nextTick(cb, er); return false; } @@ -417,13 +421,13 @@ function onwriteError(stream, state, sync, er, cb) { process.nextTick(finishMaybe, stream, state); stream._writableState.errorEmitted = true; - stream.emit('error', er); + errorOrDestroy(stream, er); } else { // the caller expect this to happen before if // it is async cb(er); stream._writableState.errorEmitted = true; - stream.emit('error', er); // this can emit finish, but finish must + errorOrDestroy(stream, er); // this can emit finish, but finish must // always follow error finishMaybe(stream, state); @@ -587,7 +591,7 @@ function callFinal(stream, state) { state.pendingcb--; if (err) { - stream.emit('error', err); + errorOrDestroy(stream, err); } state.prefinished = true; @@ -618,6 +622,16 @@ function finishMaybe(stream, state) { if (state.pendingcb === 0) { state.finished = true; stream.emit('finish'); + + if (state.autoDestroy) { + // In case of duplex streams we need a way to detect + // if the readable side is ready for autoDestroy as well + var rState = stream._readableState; + + if (!rState || rState.autoDestroy && rState.endEmitted) { + stream.destroy(); + } + } } } diff --git a/deps/npm/node_modules/readable-stream/lib/internal/streams/buffer_list.js b/deps/npm/node_modules/readable-stream/lib/internal/streams/buffer_list.js index ebaf5c72aa7a61..cdea425f19dd96 100644 --- a/deps/npm/node_modules/readable-stream/lib/internal/streams/buffer_list.js +++ b/deps/npm/node_modules/readable-stream/lib/internal/streams/buffer_list.js @@ -1,9 +1,17 @@ 'use strict'; -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; } +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } + +function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } + var _require = require('buffer'), Buffer = _require.Buffer; @@ -20,170 +28,183 @@ module.exports = /*#__PURE__*/ function () { function BufferList() { + _classCallCheck(this, BufferList); + this.head = null; this.tail = null; this.length = 0; } - var _proto = BufferList.prototype; - - _proto.push = function push(v) { - var entry = { - data: v, - next: null - }; - if (this.length > 0) this.tail.next = entry;else this.head = entry; - this.tail = entry; - ++this.length; - }; - - _proto.unshift = function unshift(v) { - var entry = { - data: v, - next: this.head - }; - if (this.length === 0) this.tail = entry; - this.head = entry; - ++this.length; - }; - - _proto.shift = function shift() { - if (this.length === 0) return; - var ret = this.head.data; - if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next; - --this.length; - return ret; - }; - - _proto.clear = function clear() { - this.head = this.tail = null; - this.length = 0; - }; - - _proto.join = function join(s) { - if (this.length === 0) return ''; - var p = this.head; - var ret = '' + p.data; - - while (p = p.next) { - ret += s + p.data; + _createClass(BufferList, [{ + key: "push", + value: function push(v) { + var entry = { + data: v, + next: null + }; + if (this.length > 0) this.tail.next = entry;else this.head = entry; + this.tail = entry; + ++this.length; } - - return ret; - }; - - _proto.concat = function concat(n) { - if (this.length === 0) return Buffer.alloc(0); - var ret = Buffer.allocUnsafe(n >>> 0); - var p = this.head; - var i = 0; - - while (p) { - copyBuffer(p.data, ret, i); - i += p.data.length; - p = p.next; + }, { + key: "unshift", + value: function unshift(v) { + var entry = { + data: v, + next: this.head + }; + if (this.length === 0) this.tail = entry; + this.head = entry; + ++this.length; } - - return ret; - } // Consumes a specified amount of bytes or characters from the buffered data. - ; - - _proto.consume = function consume(n, hasStrings) { - var ret; - - if (n < this.head.data.length) { - // `slice` is the same for buffers and strings. - ret = this.head.data.slice(0, n); - this.head.data = this.head.data.slice(n); - } else if (n === this.head.data.length) { - // First chunk is a perfect match. - ret = this.shift(); - } else { - // Result spans more than one buffer. - ret = hasStrings ? this._getString(n) : this._getBuffer(n); + }, { + key: "shift", + value: function shift() { + if (this.length === 0) return; + var ret = this.head.data; + if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next; + --this.length; + return ret; + } + }, { + key: "clear", + value: function clear() { + this.head = this.tail = null; + this.length = 0; } + }, { + key: "join", + value: function join(s) { + if (this.length === 0) return ''; + var p = this.head; + var ret = '' + p.data; + + while (p = p.next) { + ret += s + p.data; + } - return ret; - }; - - _proto.first = function first() { - return this.head.data; - } // Consumes a specified amount of characters from the buffered data. - ; - - _proto._getString = function _getString(n) { - var p = this.head; - var c = 1; - var ret = p.data; - n -= ret.length; - - while (p = p.next) { - var str = p.data; - var nb = n > str.length ? str.length : n; - if (nb === str.length) ret += str;else ret += str.slice(0, n); - n -= nb; - - if (n === 0) { - if (nb === str.length) { - ++c; - if (p.next) this.head = p.next;else this.head = this.tail = null; - } else { - this.head = p; - p.data = str.slice(nb); - } + return ret; + } + }, { + key: "concat", + value: function concat(n) { + if (this.length === 0) return Buffer.alloc(0); + var ret = Buffer.allocUnsafe(n >>> 0); + var p = this.head; + var i = 0; + + while (p) { + copyBuffer(p.data, ret, i); + i += p.data.length; + p = p.next; + } - break; + return ret; + } // Consumes a specified amount of bytes or characters from the buffered data. + + }, { + key: "consume", + value: function consume(n, hasStrings) { + var ret; + + if (n < this.head.data.length) { + // `slice` is the same for buffers and strings. + ret = this.head.data.slice(0, n); + this.head.data = this.head.data.slice(n); + } else if (n === this.head.data.length) { + // First chunk is a perfect match. + ret = this.shift(); + } else { + // Result spans more than one buffer. + ret = hasStrings ? this._getString(n) : this._getBuffer(n); } - ++c; + return ret; } + }, { + key: "first", + value: function first() { + return this.head.data; + } // Consumes a specified amount of characters from the buffered data. + + }, { + key: "_getString", + value: function _getString(n) { + var p = this.head; + var c = 1; + var ret = p.data; + n -= ret.length; + + while (p = p.next) { + var str = p.data; + var nb = n > str.length ? str.length : n; + if (nb === str.length) ret += str;else ret += str.slice(0, n); + n -= nb; + + if (n === 0) { + if (nb === str.length) { + ++c; + if (p.next) this.head = p.next;else this.head = this.tail = null; + } else { + this.head = p; + p.data = str.slice(nb); + } + + break; + } - this.length -= c; - return ret; - } // Consumes a specified amount of bytes from the buffered data. - ; - - _proto._getBuffer = function _getBuffer(n) { - var ret = Buffer.allocUnsafe(n); - var p = this.head; - var c = 1; - p.data.copy(ret); - n -= p.data.length; - - while (p = p.next) { - var buf = p.data; - var nb = n > buf.length ? buf.length : n; - buf.copy(ret, ret.length - n, 0, nb); - n -= nb; - - if (n === 0) { - if (nb === buf.length) { - ++c; - if (p.next) this.head = p.next;else this.head = this.tail = null; - } else { - this.head = p; - p.data = buf.slice(nb); + ++c; + } + + this.length -= c; + return ret; + } // Consumes a specified amount of bytes from the buffered data. + + }, { + key: "_getBuffer", + value: function _getBuffer(n) { + var ret = Buffer.allocUnsafe(n); + var p = this.head; + var c = 1; + p.data.copy(ret); + n -= p.data.length; + + while (p = p.next) { + var buf = p.data; + var nb = n > buf.length ? buf.length : n; + buf.copy(ret, ret.length - n, 0, nb); + n -= nb; + + if (n === 0) { + if (nb === buf.length) { + ++c; + if (p.next) this.head = p.next;else this.head = this.tail = null; + } else { + this.head = p; + p.data = buf.slice(nb); + } + + break; } - break; + ++c; } - ++c; + this.length -= c; + return ret; + } // Make sure the linked list only shows the minimal necessary information. + + }, { + key: custom, + value: function value(_, options) { + return inspect(this, _objectSpread({}, options, { + // Only inspect one level. + depth: 0, + // It should not recurse. + customInspect: false + })); } - - this.length -= c; - return ret; - } // Make sure the linked list only shows the minimal necessary information. - ; - - _proto[custom] = function (_, options) { - return inspect(this, _objectSpread({}, options, { - // Only inspect one level. - depth: 0, - // It should not recurse. - customInspect: false - })); - }; + }]); return BufferList; }(); \ No newline at end of file diff --git a/deps/npm/node_modules/readable-stream/lib/internal/streams/destroy.js b/deps/npm/node_modules/readable-stream/lib/internal/streams/destroy.js index 63ae49928dd95b..3268a16f3b6f23 100644 --- a/deps/npm/node_modules/readable-stream/lib/internal/streams/destroy.js +++ b/deps/npm/node_modules/readable-stream/lib/internal/streams/destroy.js @@ -9,8 +9,13 @@ function destroy(err, cb) { if (readableDestroyed || writableDestroyed) { if (cb) { cb(err); - } else if (err && (!this._writableState || !this._writableState.errorEmitted)) { - process.nextTick(emitErrorNT, this, err); + } else if (err) { + if (!this._writableState) { + process.nextTick(emitErrorNT, this, err); + } else if (!this._writableState.errorEmitted) { + this._writableState.errorEmitted = true; + process.nextTick(emitErrorNT, this, err); + } } return this; @@ -29,10 +34,13 @@ function destroy(err, cb) { this._destroy(err || null, function (err) { if (!cb && err) { - process.nextTick(emitErrorAndCloseNT, _this, err); - - if (_this._writableState) { + if (!_this._writableState) { + process.nextTick(emitErrorAndCloseNT, _this, err); + } else if (!_this._writableState.errorEmitted) { _this._writableState.errorEmitted = true; + process.nextTick(emitErrorAndCloseNT, _this, err); + } else { + process.nextTick(emitCloseNT, _this); } } else if (cb) { process.nextTick(emitCloseNT, _this); @@ -79,7 +87,19 @@ function emitErrorNT(self, err) { self.emit('error', err); } +function errorOrDestroy(stream, err) { + // We have tests that rely on errors being emitted + // in the same tick, so changing this is semver major. + // For now when you opt-in to autoDestroy we allow + // the error to be emitted nextTick. In a future + // semver major update we should change the default to this. + var rState = stream._readableState; + var wState = stream._writableState; + if (rState && rState.autoDestroy || wState && wState.autoDestroy) stream.destroy(err);else stream.emit('error', err); +} + module.exports = { destroy: destroy, - undestroy: undestroy + undestroy: undestroy, + errorOrDestroy: errorOrDestroy }; \ No newline at end of file diff --git a/deps/npm/node_modules/readable-stream/lib/internal/streams/from-browser.js b/deps/npm/node_modules/readable-stream/lib/internal/streams/from-browser.js new file mode 100644 index 00000000000000..a4ce56f3c90f60 --- /dev/null +++ b/deps/npm/node_modules/readable-stream/lib/internal/streams/from-browser.js @@ -0,0 +1,3 @@ +module.exports = function () { + throw new Error('Readable.from is not available in the browser') +}; diff --git a/deps/npm/node_modules/readable-stream/lib/internal/streams/from.js b/deps/npm/node_modules/readable-stream/lib/internal/streams/from.js new file mode 100644 index 00000000000000..6c41284416799c --- /dev/null +++ b/deps/npm/node_modules/readable-stream/lib/internal/streams/from.js @@ -0,0 +1,64 @@ +'use strict'; + +function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } + +function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } + +function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } + +function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + +var ERR_INVALID_ARG_TYPE = require('../../../errors').codes.ERR_INVALID_ARG_TYPE; + +function from(Readable, iterable, opts) { + var iterator; + + if (iterable && typeof iterable.next === 'function') { + iterator = iterable; + } else if (iterable && iterable[Symbol.asyncIterator]) iterator = iterable[Symbol.asyncIterator]();else if (iterable && iterable[Symbol.iterator]) iterator = iterable[Symbol.iterator]();else throw new ERR_INVALID_ARG_TYPE('iterable', ['Iterable'], iterable); + + var readable = new Readable(_objectSpread({ + objectMode: true + }, opts)); // Reading boolean to protect against _read + // being called before last iteration completion. + + var reading = false; + + readable._read = function () { + if (!reading) { + reading = true; + next(); + } + }; + + function next() { + return _next2.apply(this, arguments); + } + + function _next2() { + _next2 = _asyncToGenerator(function* () { + try { + var _ref = yield iterator.next(), + value = _ref.value, + done = _ref.done; + + if (done) { + readable.push(null); + } else if (readable.push((yield value))) { + next(); + } else { + reading = false; + } + } catch (err) { + readable.destroy(err); + } + }); + return _next2.apply(this, arguments); + } + + return readable; +} + +module.exports = from; \ No newline at end of file diff --git a/deps/npm/node_modules/readable-stream/package.json b/deps/npm/node_modules/readable-stream/package.json index 67c7e602f26275..9c29e095cbd6be 100644 --- a/deps/npm/node_modules/readable-stream/package.json +++ b/deps/npm/node_modules/readable-stream/package.json @@ -1,19 +1,19 @@ { - "_from": "readable-stream@3.4.0", - "_id": "readable-stream@3.4.0", + "_from": "readable-stream@3.6.0", + "_id": "readable-stream@3.6.0", "_inBundle": false, - "_integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "_integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "_location": "/readable-stream", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "readable-stream@3.4.0", + "raw": "readable-stream@3.6.0", "name": "readable-stream", "escapedName": "readable-stream", - "rawSpec": "3.4.0", + "rawSpec": "3.6.0", "saveSpec": null, - "fetchSpec": "3.4.0" + "fetchSpec": "3.6.0" }, "_requiredBy": [ "#USER", @@ -21,15 +21,16 @@ "/bl", "/tar-stream" ], - "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "_shasum": "a51c26754658e0a3c21dbf59163bd45ba6f447fc", - "_spec": "readable-stream@3.4.0", - "_where": "/Users/isaacs/dev/npm/cli", + "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "_shasum": "337bbda3adc0706bd3e024426a286d4b4b2c9198", + "_spec": "readable-stream@3.6.0", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli", "browser": { "util": false, "worker_threads": false, "./errors": "./errors-browser.js", "./readable.js": "./readable-browser.js", + "./lib/internal/streams/from.js": "./lib/internal/streams/from-browser.js", "./lib/internal/streams/stream.js": "./lib/internal/streams/stream-browser.js" }, "bugs": { @@ -52,6 +53,7 @@ "assert": "^1.4.0", "bl": "^2.0.0", "deep-strict-equal": "^0.2.0", + "events.once": "^2.0.2", "glob": "^7.1.2", "gunzip-maybe": "^1.4.1", "hyperquest": "^2.1.3", @@ -94,5 +96,5 @@ "test-browsers": "airtap --sauce-connect --loopback airtap.local -- test/browser.js", "update-browser-errors": "babel -o errors-browser.js errors.js" }, - "version": "3.4.0" + "version": "3.6.0" } diff --git a/deps/npm/node_modules/registry-auth-token/.npmignore b/deps/npm/node_modules/registry-auth-token/.npmignore new file mode 100644 index 00000000000000..4196028460bfcb --- /dev/null +++ b/deps/npm/node_modules/registry-auth-token/.npmignore @@ -0,0 +1,6 @@ +.editorconfig +.eslintignore +.eslintrc +.travis.yml +npm-debug.log +coverage diff --git a/deps/npm/node_modules/registry-auth-token/CHANGELOG.md b/deps/npm/node_modules/registry-auth-token/CHANGELOG.md index 75f7b6f2f70713..20e82e870ef454 100644 --- a/deps/npm/node_modules/registry-auth-token/CHANGELOG.md +++ b/deps/npm/node_modules/registry-auth-token/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes will be documented in this file. +## [3.4.0] - 2019-03-20 + +### Changes + +- Enabled legacy auth token to be read from environment variable (Martin Flodin) + ## [3.3.2] - 2018-01-26 ### Changes diff --git a/deps/npm/node_modules/registry-auth-token/index.js b/deps/npm/node_modules/registry-auth-token/index.js index d68f7eeb4bc724..f8c6216eab9cd8 100644 --- a/deps/npm/node_modules/registry-auth-token/index.js +++ b/deps/npm/node_modules/registry-auth-token/index.js @@ -52,10 +52,13 @@ function getRegistryAuthInfo (checkUrl, options) { } function getLegacyAuthInfo (npmrc) { - if (npmrc._auth) { - return {token: npmrc._auth, type: 'Basic'} + if (!npmrc._auth) { + return undefined } - return undefined + + var token = replaceEnvironmentVariable(npmrc._auth) + + return {token: token, type: 'Basic'} } function normalizePath (path) { @@ -80,15 +83,19 @@ function getAuthInfoForUrl (regUrl, npmrc) { return undefined } +function replaceEnvironmentVariable (token) { + return token.replace(/^\$\{?([^}]*)\}?$/, function (fullMatch, envVar) { + return process.env[envVar] + }) +} + function getBearerToken (tok) { if (!tok) { return undefined } - // check if bearer token - var token = tok.replace(/^\$\{?([^}]*)\}?$/, function (fullMatch, envVar) { - return process.env[envVar] - }) + // check if bearer token is set as environment variable + var token = replaceEnvironmentVariable(tok) return {token: token, type: 'Bearer'} } @@ -100,9 +107,7 @@ function getTokenForUsernameAndPassword (username, password) { // passwords are base64 encoded, so we need to decode it // See https://github.com/npm/npm/blob/v3.10.6/lib/config/set-credentials-by-uri.js#L26 - var pass = decodeBase64(password.replace(/^\$\{?([^}]*)\}?$/, function (fullMatch, envVar) { - return process.env[envVar] - })) + var pass = decodeBase64(replaceEnvironmentVariable(password)) // a basic auth token is base64 encoded 'username:password' // See https://github.com/npm/npm/blob/v3.10.6/lib/config/get-credentials-by-uri.js#L70 diff --git a/deps/npm/node_modules/registry-auth-token/package.json b/deps/npm/node_modules/registry-auth-token/package.json index 3be95088b858dd..dd090a836b569a 100644 --- a/deps/npm/node_modules/registry-auth-token/package.json +++ b/deps/npm/node_modules/registry-auth-token/package.json @@ -1,8 +1,8 @@ { "_from": "registry-auth-token@^3.0.1", - "_id": "registry-auth-token@3.3.2", + "_id": "registry-auth-token@3.4.0", "_inBundle": false, - "_integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", + "_integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", "_location": "/registry-auth-token", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/package-json" ], - "_resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", - "_shasum": "851fd49038eecb586911115af845260eec983f20", + "_resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", + "_shasum": "d7446815433f5d5ed6431cd5dca21048f66b397e", "_spec": "registry-auth-token@^3.0.1", - "_where": "/Users/rebecca/code/npm/node_modules/package-json", + "_where": "/Users/ruyadorno/Documents/workspace/cli/node_modules/package-json", "author": { "name": "Espen Hovlandsdal", "email": "espen@hovlandsdal.com" @@ -70,5 +70,5 @@ "coverage/**" ] }, - "version": "3.3.2" + "version": "3.4.0" } diff --git a/deps/npm/node_modules/registry-auth-token/test/auth-token.test.js b/deps/npm/node_modules/registry-auth-token/test/auth-token.test.js index 824d1bf92e6de8..5db6f5a192890a 100644 --- a/deps/npm/node_modules/registry-auth-token/test/auth-token.test.js +++ b/deps/npm/node_modules/registry-auth-token/test/auth-token.test.js @@ -50,6 +50,42 @@ describe('auth-token', function () { done() }) }) + + it('should return legacy auth token defined by reference to an environment variable (with curly braces)', function (done) { + var environmentVariable = '__REGISTRY_AUTH_TOKEN_NPM_TOKEN__' + var content = [ + '_auth=${' + environmentVariable + '}', + 'registry=http://registry.foobar.eu/' + ].join('\n') + + process.env[environmentVariable] = 'foobar' + + fs.writeFile(npmRcPath, content, function (err) { + var getAuthToken = requireUncached('../index') + assert(!err, err) + assert.deepEqual(getAuthToken(), {token: 'foobar', type: 'Basic'}) + delete process.env[environmentVariable] + done() + }) + }) + + it('should return legacy auth token defined by reference to an environment variable (without curly braces)', function (done) { + var environmentVariable = '__REGISTRY_AUTH_TOKEN_NPM_TOKEN__' + var content = [ + '_auth=$' + environmentVariable, + 'registry=http://registry.foobar.eu/' + ].join('\n') + + process.env[environmentVariable] = 'foobar' + + fs.writeFile(npmRcPath, content, function (err) { + var getAuthToken = requireUncached('../index') + assert(!err, err) + assert.deepEqual(getAuthToken(), {token: 'foobar', type: 'Basic'}) + delete process.env[environmentVariable] + done() + }) + }) }) describe('bearer token', function () { diff --git a/deps/npm/node_modules/registry-auth-token/yarn.lock b/deps/npm/node_modules/registry-auth-token/yarn.lock index 23f7b13a766811..46c1357274cf6c 100644 --- a/deps/npm/node_modules/registry-auth-token/yarn.lock +++ b/deps/npm/node_modules/registry-auth-token/yarn.lock @@ -234,9 +234,9 @@ decamelize@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" deep-is@~0.1.3: version "0.1.3" @@ -1197,11 +1197,11 @@ progress@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" -rc@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3" +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: - deep-extend "~0.4.0" + deep-extend "^0.6.0" ini "~1.3.0" minimist "^1.2.0" strip-json-comments "~2.0.1" @@ -1290,7 +1290,11 @@ rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" -safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" diff --git a/deps/npm/node_modules/rimraf/package.json b/deps/npm/node_modules/rimraf/package.json index a82c85a6954442..48f172fb29f5c0 100644 --- a/deps/npm/node_modules/rimraf/package.json +++ b/deps/npm/node_modules/rimraf/package.json @@ -1,46 +1,47 @@ { - "_from": "rimraf@2.6.3", - "_id": "rimraf@2.6.3", + "_from": "rimraf@2.7.1", + "_id": "rimraf@2.7.1", "_inBundle": false, - "_integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "_integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "_location": "/rimraf", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "rimraf@2.6.3", + "raw": "rimraf@2.7.1", "name": "rimraf", "escapedName": "rimraf", - "rawSpec": "2.6.3", + "rawSpec": "2.7.1", "saveSpec": null, - "fetchSpec": "2.6.3" + "fetchSpec": "2.7.1" }, "_requiredBy": [ "#USER", "/", "/cacache", "/copy-concurrently", - "/flat-cache", "/fs-vacuum", - "/fstream", + "/istanbul-lib-source-maps", "/libcipm", "/libnpx", "/move-concurrently", "/node-gyp", + "/nyc", "/pacote", + "/spawn-wrap", "/tap" ], - "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "_shasum": "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab", - "_spec": "rimraf@2.6.3", - "_where": "/Users/aeschright/code/cli", + "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "_shasum": "35797f13a7fdadc566142c29d4f07ccad483e3ec", + "_spec": "rimraf@2.7.1", + "_where": "/Users/darcyclarke/Documents/Repos/npm/npm/cli", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bin": { - "rimraf": "./bin.js" + "rimraf": "bin.js" }, "bugs": { "url": "https://github.com/isaacs/rimraf/issues" @@ -75,5 +76,5 @@ "preversion": "npm test", "test": "tap test/*.js" }, - "version": "2.6.3" + "version": "2.7.1" } diff --git a/deps/npm/node_modules/rimraf/rimraf.js b/deps/npm/node_modules/rimraf/rimraf.js index e80dd10693f8f6..a90ad029f3ece1 100644 --- a/deps/npm/node_modules/rimraf/rimraf.js +++ b/deps/npm/node_modules/rimraf/rimraf.js @@ -4,7 +4,12 @@ rimraf.sync = rimrafSync var assert = require("assert") var path = require("path") var fs = require("fs") -var glob = require("glob") +var glob = undefined +try { + glob = require("glob") +} catch (_err) { + // treat glob as optional. +} var _0666 = parseInt('666', 8) var defaultGlobOpts = { @@ -37,6 +42,9 @@ function defaults (options) { if (options.glob === false) { options.disableGlob = true } + if (options.disableGlob !== true && glob === undefined) { + throw Error('glob dependency not found, set `options.disableGlob = true` if intentional') + } options.disableGlob = options.disableGlob || false options.glob = options.glob || defaultGlobOpts } diff --git a/deps/npm/node_modules/stream-iterate/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/stream-iterate/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/stream-iterate/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/LICENSE b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/LICENSE new file mode 100644 index 00000000000000..0c068ceecbd48f --- /dev/null +++ b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) Feross Aboukhadijeh + +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. diff --git a/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/README.md b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/README.md new file mode 100644 index 00000000000000..356e3519302cfa --- /dev/null +++ b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/README.md @@ -0,0 +1,586 @@ +# safe-buffer [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url] + +[travis-image]: https://img.shields.io/travis/feross/safe-buffer/master.svg +[travis-url]: https://travis-ci.org/feross/safe-buffer +[npm-image]: https://img.shields.io/npm/v/safe-buffer.svg +[npm-url]: https://npmjs.org/package/safe-buffer +[downloads-image]: https://img.shields.io/npm/dm/safe-buffer.svg +[downloads-url]: https://npmjs.org/package/safe-buffer +[standard-image]: https://img.shields.io/badge/code_style-standard-brightgreen.svg +[standard-url]: https://standardjs.com + +#### Safer Node.js Buffer API + +**Use the new Node.js Buffer APIs (`Buffer.from`, `Buffer.alloc`, +`Buffer.allocUnsafe`, `Buffer.allocUnsafeSlow`) in all versions of Node.js.** + +**Uses the built-in implementation when available.** + +## install + +``` +npm install safe-buffer +``` + +[Get supported safe-buffer with the Tidelift Subscription](https://tidelift.com/subscription/pkg/npm-safe-buffer?utm_source=npm-safe-buffer&utm_medium=referral&utm_campaign=readme) + +## usage + +The goal of this package is to provide a safe replacement for the node.js `Buffer`. + +It's a drop-in replacement for `Buffer`. You can use it by adding one `require` line to +the top of your node.js modules: + +```js +var Buffer = require('safe-buffer').Buffer + +// Existing buffer code will continue to work without issues: + +new Buffer('hey', 'utf8') +new Buffer([1, 2, 3], 'utf8') +new Buffer(obj) +new Buffer(16) // create an uninitialized buffer (potentially unsafe) + +// But you can use these new explicit APIs to make clear what you want: + +Buffer.from('hey', 'utf8') // convert from many types to a Buffer +Buffer.alloc(16) // create a zero-filled buffer (safe) +Buffer.allocUnsafe(16) // create an uninitialized buffer (potentially unsafe) +``` + +## api + +### Class Method: Buffer.from(array) + + +* `array` {Array} + +Allocates a new `Buffer` using an `array` of octets. + +```js +const buf = Buffer.from([0x62,0x75,0x66,0x66,0x65,0x72]); + // creates a new Buffer containing ASCII bytes + // ['b','u','f','f','e','r'] +``` + +A `TypeError` will be thrown if `array` is not an `Array`. + +### Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]]) + + +* `arrayBuffer` {ArrayBuffer} The `.buffer` property of a `TypedArray` or + a `new ArrayBuffer()` +* `byteOffset` {Number} Default: `0` +* `length` {Number} Default: `arrayBuffer.length - byteOffset` + +When passed a reference to the `.buffer` property of a `TypedArray` instance, +the newly created `Buffer` will share the same allocated memory as the +TypedArray. + +```js +const arr = new Uint16Array(2); +arr[0] = 5000; +arr[1] = 4000; + +const buf = Buffer.from(arr.buffer); // shares the memory with arr; + +console.log(buf); + // Prints: + +// changing the TypedArray changes the Buffer also +arr[1] = 6000; + +console.log(buf); + // Prints: +``` + +The optional `byteOffset` and `length` arguments specify a memory range within +the `arrayBuffer` that will be shared by the `Buffer`. + +```js +const ab = new ArrayBuffer(10); +const buf = Buffer.from(ab, 0, 2); +console.log(buf.length); + // Prints: 2 +``` + +A `TypeError` will be thrown if `arrayBuffer` is not an `ArrayBuffer`. + +### Class Method: Buffer.from(buffer) + + +* `buffer` {Buffer} + +Copies the passed `buffer` data onto a new `Buffer` instance. + +```js +const buf1 = Buffer.from('buffer'); +const buf2 = Buffer.from(buf1); + +buf1[0] = 0x61; +console.log(buf1.toString()); + // 'auffer' +console.log(buf2.toString()); + // 'buffer' (copy is not changed) +``` + +A `TypeError` will be thrown if `buffer` is not a `Buffer`. + +### Class Method: Buffer.from(str[, encoding]) + + +* `str` {String} String to encode. +* `encoding` {String} Encoding to use, Default: `'utf8'` + +Creates a new `Buffer` containing the given JavaScript string `str`. If +provided, the `encoding` parameter identifies the character encoding. +If not provided, `encoding` defaults to `'utf8'`. + +```js +const buf1 = Buffer.from('this is a tést'); +console.log(buf1.toString()); + // prints: this is a tést +console.log(buf1.toString('ascii')); + // prints: this is a tC)st + +const buf2 = Buffer.from('7468697320697320612074c3a97374', 'hex'); +console.log(buf2.toString()); + // prints: this is a tést +``` + +A `TypeError` will be thrown if `str` is not a string. + +### Class Method: Buffer.alloc(size[, fill[, encoding]]) + + +* `size` {Number} +* `fill` {Value} Default: `undefined` +* `encoding` {String} Default: `utf8` + +Allocates a new `Buffer` of `size` bytes. If `fill` is `undefined`, the +`Buffer` will be *zero-filled*. + +```js +const buf = Buffer.alloc(5); +console.log(buf); + // +``` + +The `size` must be less than or equal to the value of +`require('buffer').kMaxLength` (on 64-bit architectures, `kMaxLength` is +`(2^31)-1`). Otherwise, a [`RangeError`][] is thrown. A zero-length Buffer will +be created if a `size` less than or equal to 0 is specified. + +If `fill` is specified, the allocated `Buffer` will be initialized by calling +`buf.fill(fill)`. See [`buf.fill()`][] for more information. + +```js +const buf = Buffer.alloc(5, 'a'); +console.log(buf); + // +``` + +If both `fill` and `encoding` are specified, the allocated `Buffer` will be +initialized by calling `buf.fill(fill, encoding)`. For example: + +```js +const buf = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64'); +console.log(buf); + // +``` + +Calling `Buffer.alloc(size)` can be significantly slower than the alternative +`Buffer.allocUnsafe(size)` but ensures that the newly created `Buffer` instance +contents will *never contain sensitive data*. + +A `TypeError` will be thrown if `size` is not a number. + +### Class Method: Buffer.allocUnsafe(size) + + +* `size` {Number} + +Allocates a new *non-zero-filled* `Buffer` of `size` bytes. The `size` must +be less than or equal to the value of `require('buffer').kMaxLength` (on 64-bit +architectures, `kMaxLength` is `(2^31)-1`). Otherwise, a [`RangeError`][] is +thrown. A zero-length Buffer will be created if a `size` less than or equal to +0 is specified. + +The underlying memory for `Buffer` instances created in this way is *not +initialized*. The contents of the newly created `Buffer` are unknown and +*may contain sensitive data*. Use [`buf.fill(0)`][] to initialize such +`Buffer` instances to zeroes. + +```js +const buf = Buffer.allocUnsafe(5); +console.log(buf); + // + // (octets will be different, every time) +buf.fill(0); +console.log(buf); + // +``` + +A `TypeError` will be thrown if `size` is not a number. + +Note that the `Buffer` module pre-allocates an internal `Buffer` instance of +size `Buffer.poolSize` that is used as a pool for the fast allocation of new +`Buffer` instances created using `Buffer.allocUnsafe(size)` (and the deprecated +`new Buffer(size)` constructor) only when `size` is less than or equal to +`Buffer.poolSize >> 1` (floor of `Buffer.poolSize` divided by two). The default +value of `Buffer.poolSize` is `8192` but can be modified. + +Use of this pre-allocated internal memory pool is a key difference between +calling `Buffer.alloc(size, fill)` vs. `Buffer.allocUnsafe(size).fill(fill)`. +Specifically, `Buffer.alloc(size, fill)` will *never* use the internal Buffer +pool, while `Buffer.allocUnsafe(size).fill(fill)` *will* use the internal +Buffer pool if `size` is less than or equal to half `Buffer.poolSize`. The +difference is subtle but can be important when an application requires the +additional performance that `Buffer.allocUnsafe(size)` provides. + +### Class Method: Buffer.allocUnsafeSlow(size) + + +* `size` {Number} + +Allocates a new *non-zero-filled* and non-pooled `Buffer` of `size` bytes. The +`size` must be less than or equal to the value of +`require('buffer').kMaxLength` (on 64-bit architectures, `kMaxLength` is +`(2^31)-1`). Otherwise, a [`RangeError`][] is thrown. A zero-length Buffer will +be created if a `size` less than or equal to 0 is specified. + +The underlying memory for `Buffer` instances created in this way is *not +initialized*. The contents of the newly created `Buffer` are unknown and +*may contain sensitive data*. Use [`buf.fill(0)`][] to initialize such +`Buffer` instances to zeroes. + +When using `Buffer.allocUnsafe()` to allocate new `Buffer` instances, +allocations under 4KB are, by default, sliced from a single pre-allocated +`Buffer`. This allows applications to avoid the garbage collection overhead of +creating many individually allocated Buffers. This approach improves both +performance and memory usage by eliminating the need to track and cleanup as +many `Persistent` objects. + +However, in the case where a developer may need to retain a small chunk of +memory from a pool for an indeterminate amount of time, it may be appropriate +to create an un-pooled Buffer instance using `Buffer.allocUnsafeSlow()` then +copy out the relevant bits. + +```js +// need to keep around a few small chunks of memory +const store = []; + +socket.on('readable', () => { + const data = socket.read(); + // allocate for retained data + const sb = Buffer.allocUnsafeSlow(10); + // copy the data into the new allocation + data.copy(sb, 0, 0, 10); + store.push(sb); +}); +``` + +Use of `Buffer.allocUnsafeSlow()` should be used only as a last resort *after* +a developer has observed undue memory retention in their applications. + +A `TypeError` will be thrown if `size` is not a number. + +### All the Rest + +The rest of the `Buffer` API is exactly the same as in node.js. +[See the docs](https://nodejs.org/api/buffer.html). + + +## Related links + +- [Node.js issue: Buffer(number) is unsafe](https://github.com/nodejs/node/issues/4660) +- [Node.js Enhancement Proposal: Buffer.from/Buffer.alloc/Buffer.zalloc/Buffer() soft-deprecate](https://github.com/nodejs/node-eps/pull/4) + +## Why is `Buffer` unsafe? + +Today, the node.js `Buffer` constructor is overloaded to handle many different argument +types like `String`, `Array`, `Object`, `TypedArrayView` (`Uint8Array`, etc.), +`ArrayBuffer`, and also `Number`. + +The API is optimized for convenience: you can throw any type at it, and it will try to do +what you want. + +Because the Buffer constructor is so powerful, you often see code like this: + +```js +// Convert UTF-8 strings to hex +function toHex (str) { + return new Buffer(str).toString('hex') +} +``` + +***But what happens if `toHex` is called with a `Number` argument?*** + +### Remote Memory Disclosure + +If an attacker can make your program call the `Buffer` constructor with a `Number` +argument, then they can make it allocate uninitialized memory from the node.js process. +This could potentially disclose TLS private keys, user data, or database passwords. + +When the `Buffer` constructor is passed a `Number` argument, it returns an +**UNINITIALIZED** block of memory of the specified `size`. When you create a `Buffer` like +this, you **MUST** overwrite the contents before returning it to the user. + +From the [node.js docs](https://nodejs.org/api/buffer.html#buffer_new_buffer_size): + +> `new Buffer(size)` +> +> - `size` Number +> +> The underlying memory for `Buffer` instances created in this way is not initialized. +> **The contents of a newly created `Buffer` are unknown and could contain sensitive +> data.** Use `buf.fill(0)` to initialize a Buffer to zeroes. + +(Emphasis our own.) + +Whenever the programmer intended to create an uninitialized `Buffer` you often see code +like this: + +```js +var buf = new Buffer(16) + +// Immediately overwrite the uninitialized buffer with data from another buffer +for (var i = 0; i < buf.length; i++) { + buf[i] = otherBuf[i] +} +``` + + +### Would this ever be a problem in real code? + +Yes. It's surprisingly common to forget to check the type of your variables in a +dynamically-typed language like JavaScript. + +Usually the consequences of assuming the wrong type is that your program crashes with an +uncaught exception. But the failure mode for forgetting to check the type of arguments to +the `Buffer` constructor is more catastrophic. + +Here's an example of a vulnerable service that takes a JSON payload and converts it to +hex: + +```js +// Take a JSON payload {str: "some string"} and convert it to hex +var server = http.createServer(function (req, res) { + var data = '' + req.setEncoding('utf8') + req.on('data', function (chunk) { + data += chunk + }) + req.on('end', function () { + var body = JSON.parse(data) + res.end(new Buffer(body.str).toString('hex')) + }) +}) + +server.listen(8080) +``` + +In this example, an http client just has to send: + +```json +{ + "str": 1000 +} +``` + +and it will get back 1,000 bytes of uninitialized memory from the server. + +This is a very serious bug. It's similar in severity to the +[the Heartbleed bug](http://heartbleed.com/) that allowed disclosure of OpenSSL process +memory by remote attackers. + + +### Which real-world packages were vulnerable? + +#### [`bittorrent-dht`](https://www.npmjs.com/package/bittorrent-dht) + +[Mathias Buus](https://github.com/mafintosh) and I +([Feross Aboukhadijeh](http://feross.org/)) found this issue in one of our own packages, +[`bittorrent-dht`](https://www.npmjs.com/package/bittorrent-dht). The bug would allow +anyone on the internet to send a series of messages to a user of `bittorrent-dht` and get +them to reveal 20 bytes at a time of uninitialized memory from the node.js process. + +Here's +[the commit](https://github.com/feross/bittorrent-dht/commit/6c7da04025d5633699800a99ec3fbadf70ad35b8) +that fixed it. We released a new fixed version, created a +[Node Security Project disclosure](https://nodesecurity.io/advisories/68), and deprecated all +vulnerable versions on npm so users will get a warning to upgrade to a newer version. + +#### [`ws`](https://www.npmjs.com/package/ws) + +That got us wondering if there were other vulnerable packages. Sure enough, within a short +period of time, we found the same issue in [`ws`](https://www.npmjs.com/package/ws), the +most popular WebSocket implementation in node.js. + +If certain APIs were called with `Number` parameters instead of `String` or `Buffer` as +expected, then uninitialized server memory would be disclosed to the remote peer. + +These were the vulnerable methods: + +```js +socket.send(number) +socket.ping(number) +socket.pong(number) +``` + +Here's a vulnerable socket server with some echo functionality: + +```js +server.on('connection', function (socket) { + socket.on('message', function (message) { + message = JSON.parse(message) + if (message.type === 'echo') { + socket.send(message.data) // send back the user's message + } + }) +}) +``` + +`socket.send(number)` called on the server, will disclose server memory. + +Here's [the release](https://github.com/websockets/ws/releases/tag/1.0.1) where the issue +was fixed, with a more detailed explanation. Props to +[Arnout Kazemier](https://github.com/3rd-Eden) for the quick fix. Here's the +[Node Security Project disclosure](https://nodesecurity.io/advisories/67). + + +### What's the solution? + +It's important that node.js offers a fast way to get memory otherwise performance-critical +applications would needlessly get a lot slower. + +But we need a better way to *signal our intent* as programmers. **When we want +uninitialized memory, we should request it explicitly.** + +Sensitive functionality should not be packed into a developer-friendly API that loosely +accepts many different types. This type of API encourages the lazy practice of passing +variables in without checking the type very carefully. + +#### A new API: `Buffer.allocUnsafe(number)` + +The functionality of creating buffers with uninitialized memory should be part of another +API. We propose `Buffer.allocUnsafe(number)`. This way, it's not part of an API that +frequently gets user input of all sorts of different types passed into it. + +```js +var buf = Buffer.allocUnsafe(16) // careful, uninitialized memory! + +// Immediately overwrite the uninitialized buffer with data from another buffer +for (var i = 0; i < buf.length; i++) { + buf[i] = otherBuf[i] +} +``` + + +### How do we fix node.js core? + +We sent [a PR to node.js core](https://github.com/nodejs/node/pull/4514) (merged as +`semver-major`) which defends against one case: + +```js +var str = 16 +new Buffer(str, 'utf8') +``` + +In this situation, it's implied that the programmer intended the first argument to be a +string, since they passed an encoding as a second argument. Today, node.js will allocate +uninitialized memory in the case of `new Buffer(number, encoding)`, which is probably not +what the programmer intended. + +But this is only a partial solution, since if the programmer does `new Buffer(variable)` +(without an `encoding` parameter) there's no way to know what they intended. If `variable` +is sometimes a number, then uninitialized memory will sometimes be returned. + +### What's the real long-term fix? + +We could deprecate and remove `new Buffer(number)` and use `Buffer.allocUnsafe(number)` when +we need uninitialized memory. But that would break 1000s of packages. + +~~We believe the best solution is to:~~ + +~~1. Change `new Buffer(number)` to return safe, zeroed-out memory~~ + +~~2. Create a new API for creating uninitialized Buffers. We propose: `Buffer.allocUnsafe(number)`~~ + +#### Update + +We now support adding three new APIs: + +- `Buffer.from(value)` - convert from any type to a buffer +- `Buffer.alloc(size)` - create a zero-filled buffer +- `Buffer.allocUnsafe(size)` - create an uninitialized buffer with given size + +This solves the core problem that affected `ws` and `bittorrent-dht` which is +`Buffer(variable)` getting tricked into taking a number argument. + +This way, existing code continues working and the impact on the npm ecosystem will be +minimal. Over time, npm maintainers can migrate performance-critical code to use +`Buffer.allocUnsafe(number)` instead of `new Buffer(number)`. + + +### Conclusion + +We think there's a serious design issue with the `Buffer` API as it exists today. It +promotes insecure software by putting high-risk functionality into a convenient API +with friendly "developer ergonomics". + +This wasn't merely a theoretical exercise because we found the issue in some of the +most popular npm packages. + +Fortunately, there's an easy fix that can be applied today. Use `safe-buffer` in place of +`buffer`. + +```js +var Buffer = require('safe-buffer').Buffer +``` + +Eventually, we hope that node.js core can switch to this new, safer behavior. We believe +the impact on the ecosystem would be minimal since it's not a breaking change. +Well-maintained, popular packages would be updated to use `Buffer.alloc` quickly, while +older, insecure packages would magically become safe from this attack vector. + + +## links + +- [Node.js PR: buffer: throw if both length and enc are passed](https://github.com/nodejs/node/pull/4514) +- [Node Security Project disclosure for `ws`](https://nodesecurity.io/advisories/67) +- [Node Security Project disclosure for`bittorrent-dht`](https://nodesecurity.io/advisories/68) + + +## credit + +The original issues in `bittorrent-dht` +([disclosure](https://nodesecurity.io/advisories/68)) and +`ws` ([disclosure](https://nodesecurity.io/advisories/67)) were discovered by +[Mathias Buus](https://github.com/mafintosh) and +[Feross Aboukhadijeh](http://feross.org/). + +Thanks to [Adam Baldwin](https://github.com/evilpacket) for helping disclose these issues +and for his work running the [Node Security Project](https://nodesecurity.io/). + +Thanks to [John Hiesey](https://github.com/jhiesey) for proofreading this README and +auditing the code. + + +## license + +MIT. Copyright (C) [Feross Aboukhadijeh](http://feross.org) diff --git a/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/index.d.ts b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/index.d.ts new file mode 100644 index 00000000000000..e9fed809a5ab51 --- /dev/null +++ b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/index.d.ts @@ -0,0 +1,187 @@ +declare module "safe-buffer" { + export class Buffer { + length: number + write(string: string, offset?: number, length?: number, encoding?: string): number; + toString(encoding?: string, start?: number, end?: number): string; + toJSON(): { type: 'Buffer', data: any[] }; + equals(otherBuffer: Buffer): boolean; + compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number; + copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number; + slice(start?: number, end?: number): Buffer; + writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; + writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; + writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; + writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; + readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number; + readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number; + readIntLE(offset: number, byteLength: number, noAssert?: boolean): number; + readIntBE(offset: number, byteLength: number, noAssert?: boolean): number; + readUInt8(offset: number, noAssert?: boolean): number; + readUInt16LE(offset: number, noAssert?: boolean): number; + readUInt16BE(offset: number, noAssert?: boolean): number; + readUInt32LE(offset: number, noAssert?: boolean): number; + readUInt32BE(offset: number, noAssert?: boolean): number; + readInt8(offset: number, noAssert?: boolean): number; + readInt16LE(offset: number, noAssert?: boolean): number; + readInt16BE(offset: number, noAssert?: boolean): number; + readInt32LE(offset: number, noAssert?: boolean): number; + readInt32BE(offset: number, noAssert?: boolean): number; + readFloatLE(offset: number, noAssert?: boolean): number; + readFloatBE(offset: number, noAssert?: boolean): number; + readDoubleLE(offset: number, noAssert?: boolean): number; + readDoubleBE(offset: number, noAssert?: boolean): number; + swap16(): Buffer; + swap32(): Buffer; + swap64(): Buffer; + writeUInt8(value: number, offset: number, noAssert?: boolean): number; + writeUInt16LE(value: number, offset: number, noAssert?: boolean): number; + writeUInt16BE(value: number, offset: number, noAssert?: boolean): number; + writeUInt32LE(value: number, offset: number, noAssert?: boolean): number; + writeUInt32BE(value: number, offset: number, noAssert?: boolean): number; + writeInt8(value: number, offset: number, noAssert?: boolean): number; + writeInt16LE(value: number, offset: number, noAssert?: boolean): number; + writeInt16BE(value: number, offset: number, noAssert?: boolean): number; + writeInt32LE(value: number, offset: number, noAssert?: boolean): number; + writeInt32BE(value: number, offset: number, noAssert?: boolean): number; + writeFloatLE(value: number, offset: number, noAssert?: boolean): number; + writeFloatBE(value: number, offset: number, noAssert?: boolean): number; + writeDoubleLE(value: number, offset: number, noAssert?: boolean): number; + writeDoubleBE(value: number, offset: number, noAssert?: boolean): number; + fill(value: any, offset?: number, end?: number): this; + indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number; + lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number; + includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean; + + /** + * Allocates a new buffer containing the given {str}. + * + * @param str String to store in buffer. + * @param encoding encoding to use, optional. Default is 'utf8' + */ + constructor (str: string, encoding?: string); + /** + * Allocates a new buffer of {size} octets. + * + * @param size count of octets to allocate. + */ + constructor (size: number); + /** + * Allocates a new buffer containing the given {array} of octets. + * + * @param array The octets to store. + */ + constructor (array: Uint8Array); + /** + * Produces a Buffer backed by the same allocated memory as + * the given {ArrayBuffer}. + * + * + * @param arrayBuffer The ArrayBuffer with which to share memory. + */ + constructor (arrayBuffer: ArrayBuffer); + /** + * Allocates a new buffer containing the given {array} of octets. + * + * @param array The octets to store. + */ + constructor (array: any[]); + /** + * Copies the passed {buffer} data onto a new {Buffer} instance. + * + * @param buffer The buffer to copy. + */ + constructor (buffer: Buffer); + prototype: Buffer; + /** + * Allocates a new Buffer using an {array} of octets. + * + * @param array + */ + static from(array: any[]): Buffer; + /** + * When passed a reference to the .buffer property of a TypedArray instance, + * the newly created Buffer will share the same allocated memory as the TypedArray. + * The optional {byteOffset} and {length} arguments specify a memory range + * within the {arrayBuffer} that will be shared by the Buffer. + * + * @param arrayBuffer The .buffer property of a TypedArray or a new ArrayBuffer() + * @param byteOffset + * @param length + */ + static from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer; + /** + * Copies the passed {buffer} data onto a new Buffer instance. + * + * @param buffer + */ + static from(buffer: Buffer): Buffer; + /** + * Creates a new Buffer containing the given JavaScript string {str}. + * If provided, the {encoding} parameter identifies the character encoding. + * If not provided, {encoding} defaults to 'utf8'. + * + * @param str + */ + static from(str: string, encoding?: string): Buffer; + /** + * Returns true if {obj} is a Buffer + * + * @param obj object to test. + */ + static isBuffer(obj: any): obj is Buffer; + /** + * Returns true if {encoding} is a valid encoding argument. + * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex' + * + * @param encoding string to test. + */ + static isEncoding(encoding: string): boolean; + /** + * Gives the actual byte length of a string. encoding defaults to 'utf8'. + * This is not the same as String.prototype.length since that returns the number of characters in a string. + * + * @param string string to test. + * @param encoding encoding used to evaluate (defaults to 'utf8') + */ + static byteLength(string: string, encoding?: string): number; + /** + * Returns a buffer which is the result of concatenating all the buffers in the list together. + * + * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer. + * If the list has exactly one item, then the first item of the list is returned. + * If the list has more than one item, then a new Buffer is created. + * + * @param list An array of Buffer objects to concatenate + * @param totalLength Total length of the buffers when concatenated. + * If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly. + */ + static concat(list: Buffer[], totalLength?: number): Buffer; + /** + * The same as buf1.compare(buf2). + */ + static compare(buf1: Buffer, buf2: Buffer): number; + /** + * Allocates a new buffer of {size} octets. + * + * @param size count of octets to allocate. + * @param fill if specified, buffer will be initialized by calling buf.fill(fill). + * If parameter is omitted, buffer will be filled with zeros. + * @param encoding encoding used for call to buf.fill while initalizing + */ + static alloc(size: number, fill?: string | Buffer | number, encoding?: string): Buffer; + /** + * Allocates a new buffer of {size} octets, leaving memory not initialized, so the contents + * of the newly created Buffer are unknown and may contain sensitive data. + * + * @param size count of octets to allocate + */ + static allocUnsafe(size: number): Buffer; + /** + * Allocates a new non-pooled buffer of {size} octets, leaving memory not initialized, so the contents + * of the newly created Buffer are unknown and may contain sensitive data. + * + * @param size count of octets to allocate + */ + static allocUnsafeSlow(size: number): Buffer; + } +} \ No newline at end of file diff --git a/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/index.js b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/index.js new file mode 100644 index 00000000000000..054c8d30ddafb4 --- /dev/null +++ b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/index.js @@ -0,0 +1,64 @@ +/* eslint-disable node/no-deprecated-api */ +var buffer = require('buffer') +var Buffer = buffer.Buffer + +// alternative to using Object.keys for old browsers +function copyProps (src, dst) { + for (var key in src) { + dst[key] = src[key] + } +} +if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) { + module.exports = buffer +} else { + // Copy properties from require('buffer') + copyProps(buffer, exports) + exports.Buffer = SafeBuffer +} + +function SafeBuffer (arg, encodingOrOffset, length) { + return Buffer(arg, encodingOrOffset, length) +} + +SafeBuffer.prototype = Object.create(Buffer.prototype) + +// Copy static methods from Buffer +copyProps(Buffer, SafeBuffer) + +SafeBuffer.from = function (arg, encodingOrOffset, length) { + if (typeof arg === 'number') { + throw new TypeError('Argument must not be a number') + } + return Buffer(arg, encodingOrOffset, length) +} + +SafeBuffer.alloc = function (size, fill, encoding) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + var buf = Buffer(size) + if (fill !== undefined) { + if (typeof encoding === 'string') { + buf.fill(fill, encoding) + } else { + buf.fill(fill) + } + } else { + buf.fill(0) + } + return buf +} + +SafeBuffer.allocUnsafe = function (size) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + return Buffer(size) +} + +SafeBuffer.allocUnsafeSlow = function (size) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + return buffer.SlowBuffer(size) +} diff --git a/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/package.json b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/package.json new file mode 100644 index 00000000000000..e7f13cb4b47ac4 --- /dev/null +++ b/deps/npm/node_modules/string_decoder/node_modules/safe-buffer/package.json @@ -0,0 +1,62 @@ +{ + "_from": "safe-buffer@~5.2.0", + "_id": "safe-buffer@5.2.0", + "_inBundle": false, + "_integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", + "_location": "/string_decoder/safe-buffer", + "_phantomChildren": {}, + "_requested": { + "type": "range", + "registry": true, + "raw": "safe-buffer@~5.2.0", + "name": "safe-buffer", + "escapedName": "safe-buffer", + "rawSpec": "~5.2.0", + "saveSpec": null, + "fetchSpec": "~5.2.0" + }, + "_requiredBy": [ + "/string_decoder" + ], + "_resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "_shasum": "b74daec49b1148f88c64b68d49b1e815c1f2f519", + "_spec": "safe-buffer@~5.2.0", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli/node_modules/string_decoder", + "author": { + "name": "Feross Aboukhadijeh", + "email": "feross@feross.org", + "url": "http://feross.org" + }, + "bugs": { + "url": "https://github.com/feross/safe-buffer/issues" + }, + "bundleDependencies": false, + "deprecated": false, + "description": "Safer Node.js Buffer API", + "devDependencies": { + "standard": "*", + "tape": "^4.0.0" + }, + "homepage": "https://github.com/feross/safe-buffer", + "keywords": [ + "buffer", + "buffer allocate", + "node security", + "safe", + "safe-buffer", + "security", + "uninitialized" + ], + "license": "MIT", + "main": "index.js", + "name": "safe-buffer", + "repository": { + "type": "git", + "url": "git://github.com/feross/safe-buffer.git" + }, + "scripts": { + "test": "standard && tape test/*.js" + }, + "types": "index.d.ts", + "version": "5.2.0" +} diff --git a/deps/npm/node_modules/string_decoder/package.json b/deps/npm/node_modules/string_decoder/package.json index 0b704d99a1bf50..cc843b66014507 100644 --- a/deps/npm/node_modules/string_decoder/package.json +++ b/deps/npm/node_modules/string_decoder/package.json @@ -1,8 +1,8 @@ { "_from": "string_decoder@^1.1.1", - "_id": "string_decoder@1.2.0", + "_id": "string_decoder@1.3.0", "_inBundle": false, - "_integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==", + "_integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "_location": "/string_decoder", "_phantomChildren": {}, "_requested": { @@ -18,16 +18,16 @@ "_requiredBy": [ "/readable-stream" ], - "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz", - "_shasum": "fe86e738b19544afe70469243b2a1ee9240eae8d", + "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "_shasum": "42f114594a46cf1a8e30b0a84f56c78c3edac21e", "_spec": "string_decoder@^1.1.1", - "_where": "/Users/aeschright/code/cli/node_modules/readable-stream", + "_where": "/Users/darcyclarke/Documents/Repos/npm/cli/node_modules/readable-stream", "bugs": { "url": "https://github.com/nodejs/string_decoder/issues" }, "bundleDependencies": false, "dependencies": { - "safe-buffer": "~5.1.0" + "safe-buffer": "~5.2.0" }, "deprecated": false, "description": "The string_decoder module from Node core", @@ -58,5 +58,5 @@ "ci": "tap test/parallel/*.js test/ours/*.js --tap | tee test.tap && node test/verify-dependencies.js", "test": "tap test/parallel/*.js && node test/verify-dependencies" }, - "version": "1.2.0" + "version": "1.3.0" } diff --git a/deps/npm/node_modules/term-size/vendor/macos/term-size b/deps/npm/node_modules/term-size/vendor/macos/term-size index e383cc737f8e23..c32a1fdc1b073b 100755 Binary files a/deps/npm/node_modules/term-size/vendor/macos/term-size and b/deps/npm/node_modules/term-size/vendor/macos/term-size differ diff --git a/deps/npm/node_modules/through2/node_modules/readable-stream/CONTRIBUTING.md b/deps/npm/node_modules/through2/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58dca85b2..00000000000000 --- a/deps/npm/node_modules/through2/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/deps/npm/node_modules/update-notifier/package.json b/deps/npm/node_modules/update-notifier/package.json index 836b3df2540275..c2c81fb3c7d73c 100644 --- a/deps/npm/node_modules/update-notifier/package.json +++ b/deps/npm/node_modules/update-notifier/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "update-notifier@2.5.0", - "/Users/rebecca/code/npm" - ] - ], "_from": "update-notifier@2.5.0", "_id": "update-notifier@2.5.0", "_inBundle": false, @@ -22,12 +16,14 @@ "fetchSpec": "2.5.0" }, "_requiredBy": [ + "#USER", "/", "/libnpx" ], "_resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "_spec": "2.5.0", - "_where": "/Users/rebecca/code/npm", + "_shasum": "d0744593e13f161e406acb1d9408b72cad08aff6", + "_spec": "update-notifier@2.5.0", + "_where": "/Users/ruyadorno/Documents/workspace/cli", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -36,6 +32,7 @@ "bugs": { "url": "https://github.com/yeoman/update-notifier/issues" }, + "bundleDependencies": false, "dependencies": { "boxen": "^1.2.1", "chalk": "^2.0.1", @@ -48,6 +45,7 @@ "semver-diff": "^2.0.0", "xdg-basedir": "^3.0.0" }, + "deprecated": false, "description": "Update notifications for your CLI app", "devDependencies": { "ava": "*", diff --git a/deps/npm/node_modules/verror/CONTRIBUTING.md b/deps/npm/node_modules/verror/CONTRIBUTING.md deleted file mode 100644 index 750cef8dfd54a6..00000000000000 --- a/deps/npm/node_modules/verror/CONTRIBUTING.md +++ /dev/null @@ -1,19 +0,0 @@ -# Contributing - -This repository uses [cr.joyent.us](https://cr.joyent.us) (Gerrit) for new -changes. Anyone can submit changes. To get started, see the [cr.joyent.us user -guide](https://github.com/joyent/joyent-gerrit/blob/master/docs/user/README.md). -This repo does not use GitHub pull requests. - -See the [Joyent Engineering -Guidelines](https://github.com/joyent/eng/blob/master/docs/index.md) for general -best practices expected in this repository. - -Contributions should be "make prepush" clean. The "prepush" target runs the -"check" target, which requires these separate tools: - -* https://github.com/davepacheco/jsstyle -* https://github.com/davepacheco/javascriptlint - -If you're changing something non-trivial or user-facing, you may want to submit -an issue first. diff --git a/deps/npm/node_modules/widest-line/index.js b/deps/npm/node_modules/widest-line/index.js index 173cec4f296bb8..a9865d00abd914 100644 --- a/deps/npm/node_modules/widest-line/index.js +++ b/deps/npm/node_modules/widest-line/index.js @@ -1,5 +1,8 @@ 'use strict'; const stringWidth = require('string-width'); -module.exports = input => Math.max.apply(null, input.split('\n').map(x => stringWidth(x))); - +module.exports = input => { + let max = 0; + for (const s of input.split('\n')) max = Math.max(max, stringWidth(s)); + return max; +}; diff --git a/deps/npm/node_modules/widest-line/package.json b/deps/npm/node_modules/widest-line/package.json index 2eb1d53fc9a60f..fc4bcfcbeb83c5 100644 --- a/deps/npm/node_modules/widest-line/package.json +++ b/deps/npm/node_modules/widest-line/package.json @@ -1,8 +1,8 @@ { "_from": "widest-line@^2.0.0", - "_id": "widest-line@2.0.0", + "_id": "widest-line@2.0.1", "_inBundle": false, - "_integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", + "_integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", "_location": "/widest-line", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/boxen" ], - "_resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz", - "_shasum": "0142a4e8a243f8882c0233aa0e0281aa76152273", + "_resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", + "_shasum": "7438764730ec7ef4381ce4df82fb98a53142a3fc", "_spec": "widest-line@^2.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/boxen", + "_where": "/Users/ruyadorno/Documents/workspace/cli/node_modules/boxen", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -82,5 +82,5 @@ "scripts": { "test": "xo && ava" }, - "version": "2.0.0" + "version": "2.0.1" } diff --git a/deps/npm/node_modules/yargs/CHANGELOG.md b/deps/npm/node_modules/yargs/CHANGELOG.md index 0eaf2f33edddb4..2cccca04c4113c 100644 --- a/deps/npm/node_modules/yargs/CHANGELOG.md +++ b/deps/npm/node_modules/yargs/CHANGELOG.md @@ -2,6 +2,25 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [11.1.1](https://github.com/yargs/yargs/compare/v11.1.0...v11.1.1) (2019-10-06) + +* backport security fix for os-locale. + + +# [11.1.0](https://github.com/yargs/yargs/compare/v11.0.0...v11.1.0) (2018-03-04) + + +### Bug Fixes + +* choose correct config directory when require.main does not exist ([#1056](https://github.com/yargs/yargs/issues/1056)) ([a04678c](https://github.com/yargs/yargs/commit/a04678c)) + + +### Features + +* allow hidden options to be displayed with --show-hidden ([#1061](https://github.com/yargs/yargs/issues/1061)) ([ea862ae](https://github.com/yargs/yargs/commit/ea862ae)) +* extend *.rc files in addition to json ([#1080](https://github.com/yargs/yargs/issues/1080)) ([11691a6](https://github.com/yargs/yargs/commit/11691a6)) + # [11.0.0](https://github.com/yargs/yargs/compare/v10.1.2...v11.0.0) (2018-01-22) diff --git a/deps/npm/node_modules/yargs/lib/apply-extends.js b/deps/npm/node_modules/yargs/lib/apply-extends.js index 3005848e3cdb78..530b022ac57b5a 100644 --- a/deps/npm/node_modules/yargs/lib/apply-extends.js +++ b/deps/npm/node_modules/yargs/lib/apply-extends.js @@ -6,9 +6,9 @@ const YError = require('./yerror') let previouslyVisitedConfigs = [] -function checkForCircularExtends (path) { - if (previouslyVisitedConfigs.indexOf(path) > -1) { - throw new YError(`Circular extended configurations: '${path}'.`) +function checkForCircularExtends (cfgPath) { + if (previouslyVisitedConfigs.indexOf(cfgPath) > -1) { + throw new YError(`Circular extended configurations: '${cfgPath}'.`) } } diff --git a/deps/npm/node_modules/yargs/package.json b/deps/npm/node_modules/yargs/package.json index 1fe51fedd4392b..fd0a1265c23ddb 100644 --- a/deps/npm/node_modules/yargs/package.json +++ b/deps/npm/node_modules/yargs/package.json @@ -1,8 +1,8 @@ { "_from": "yargs@^11.0.0", - "_id": "yargs@11.0.0", + "_id": "yargs@11.1.1", "_inBundle": false, - "_integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "_integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==", "_location": "/yargs", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/libnpx" ], - "_resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "_shasum": "c052931006c5eee74610e5fc0354bedfd08a201b", + "_resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz", + "_shasum": "5052efe3446a4df5ed669c995886cc0f13702766", "_spec": "yargs@^11.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/libnpx", + "_where": "/Users/mperrotte/npminc/cli/node_modules/libnpx", "bugs": { "url": "https://github.com/yargs/yargs/issues" }, @@ -31,7 +31,7 @@ "decamelize": "^1.1.1", "find-up": "^2.1.0", "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", + "os-locale": "^3.1.0", "require-directory": "^2.1.1", "require-main-filename": "^1.0.1", "set-blocking": "^2.0.0", @@ -47,7 +47,7 @@ "chalk": "^1.1.3", "coveralls": "^2.11.11", "cpr": "^2.0.0", - "cross-spawn": "^5.0.1", + "cross-spawn": "^6.0.4", "es6-promise": "^4.0.2", "hashish": "0.0.4", "mocha": "^3.0.1", @@ -97,5 +97,5 @@ "**/example/**" ] }, - "version": "11.0.0" + "version": "11.1.1" } diff --git a/deps/npm/node_modules/yargs/yargs.js b/deps/npm/node_modules/yargs/yargs.js index 9b50b8bfeb0a44..38f1b2ea6e67f5 100644 --- a/deps/npm/node_modules/yargs/yargs.js +++ b/deps/npm/node_modules/yargs/yargs.js @@ -476,17 +476,17 @@ function Yargs (processArgs, cwd, parentRequire) { return self } - self.pkgConf = function pkgConf (key, path) { - argsert(' [string]', [key, path], arguments.length) + self.pkgConf = function pkgConf (key, rootPath) { + argsert(' [string]', [key, rootPath], arguments.length) let conf = null // prefer cwd to require-main-filename in this method // since we're looking for e.g. "nyc" config in nyc consumer // rather than "yargs" config in nyc (where nyc is the main filename) - const obj = pkgUp(path || cwd) + const obj = pkgUp(rootPath || cwd) // If an object exists in the key, add it to options.configObjects if (obj[key] && typeof obj[key] === 'object') { - conf = applyExtends(obj[key], path || cwd) + conf = applyExtends(obj[key], rootPath || cwd) options.configObjects = (options.configObjects || []).concat(conf) } @@ -494,16 +494,24 @@ function Yargs (processArgs, cwd, parentRequire) { } const pkgs = {} - function pkgUp (path) { - const npath = path || '*' + function pkgUp (rootPath) { + const npath = rootPath || '*' if (pkgs[npath]) return pkgs[npath] const findUp = require('find-up') let obj = {} try { + let startDir = rootPath || require('require-main-filename')(parentRequire || require) + + // When called in an environment that lacks require.main.filename, such as a jest test runner, + // startDir is already process.cwd(), and should not be shortened. + // Whether or not it is _actually_ a directory (e.g., extensionless bin) is irrelevant, find-up handles it. + if (!rootPath && path.extname(startDir)) { + startDir = path.dirname(startDir) + } + const pkgJsonPath = findUp.sync('package.json', { - cwd: path || require('path').dirname(require('require-main-filename')(parentRequire || require)), - normalize: false + cwd: startDir }) obj = JSON.parse(fs.readFileSync(pkgJsonPath)) } catch (noop) {} diff --git a/deps/npm/package.json b/deps/npm/package.json index d6c25dbca1457d..d367dc98b5982f 100644 --- a/deps/npm/package.json +++ b/deps/npm/package.json @@ -1,5 +1,5 @@ { - "version": "6.13.4", + "version": "6.14.4", "name": "npm", "description": "a package manager for JavaScript", "keywords": [ @@ -39,12 +39,12 @@ "ansistyles": "~0.1.3", "aproba": "^2.0.0", "archy": "~1.0.0", - "bin-links": "^1.1.6", + "bin-links": "^1.1.7", "bluebird": "^3.5.5", "byte-size": "^5.0.1", "cacache": "^12.0.3", "call-limit": "^1.1.1", - "chownr": "^1.1.3", + "chownr": "^1.1.4", "ci-info": "^2.0.0", "cli-columns": "^3.1.2", "cli-table3": "^0.5.1", @@ -60,10 +60,10 @@ "fs-vacuum": "~1.2.10", "fs-write-stream-atomic": "~1.0.10", "gentle-fs": "^2.3.0", - "glob": "^7.1.4", + "glob": "^7.1.6", "graceful-fs": "^4.2.3", "has-unicode": "~2.0.1", - "hosted-git-info": "^2.8.5", + "hosted-git-info": "^2.8.8", "iferr": "^1.0.2", "infer-owner": "^1.0.4", "inflight": "~1.0.6", @@ -80,7 +80,7 @@ "libnpmorg": "^1.0.1", "libnpmsearch": "^2.0.2", "libnpmteam": "^1.0.2", - "libnpx": "^10.2.0", + "libnpx": "^10.2.2", "lock-verify": "^2.1.0", "lockfile": "^1.0.4", "lodash._baseuniq": "~4.6.0", @@ -91,9 +91,9 @@ "lru-cache": "^5.1.1", "meant": "~1.0.1", "mississippi": "^3.0.0", - "mkdirp": "~0.5.1", + "mkdirp": "^0.5.4", "move-concurrently": "^1.0.1", - "node-gyp": "^5.0.5", + "node-gyp": "^5.1.0", "nopt": "~4.0.1", "normalize-package-data": "^2.5.0", "npm-audit-report": "^1.3.2", @@ -101,16 +101,16 @@ "npm-install-checks": "^3.0.2", "npm-lifecycle": "^3.1.4", "npm-package-arg": "^6.1.1", - "npm-packlist": "^1.4.7", + "npm-packlist": "^1.4.8", "npm-pick-manifest": "^3.0.2", - "npm-profile": "^4.0.2", - "npm-registry-fetch": "^4.0.2", + "npm-profile": "^4.0.4", + "npm-registry-fetch": "^4.0.3", "npm-user-validate": "~1.0.0", "npmlog": "~4.1.2", "once": "~1.4.0", "opener": "^1.5.1", "osenv": "^0.1.5", - "pacote": "^9.5.11", + "pacote": "^9.5.12", "path-is-inside": "~1.0.2", "promise-inflight": "~1.0.1", "qrcode-terminal": "^0.12.0", @@ -121,11 +121,11 @@ "read-installed": "~4.0.3", "read-package-json": "^2.1.1", "read-package-tree": "^5.3.1", - "readable-stream": "^3.4.0", + "readable-stream": "^3.6.0", "readdir-scoped-modules": "^1.1.0", "request": "^2.88.0", "retry": "^0.12.0", - "rimraf": "^2.6.3", + "rimraf": "^2.7.1", "safe-buffer": "^5.1.2", "semver": "^5.7.1", "sha": "^3.0.0", @@ -280,8 +280,8 @@ "licensee": "^7.0.3", "marked": "^0.6.3", "marked-man": "^0.6.0", - "npm-registry-couchapp": "^2.7.3", - "npm-registry-mock": "^1.3.0", + "npm-registry-couchapp": "^2.7.4", + "npm-registry-mock": "^1.3.1", "require-inject": "^1.4.4", "sprintf-js": "^1.1.2", "standard": "^11.0.1", @@ -296,7 +296,8 @@ "licenses": "licensee --production --errors-only", "tap": "tap -J --timeout 300 --no-esm", "tap-cover": "tap -J --nyc-arg=--cache --coverage --timeout 600 --no-esm", - "pretest": "standard", + "lint": "standard", + "pretest": "npm run lint", "test": "npm run test-tap --", "test:nocleanup": "NO_TEST_CLEANUP=1 npm run test --", "sudotest": "sudo npm run tap -- \"test/tap/*.js\"", @@ -306,5 +307,8 @@ "test-tap": "npm run tap -- \"test/tap/*.js\" \"test/network/*.js\"", "test-node": "tap --timeout 240 \"test/tap/*.js\" \"test/network/*.js\"" }, - "license": "Artistic-2.0" + "license": "Artistic-2.0", + "engines": { + "node": "6 >=6.2.0 || 8 || >=9.3.0" + } } diff --git a/deps/npm/scripts/dep-update b/deps/npm/scripts/dep-update index 006de17c7203a3..7e56dbba8ef53d 100755 --- a/deps/npm/scripts/dep-update +++ b/deps/npm/scripts/dep-update @@ -1,6 +1,7 @@ #!/usr/bin/env bash node . install --save $1@$2 &&\ node scripts/gen-dev-ignores.js &&\ +rm -f node_modules/{*,*/*}/CODE_OF_CONDUCT.md node_modules/{*,*/*}/CONTRIBUTING.md &&\ git add node_modules package.json package-lock.json &&\ git commit -m"$1@$2" &&\ node . repo $1 &&\ diff --git a/deps/npm/scripts/dev-dep-update b/deps/npm/scripts/dev-dep-update index cb0b783a837f4f..eee2e209cbbda0 100755 --- a/deps/npm/scripts/dev-dep-update +++ b/deps/npm/scripts/dev-dep-update @@ -1,6 +1,7 @@ #!/usr/bin/env bash node . install --save --save-dev $1@$2 &&\ node scripts/gen-dev-ignores.js &&\ +rm -f node_modules/{*,*/*}/CODE_OF_CONDUCT.md node_modules/{*,*/*}/CONTRIBUTING.md &&\ git add package.json package-lock.json &&\ git commit -m"$1@$2" &&\ node . repo $1 &&\ diff --git a/deps/npm/scripts/docs-build.js b/deps/npm/scripts/docs-build.js index e3cd2e9826f1e6..390ea20be706e1 100644 --- a/deps/npm/scripts/docs-build.js +++ b/deps/npm/scripts/docs-build.js @@ -15,7 +15,7 @@ fs.readFile(src, 'utf8', function (err, data) { } var result = data.replace(/@VERSION@/g, npm.version) - .replace(/---([\s\S]+)---/g, '') + .replace(/^---([\s\S]+?)---/g, '') .replace(/\[([^\]]+)\]\(\/cli-commands\/([^)]+)\)/g, replacer) .replace(/\[([^\]]+)\]\(\/configuring-npm\/([^)]+)\)/g, replacer) .replace(/\[([^\]]+)\]\(\/using-npm\/([^)]+)\)/g, replacer) diff --git a/deps/npm/scripts/gen-dev-ignores.js b/deps/npm/scripts/gen-dev-ignores.js index 3f6dcb301bcdbb..f07c2cd7e8c4d4 100644 --- a/deps/npm/scripts/gen-dev-ignores.js +++ b/deps/npm/scripts/gen-dev-ignores.js @@ -2,4 +2,6 @@ const fs = require('fs') const plock = require('../package-lock.json') fs.writeFileSync(`${__dirname}/../node_modules/.gitignore`, '## Automatically generated dev dependency ignores\n' + + 'CODE_OF_CONDUCT.md\n' + + 'CONTRIBUTING.md\n' + Object.keys(plock.dependencies).filter(_ => plock.dependencies[_].dev).map(_ => `/${_}`).join('\n') + '\n') diff --git a/deps/npm/scripts/release.sh b/deps/npm/scripts/release.sh index e071c7ededaf75..31fb6fa1941418 100644 --- a/deps/npm/scripts/release.sh +++ b/deps/npm/scripts/release.sh @@ -12,6 +12,8 @@ node ./bin/npm-cli.js pack --loglevel error >/dev/null mv *.tgz release cd release tar xzf *.tgz +cp ../.npmrc package/ +cp -r ../tap-snapshots package/ cp -r ../test package/ mkdir node_modules diff --git a/deps/npm/scripts/update-dist-tags.js b/deps/npm/scripts/update-dist-tags.js new file mode 100644 index 00000000000000..f28bfd0b917394 --- /dev/null +++ b/deps/npm/scripts/update-dist-tags.js @@ -0,0 +1,123 @@ +'use strict' + +/** + * Usage: + * + * node scripts/update-dist-tags.js --otp + * node scripts/update-dist-tags.js --otp= + * node scripts/update-dist-tags.js --otp + */ + +const usage = ` +Usage: + +node scripts/update-dist-tags.js --otp +node scripts/update-dist-tags.js --otp= +node scripts/update-dist-tags.js --otp +` + +const { execSync } = require('child_process') +const semver = require('semver') +const path = require('path') + +const getMajorVersion = (input) => semver.parse(input).major +const getMinorVersion = (input) => semver.parse(input).minor + +// INFO: String templates to generate the tags to update +const LATEST_TAG = (strings, major) => `latest-${major}` +const NEXT_TAG = (strings, major) => `next-${major}` +const TAG_LIST = ['lts', 'next', 'latest'] +const REMOVE_TAG = (strings, major, minor) => `v${major}.${minor}-next` + +// INFO: Finds `--otp` and subsequently otp value (if present) +const PARSE_OTP_FLAG = new RegExp(/(--otp)(=|\s)?([0-9]{6})?/, 'gm') +// INFO: Used to validate otp value (if not found by other regexp) +const PARSE_OTP_VALUE = new RegExp(/^[0-9]{6}$/, 'g') + +const args = process.argv.slice(2) +const versionPath = path.resolve(__dirname, '..', 'package.json') +const { version } = require(versionPath) + +// Run Script +main() + +function main () { + const otp = parseOTP(args) + if (version) { + const major = getMajorVersion(version) + const minor = getMinorVersion(version) + const latestTag = LATEST_TAG`${major}` + const nextTag = NEXT_TAG`${major}` + const removeTag = REMOVE_TAG`${major}${minor}` + const updateList = [].concat(TAG_LIST, latestTag, nextTag) + + updateList.forEach((tag) => { + setDistTag(tag, version, otp) + }) + removeDistTag(removeTag, version, otp) + } else { + console.error('Invalid semver.') + process.exit(1) + } +} + +function parseOTP (args) { + // NOTE: making assumption first _thing_ is a string with "--otp" in it + const parsedArgs = PARSE_OTP_FLAG.exec(args[0]) + if (!parsedArgs) { + console.error('Invalid arguments supplied. Must supply --otp flag.') + console.error(usage) + process.exit(1) + } + // INFO: From the regexp, third group is the OTP code + const otp = parsedArgs[3] + switch (args.length) { + case 0: { + console.error('No arguments supplied.') + console.error(usage) + process.exit(1) + } + case 1: { + // --otp=123456 or --otp123456 + if (otp) { + return otp + } + console.error('Invalid otp value supplied. [CASE 1]') + process.exit(1) + } + case 2: { + // --otp 123456 + // INFO: validating the second argument is an otp code + const isValidOtp = PARSE_OTP_VALUE.test(args[1]) + if (isValidOtp) { + return args[1] + } + console.error('Invalid otp value supplied. [CASE 2]') + process.exit(1) + } + default: { + console.error('Invalid arguments supplied.') + process.exit(1) + } + } +} + +function setDistTag (tag, version, otp) { + try { + const result = execSync(`npm dist-tag set npm@${version} ${tag} --otp=${otp}`, { encoding: 'utf-8' }) + console.log('Result:', result) + } catch (err) { + console.error('Bad dist-tag command.') + process.exit(1) + } +} + +function removeDistTag (tag, version, otp) { + try { + const result = execSync(`npm dist-tag rm npm ${tag} --otp=${otp}`, { encoding: 'utf-8' }) + console.log('Result:', result) + } catch (err) { + console.error('Bad dist-tag command.') + process.exit(1) + } +} diff --git a/deps/npm/tap-snapshots/test-tap-fund.js-TAP.test.js b/deps/npm/tap-snapshots/test-tap-fund.js-TAP.test.js new file mode 100644 index 00000000000000..963c59f3e12861 --- /dev/null +++ b/deps/npm/tap-snapshots/test-tap-fund.js-TAP.test.js @@ -0,0 +1,74 @@ +/* IMPORTANT + * This snapshot file is auto-generated, but designed for humans. + * It should be checked into source control and tracked carefully. + * Re-generate by setting TAP_SNAPSHOT=1 and running tests. + * Make sure to inspect the output below. Do not ignore changes! + */ +'use strict' +exports[`test/tap/fund.js TAP fund containing multi-level nested deps with no funding > should omit dependencies with no funding declared 1`] = ` +nested-no-funding-packages@1.0.0 ++-- https://example.com/lorem +| \`-- lorem@1.0.0 ++-- http://example.com/donate +| \`-- bar@1.0.0 +\`-- https://example.com/sponsor + \`-- sub-bar@1.0.0 + + +` + +exports[`test/tap/fund.js TAP fund does not support global > should throw EFUNDGLOBAL error 1`] = ` + +` + +exports[`test/tap/fund.js TAP fund does not support global > should write error msgs to stderr 1`] = ` +npm ERR! code EFUNDGLOBAL +npm ERR! \`npm fund\` does not support global packages +` + +exports[`test/tap/fund.js TAP fund does not support global, using --json option > should write error msgs to stderr 1`] = ` +npm ERR! code EFUNDGLOBAL +npm ERR! \`npm fund\` does not support global packages +` + +exports[`test/tap/fund.js TAP fund in which same maintainer owns all its deps > should print stack packages together 1`] = ` +maintainer-owns-all-deps@1.0.0 +\`-- http://example.com/donate + \`-- dep-bar@1.0.0, dep-foo@1.0.0, dep-sub-foo@1.0.0 + + +` + +exports[`test/tap/fund.js TAP fund using nested packages with multiple sources > should prompt with all available URLs 1`] = ` +1: Funding available at the following URL: https://one.example.com +2: Funding available at the following URL: https://two.example.com +Run \`npm fund [<@scope>/] --which=1\`, for example, to open the first funding URL listed in that package + +` + +exports[`test/tap/fund.js TAP fund using nested packages with multiple sources, with a source number > should open the numbered URL 1`] = ` +Funding available at the following URL: + +https://one.example.com + +` + +exports[`test/tap/fund.js TAP fund using package argument with no browser > should open funding url 1`] = ` +individual funding available at the following URL: + +http://example.com/donate + +` + +exports[`test/tap/fund.js TAP fund using string shorthand > should open string-only url 1`] = ` +Funding available at the following URL: + +https://example.com/sponsor + +` + +exports[`test/tap/fund.js TAP fund with no package containing funding > should print empty funding info 1`] = ` +no-funding-package@0.0.0 + + +` diff --git a/deps/npm/tap-snapshots/test-tap-repo.js-TAP.test.js b/deps/npm/tap-snapshots/test-tap-repo.js-TAP.test.js new file mode 100644 index 00000000000000..3fba79edb8d42b --- /dev/null +++ b/deps/npm/tap-snapshots/test-tap-repo.js-TAP.test.js @@ -0,0 +1,21 @@ +/* IMPORTANT + * This snapshot file is auto-generated, but designed for humans. + * It should be checked into source control and tracked carefully. + * Re-generate by setting TAP_SNAPSHOT=1 and running tests. + * Make sure to inspect the output below. Do not ignore changes! + */ +'use strict' +exports[`test/tap/repo.js TAP npm repo underscore --json > should print json result 1`] = ` +{ + "title": "repository available at the following URL", + "url": "https://github.com/jashkenas/underscore" +} + +` + +exports[`test/tap/repo.js TAP npm repo underscore --no-browser > should print alternative msg 1`] = ` +repository available at the following URL: + +https://github.com/jashkenas/underscore + +` diff --git a/deps/npm/test/fixtures/config/userconfig-with-gc b/deps/npm/test/fixtures/config/userconfig-with-gc index cf774bb883d966..866f78dab61ce5 100644 --- a/deps/npm/test/fixtures/config/userconfig-with-gc +++ b/deps/npm/test/fixtures/config/userconfig-with-gc @@ -1,4 +1,4 @@ -globalconfig = /Users/isaacs/dev/npm/cli/test/fixtures/config/globalconfig +globalconfig = /Users/ruyadorno/Documents/workspace/cli/test/fixtures/config/globalconfig email = i@izs.me env-thing = ${random_env_var} init.author.name = Isaac Z. Schlueter diff --git a/deps/npm/test/fixtures/third-party.md b/deps/npm/test/fixtures/third-party.md new file mode 100644 index 00000000000000..d5f33cc1e83155 --- /dev/null +++ b/deps/npm/test/fixtures/third-party.md @@ -0,0 +1,25 @@ +"scoped-underscore-1.3.1.tgz" includes content from the Underscore package, +including code adapted from ES 5.1 section 15.12.3, abstract operation +`JO`, used under the following license: + +Copyright (c) Ecma International 2010 + +DISCLAIMER This document may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in +whole or in part, without restriction of any kind, provided that the above +copyright notice and this section are included on all such copies and +derivative works. However, this document itself may not be modified in any +way, including by removing the copyright notice or references to Ecma +International, except as needed for the purpose of developing any document +or deliverable produced by Ecma International. + +The limited permissions are granted through the standardization phase and +will not be revoked by Ecma International or its successors or assigns +during this time. + +This document and the information contained herein is provided on an "AS +IS" basis and ECMA INTERNATIONAL DISCLAIMS ALL WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE +INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED +WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. diff --git a/deps/npm/test/tap/access.js b/deps/npm/test/tap/access.js index 4183c46b538c0e..f537db2586409a 100644 --- a/deps/npm/test/tap/access.js +++ b/deps/npm/test/tap/access.js @@ -217,6 +217,33 @@ test('npm access grant read-write', function (t) { ) }) +test('npm access grant read-write on unscoped package', function (t) { + server.filteringRequestBody((body) => { + const data = JSON.parse(body) + t.deepEqual(data, { + permissions: 'read-write', + package: 'another' + }, 'got the right body') + return true + }) + server.put('/-/team/myorg/myteam/package', true).reply(201) + common.npm( + [ + 'access', + 'grant', 'read-write', + 'myorg:myteam', + 'another', + '--registry', common.registry + ], + { cwd: pkg }, + function (er, code, stdout, stderr) { + t.ifError(er, 'npm access grant') + t.equal(code, 0, 'exited with Error') + t.end() + } + ) +}) + test('npm access grant others', function (t) { common.npm( [ diff --git a/deps/npm/test/tap/bin-overwriting.js b/deps/npm/test/tap/bin-overwriting.js index 155d4abf520506..faaa78745a7423 100644 --- a/deps/npm/test/tap/bin-overwriting.js +++ b/deps/npm/test/tap/bin-overwriting.js @@ -8,10 +8,11 @@ const path = require('path') const readBinCb = process.platform === 'win32' ? readCmdShim : readlink const readBin = bin => new Promise((resolve, reject) => { readBinCb(bin, (er, target) => { - if (er) + if (er) { reject(er) - else - resolve(path.resolve(pkg + '/global/bin', target)) + } else { + resolve(path.resolve(path.dirname(bin), target)) + } }) }) diff --git a/deps/npm/test/tap/ci.js b/deps/npm/test/tap/ci.js index 3f3e251d03f1d7..e1c2d73b7a43d5 100644 --- a/deps/npm/test/tap/ci.js +++ b/deps/npm/test/tap/ci.js @@ -12,9 +12,13 @@ const test = require('tap').test const Dir = Tacks.Dir const File = Tacks.File +const cacheDir = common.cache const testDir = common.pkg -const EXEC_OPTS = { cwd: testDir } +const EXEC_OPTS = { + cwd: testDir, + nodeExecPath: process.execPath +} const PKG = { name: 'top', @@ -47,7 +51,7 @@ test('setup', () => { const fixture = new Tacks(Dir({ 'package.json': File(PKG) })) - return rimraf(testDir).then(() => { + return Promise.all([rimraf(cacheDir), rimraf(testDir)]).then(() => { fixture.create(testDir) return mr({port: common.port}) }) @@ -306,7 +310,35 @@ test('errors if package-lock.json invalid', (t) => { ) }) +test('correct cache location when using cache config', (t) => { + const fixture = new Tacks(Dir({ + 'package.json': File(PKG), + 'package-lock.json': File(RAW_LOCKFILE) + })) + return Promise.all([rimraf(cacheDir), rimraf(testDir)]) + .then(() => fixture.create(cacheDir)) + .then(() => fixture.create(testDir)) + .then(() => common.npm([ + 'ci', + `--cache=${cacheDir}`, + '--foo=asdf', + '--registry', common.registry, + '--loglevel', 'warn' + ], EXEC_OPTS)) + .then((ret) => { + const code = ret[0] + const stderr = ret[2] + t.equal(code, 0, 'command completed without error') + t.equal(stderr.trim(), '', 'no output on stderr') + return fs.readdirAsync(path.join(cacheDir, '_cacache')) + }) + .then((modules) => { + t.ok(modules, 'should create _cacache folder') + t.end() + }) +}) + test('cleanup', () => { SERVER.close() - return rimraf(testDir) + return Promise.all([rimraf(cacheDir), rimraf(testDir)]) }) diff --git a/deps/npm/test/tap/fund.js b/deps/npm/test/tap/fund.js index 97b414bf6e0173..48d903f9897f6f 100644 --- a/deps/npm/test/tap/fund.js +++ b/deps/npm/test/tap/fund.js @@ -14,6 +14,7 @@ const base = common.pkg const noFunding = path.join(base, 'no-funding-package') const maintainerOwnsAllDeps = path.join(base, 'maintainer-owns-all-deps') const nestedNoFundingPackages = path.join(base, 'nested-no-funding-packages') +const nestedMultipleFundingPackages = path.join(base, 'nested-multiple-funding-packages') const fundingStringShorthand = path.join(base, 'funding-string-shorthand') function getFixturePackage ({ name, version, dependencies, funding }, extras) { @@ -113,6 +114,37 @@ const fixture = new Tacks(Dir({ } }) }) + }), + 'nested-multiple-funding-packages': getFixturePackage({ + name: 'nested-multiple-funding-packages', + funding: [ + 'https://one.example.com', + 'https://two.example.com' + ], + dependencies: { + foo: '*' + }, + devDependencies: { + bar: '*' + } + }, { + node_modules: Dir({ + foo: getFixturePackage({ + name: 'foo', + funding: [ + 'http://example.com', + { url: 'http://sponsors.example.com/me' }, + 'http://collective.example.com' + ] + }), + bar: getFixturePackage({ + name: 'bar', + funding: [ + 'http://collective.example.com', + { url: 'http://sponsors.example.com/you' } + ] + }) + }) }) })) @@ -224,6 +256,54 @@ testFundCmd({ } }) +testFundCmd({ + title: 'fund containing multi-level nested deps with multiple funding sources, using --json option', + assertionMsg: 'should omit dependencies with no funding declared', + args: ['--json'], + opts: { cwd: nestedMultipleFundingPackages }, + assertion: jsonTest, + expected: { + length: 2, + name: 'nested-multiple-funding-packages', + version: '1.0.0', + funding: [ + { + url: 'https://one.example.com' + }, + { + url: 'https://two.example.com' + } + ], + dependencies: { + bar: { + version: '1.0.0', + funding: [ + { + url: 'http://collective.example.com' + }, + { + url: 'http://sponsors.example.com/you' + } + ] + }, + foo: { + version: '1.0.0', + funding: [ + { + url: 'http://example.com' + }, + { + url: 'http://sponsors.example.com/me' + }, + { + url: 'http://collective.example.com' + } + ] + } + } + } +}) + testFundCmd({ title: 'fund does not support global', assertionMsg: 'should throw EFUNDGLOBAL error', @@ -248,7 +328,7 @@ testFundCmd({ expected: { error: { code: 'EFUNDGLOBAL', - summary: '`npm fund` does not support globals', + summary: '`npm fund` does not support global packages', detail: '' } } @@ -268,6 +348,20 @@ testFundCmd({ opts: { cwd: fundingStringShorthand } }) +testFundCmd({ + title: 'fund using nested packages with multiple sources', + assertionMsg: 'should prompt with all available URLs', + args: ['.'], + opts: { cwd: nestedMultipleFundingPackages } +}) + +testFundCmd({ + title: 'fund using nested packages with multiple sources, with a source number', + assertionMsg: 'should open the numbered URL', + args: ['.', '--which=1', '--no-browser'], + opts: { cwd: nestedMultipleFundingPackages } +}) + testFundCmd({ title: 'fund using package argument with no browser, using --json option', assertionMsg: 'should open funding url', diff --git a/deps/npm/test/tap/prepare.js b/deps/npm/test/tap/prepare.js index 1169089b17e4d8..d0966000735c47 100644 --- a/deps/npm/test/tap/prepare.js +++ b/deps/npm/test/tap/prepare.js @@ -55,7 +55,11 @@ test('test', function (t) { common.npm([ 'pack', '--loglevel', 'warn' - ], { cwd: pkg, env: env }, function (err, code, stdout, stderr) { + ], { + cwd: pkg, + env: env, + nodeExecPath: process.execPath + }, function (err, code, stdout, stderr) { t.equal(code, 0, 'pack finished successfully') t.ifErr(err, 'pack finished successfully') diff --git a/deps/npm/test/tap/prepublish-only.js b/deps/npm/test/tap/prepublish-only.js index 56881494d23814..988d507c6359f4 100644 --- a/deps/npm/test/tap/prepublish-only.js +++ b/deps/npm/test/tap/prepublish-only.js @@ -98,7 +98,8 @@ test('test', function (t) { common.npm( [ 'publish', - '--loglevel', 'warn' + '--loglevel', 'warn', + '--scripts-prepend-node-path' ], { cwd: pkg, diff --git a/deps/npm/test/tap/publish-scoped.js b/deps/npm/test/tap/publish-scoped.js index 78ca4699d3a31b..82873688cdce9e 100644 --- a/deps/npm/test/tap/publish-scoped.js +++ b/deps/npm/test/tap/publish-scoped.js @@ -46,7 +46,7 @@ test('npm publish should honor scoping', function (t) { fs.writeFileSync(configFile, configuration.join('\n') + '\n') - common.npm(['publish'], {'cwd': pkg}, function (err, code, stdout, stderr) { + common.npm(['publish'], {'cwd': pkg, nodeExecPath: process.execPath}, function (err, code, stdout, stderr) { if (err) throw err t.is(code, 0, 'published without error') server.done() diff --git a/deps/npm/test/tap/publish.js b/deps/npm/test/tap/publish.js index 0913576a31b446..453abcecd47abd 100644 --- a/deps/npm/test/tap/publish.js +++ b/deps/npm/test/tap/publish.js @@ -52,7 +52,10 @@ test('basic npm publish', (t) => { `--//localhost:${server.port}/:username=username`, `--//localhost:${server.port}/:_password=` + Buffer.from('password').toString('base64'), `--//localhost:${server.port}/:email=` + 'ogd@aoaioxxysz.net' - ], {'cwd': testDir}) + ], { + 'cwd': testDir, + nodeExecPath: process.execPath + }) .spread((code, stdout, stderr) => { t.comment(stdout) t.comment(stderr) diff --git a/deps/npm/test/tap/umask-lifecycle.js b/deps/npm/test/tap/umask-lifecycle.js index 8b365d62335d79..dc365c94abbd56 100644 --- a/deps/npm/test/tap/umask-lifecycle.js +++ b/deps/npm/test/tap/umask-lifecycle.js @@ -40,12 +40,13 @@ test('setup', function (t) { }) test('umask script', function (t) { - common.npm(['run', 'umask'], { + common.npm(['run', 'umask', '--scripts-prepend-node-path'], { cwd: pkg, env: { PATH: process.env.PATH, Path: process.env.Path, - 'npm_config_loglevel': 'warn' + 'npm_config_loglevel': 'warn', + nodeExecPath: process.execPath } }, function (er, code, sout, serr) { t.equal(sout, expected) diff --git a/deps/npm/test/tap/unsupported.js b/deps/npm/test/tap/unsupported.js index deae8d3c034c19..2ebbd2d6542e2b 100644 --- a/deps/npm/test/tap/unsupported.js +++ b/deps/npm/test/tap/unsupported.js @@ -30,7 +30,8 @@ var versions = [ ['v9.3.0', false, false], ['v10.0.0-0', false, false], ['v11.0.0-0', false, false], - ['v12.0.0-0', false, false] + ['v12.0.0-0', false, false], + ['v13.0.0-0', false, false] ] test('versions', function (t) { diff --git a/deps/npm/test/tap/utils.funding.js b/deps/npm/test/tap/utils.funding.js index 709762eacb7bb2..4276f3e43a5cfe 100644 --- a/deps/npm/test/tap/utils.funding.js +++ b/deps/npm/test/tap/utils.funding.js @@ -612,3 +612,46 @@ test('retrieve funding info string shorthand', (t) => { ) t.end() }) + +test('retrieve funding info from an array', (t) => { + t.deepEqual( + retrieveFunding([ + 'http://example.com', + { + url: 'http://two.example.com' + }, + 'http://three.example.com', + { + url: 'http://three.example.com', + type: 'dos' + }, + { + url: 'http://three.example.com', + type: 'third copy!', + extra: 'extra metadata!' + } + ]), + [ + { + url: 'http://example.com' + }, + { + url: 'http://two.example.com' + }, + { + url: 'http://three.example.com' + }, + { + url: 'http://three.example.com', + type: 'dos' + }, + { + url: 'http://three.example.com', + type: 'third copy!', + extra: 'extra metadata!' + } + ], + 'should accept and normalize multiple funding sources' + ) + t.end() +}) diff --git a/deps/npm/test/tap/version-allow-same-version.js b/deps/npm/test/tap/version-allow-same-version.js index 41310e4eb2e278..14506aac7d9285 100644 --- a/deps/npm/test/tap/version-allow-same-version.js +++ b/deps/npm/test/tap/version-allow-same-version.js @@ -22,6 +22,21 @@ t.test('setup', t => { t.test('without --allow-same-version', t => { npm.config.set('allow-same-version', false) + + const version = require('../../lib/version') + + const commit1 = version.buildCommitArgs() + const commit2 = version.buildCommitArgs([ 'commit' ]) + const commit3 = version.buildCommitArgs([ 'commit', '-m', 'some commit message' ]) + + t.same(commit1, [ 'commit' ]) + t.same(commit2, [ 'commit' ]) + t.same(commit3, [ 'commit', '-m', 'some commit message' ]) + + const tag = version.buildTagFlags() + + t.same(tag, '-m') + npm.commands.version(['0.0.1'], function (err) { t.isa(err, Error, 'got an error') t.like(err.message, /Version not changed/) @@ -31,6 +46,21 @@ t.test('without --allow-same-version', t => { t.test('with --allow-same-version', t => { npm.config.set('allow-same-version', true) + + const version = require('../../lib/version') + + const commit1 = version.buildCommitArgs() + const commit2 = version.buildCommitArgs([ 'commit' ]) + const commit3 = version.buildCommitArgs([ 'commit', '-m', 'some commit message' ]) + + t.same(commit1, [ 'commit', '--allow-empty' ]) + t.same(commit2, [ 'commit', '--allow-empty' ]) + t.same(commit3, [ 'commit', '--allow-empty', '-m', 'some commit message' ]) + + const tag = version.buildTagFlags() + + t.same(tag, '-fm') + npm.commands.version(['0.0.1'], function (err) { if (err) { throw err diff --git a/deps/npm/test/tap/version-commit-hooks.js b/deps/npm/test/tap/version-commit-hooks.js index 028767ab4e5bab..36694d7eae9591 100644 --- a/deps/npm/test/tap/version-commit-hooks.js +++ b/deps/npm/test/tap/version-commit-hooks.js @@ -33,7 +33,7 @@ test('npm version with commit-hooks disabled', function (t) { t.same(args1, [ 'commit', '-n' ]) t.same(args2, [ 'commit', '-n' ]) - t.same(args3, [ 'commit', '-m', 'some commit message', '-n' ]) + t.same(args3, [ 'commit', '-n', '-m', 'some commit message' ]) t.end() }) }) diff --git a/deps/npm/test/tap/version-no-package.js b/deps/npm/test/tap/version-no-package.js index aa553b080148a9..60c0e3be7adb90 100644 --- a/deps/npm/test/tap/version-no-package.js +++ b/deps/npm/test/tap/version-no-package.js @@ -7,7 +7,7 @@ test('npm version in a prefix with no package.json', function (t) { process.chdir(pkg) common.npm( ['version', '--json', '--prefix', pkg], - { cwd: pkg }, + { cwd: pkg, nodeExecPath: process.execPath }, function (er, code, stdout, stderr) { t.ifError(er, "npm version doesn't care that there's no package.json") t.notOk(code, 'npm version ran without barfing') diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 3a19925436d5f8..3ee51d770ec8e4 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -38,7 +38,7 @@ OPSSL_SRC = ../openssl CFG = opensslconf.h SRC_CFG = $(OPSSL_SRC)/include/openssl/$(CFG) INT_CFGS = bn_conf.h dso_conf.h -INT_CFG_DIR = $(OPSSL_SRC)/crypto/include/internal +INT_CFG_DIR = $(OPSSL_SRC)/include/crypto PHONY = all clean replace .PHONY: $(PHONY) diff --git a/deps/openssl/config/Makefile_VC-WIN32 b/deps/openssl/config/Makefile_VC-WIN32 index 96610567469082..975ff2e101bdf5 100644 --- a/deps/openssl/config/Makefile_VC-WIN32 +++ b/deps/openssl/config/Makefile_VC-WIN32 @@ -1,7 +1,7 @@ BLDDIR=. PERL=perl RM= rm -f -GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h +GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h GENERATED=apps/CA.pl apps/openssl.rc apps/progs.h apps/tsget.pl crypto/aes/aes-586.asm crypto/aes/aesni-x86.asm crypto/aes/vpaes-x86.asm crypto/bf/bf-586.asm crypto/bn/bn-586.asm crypto/bn/co-586.asm crypto/bn/x86-gf2m.asm crypto/bn/x86-mont.asm crypto/buildinf.h crypto/camellia/cmll-x86.asm crypto/chacha/chacha-x86.asm crypto/des/crypt586.asm crypto/des/des-586.asm crypto/ec/ecp_nistz256-x86.asm crypto/md5/md5-586.asm crypto/modes/ghash-x86.asm crypto/poly1305/poly1305-x86.asm crypto/rc4/rc4-586.asm crypto/ripemd/rmd-586.asm crypto/sha/sha1-586.asm crypto/sha/sha256-586.asm crypto/sha/sha512-586.asm crypto/whrlpool/wp-mmx.asm crypto/x86cpuid.asm engines/capi.def engines/dasync.def engines/e_padlock-x86.asm engines/ossltest.def engines/padlock.def libcrypto.def libcrypto.rc libssl.def libssl.rc test/buildtest_aes.c test/buildtest_asn1.c test/buildtest_asn1t.c test/buildtest_async.c test/buildtest_bio.c test/buildtest_blowfish.c test/buildtest_bn.c test/buildtest_buffer.c test/buildtest_camellia.c test/buildtest_cast.c test/buildtest_cmac.c test/buildtest_cms.c test/buildtest_comp.c test/buildtest_conf.c test/buildtest_conf_api.c test/buildtest_crypto.c test/buildtest_ct.c test/buildtest_des.c test/buildtest_dh.c test/buildtest_dsa.c test/buildtest_dtls1.c test/buildtest_e_os2.c test/buildtest_ebcdic.c test/buildtest_ec.c test/buildtest_ecdh.c test/buildtest_ecdsa.c test/buildtest_engine.c test/buildtest_evp.c test/buildtest_hmac.c test/buildtest_idea.c test/buildtest_kdf.c test/buildtest_lhash.c test/buildtest_md4.c test/buildtest_md5.c test/buildtest_mdc2.c test/buildtest_modes.c test/buildtest_obj_mac.c test/buildtest_objects.c test/buildtest_ocsp.c test/buildtest_opensslv.c test/buildtest_ossl_typ.c test/buildtest_pem.c test/buildtest_pem2.c test/buildtest_pkcs12.c test/buildtest_pkcs7.c test/buildtest_rand.c test/buildtest_rand_drbg.c test/buildtest_rc2.c test/buildtest_rc4.c test/buildtest_ripemd.c test/buildtest_rsa.c test/buildtest_safestack.c test/buildtest_seed.c test/buildtest_sha.c test/buildtest_srp.c test/buildtest_srtp.c test/buildtest_ssl.c test/buildtest_ssl2.c test/buildtest_stack.c test/buildtest_store.c test/buildtest_symhacks.c test/buildtest_tls1.c test/buildtest_ts.c test/buildtest_txt_db.c test/buildtest_ui.c test/buildtest_whrlpool.c test/buildtest_x509.c test/buildtest_x509_vfy.c test/buildtest_x509v3.c tools/c_rehash.pl # Variables starting with LIB_ are used to build library object files @@ -35,12 +35,12 @@ APPS_OPENSSL=apps/openssl # see https://github.com/openssl/openssl/blob/master/crypto/sha/asm/sha256-586.pl#L82 CFLAGS += -DOPENSSL_IA32_SSE2 -crypto/include/internal/bn_conf.h: crypto/include/internal/bn_conf.h.in configdata.pm +include/crypto/bn_conf.h: include/crypto/bn_conf.h.in configdata.pm $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ - -omakefile crypto/include/internal/bn_conf.h.in > $@ -crypto/include/internal/dso_conf.h: crypto/include/internal/dso_conf.h.in configdata.pm + -omakefile include/crypto/bn_conf.h.in > $@ +include/crypto/dso_conf.h: include/crypto/dso_conf.h.in configdata.pm $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ - -omakefile crypto/include/internal/dso_conf.h.in > $@ + -omakefile include/crypto/dso_conf.h.in > $@ include/openssl/opensslconf.h: include/openssl/opensslconf.h.in configdata.pm $(PERL) -I$(BLDDIR) -Mconfigdata util/dofile.pl \ -omakefile include/openssl/opensslconf.h.in > $@ diff --git a/deps/openssl/config/Makefile_VC-WIN64-ARM b/deps/openssl/config/Makefile_VC-WIN64-ARM index 03eaba0b078188..369e054fbb3684 100644 --- a/deps/openssl/config/Makefile_VC-WIN64-ARM +++ b/deps/openssl/config/Makefile_VC-WIN64-ARM @@ -16,7 +16,7 @@ MINOR=1.1 SHLIB_VERSION_NUMBER=1.1 -GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h +GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h GENERATED=crypto/buildinf.h apps/progs.h INSTALL_LIBS="libcrypto.lib" "libssl.lib" @@ -132,12 +132,12 @@ crypto/buildinf.h: apps/progs.h: "$(PERL)" "apps/progs.pl" $(APPS_OPENSSL) > $@ -crypto/include/internal/bn_conf.h: +include/crypto/bn_conf.h: "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/bn_conf.h.in" > $@ -crypto/include/internal/dso_conf.h: + "-omakefile" "include/crypto/bn_conf.h.in" > $@ +include/crypto/dso_conf.h: "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/dso_conf.h.in" > $@ + "-omakefile" "include/crypto/dso_conf.h.in" > $@ include/openssl/opensslconf.h: "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ "-omakefile" "include/openssl/opensslconf.h.in" > $@ diff --git a/deps/openssl/config/Makefile_VC-WIN64A b/deps/openssl/config/Makefile_VC-WIN64A index 3e4adce958e409..edf6c3955d7ea3 100644 --- a/deps/openssl/config/Makefile_VC-WIN64A +++ b/deps/openssl/config/Makefile_VC-WIN64A @@ -5,18 +5,18 @@ RM= rm -f AS=nasm ASFLAGS=-g -GENERATED_MANDATORY=crypto/include/internal/bn_conf.h crypto/include/internal/dso_conf.h include/openssl/opensslconf.h +GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h include/openssl/opensslconf.h GENERATED=apps/CA.pl apps/openssl.rc apps/progs.h apps/tsget.pl crypto/aes/aes-x86_64.asm crypto/aes/aesni-mb-x86_64.asm crypto/aes/aesni-sha1-x86_64.asm crypto/aes/aesni-sha256-x86_64.asm crypto/aes/aesni-x86_64.asm crypto/aes/bsaes-x86_64.asm crypto/aes/vpaes-x86_64.asm crypto/bn/rsaz-avx2.asm crypto/bn/rsaz-x86_64.asm crypto/bn/x86_64-gf2m.asm crypto/bn/x86_64-mont.asm crypto/bn/x86_64-mont5.asm crypto/buildinf.h crypto/camellia/cmll-x86_64.asm crypto/chacha/chacha-x86_64.asm crypto/ec/ecp_nistz256-x86_64.asm crypto/ec/x25519-x86_64.asm crypto/md5/md5-x86_64.asm crypto/modes/aesni-gcm-x86_64.asm crypto/modes/ghash-x86_64.asm crypto/poly1305/poly1305-x86_64.asm crypto/rc4/rc4-md5-x86_64.asm crypto/rc4/rc4-x86_64.asm crypto/sha/keccak1600-x86_64.asm crypto/sha/sha1-mb-x86_64.asm crypto/sha/sha1-x86_64.asm crypto/sha/sha256-mb-x86_64.asm crypto/sha/sha256-x86_64.asm crypto/sha/sha512-x86_64.asm crypto/uplink-x86_64.asm crypto/whrlpool/wp-x86_64.asm crypto/x86_64cpuid.asm engines/e_padlock-x86_64.asm libcrypto.def libcrypto.rc libssl.def libssl.rc test/buildtest_aes.c test/buildtest_asn1.c test/buildtest_asn1t.c test/buildtest_async.c test/buildtest_bio.c test/buildtest_blowfish.c test/buildtest_bn.c test/buildtest_buffer.c test/buildtest_camellia.c test/buildtest_cast.c test/buildtest_cmac.c test/buildtest_cms.c test/buildtest_comp.c test/buildtest_conf.c test/buildtest_conf_api.c test/buildtest_crypto.c test/buildtest_ct.c test/buildtest_des.c test/buildtest_dh.c test/buildtest_dsa.c test/buildtest_dtls1.c test/buildtest_e_os2.c test/buildtest_ebcdic.c test/buildtest_ec.c test/buildtest_ecdh.c test/buildtest_ecdsa.c test/buildtest_engine.c test/buildtest_evp.c test/buildtest_hmac.c test/buildtest_idea.c test/buildtest_kdf.c test/buildtest_lhash.c test/buildtest_md4.c test/buildtest_md5.c test/buildtest_mdc2.c test/buildtest_modes.c test/buildtest_obj_mac.c test/buildtest_objects.c test/buildtest_ocsp.c test/buildtest_opensslv.c test/buildtest_ossl_typ.c test/buildtest_pem.c test/buildtest_pem2.c test/buildtest_pkcs12.c test/buildtest_pkcs7.c test/buildtest_rand.c test/buildtest_rand_drbg.c test/buildtest_rc2.c test/buildtest_rc4.c test/buildtest_ripemd.c test/buildtest_rsa.c test/buildtest_safestack.c test/buildtest_seed.c test/buildtest_sha.c test/buildtest_srp.c test/buildtest_srtp.c test/buildtest_ssl.c test/buildtest_ssl2.c test/buildtest_stack.c test/buildtest_store.c test/buildtest_symhacks.c test/buildtest_tls1.c test/buildtest_ts.c test/buildtest_txt_db.c test/buildtest_ui.c test/buildtest_whrlpool.c test/buildtest_x509.c test/buildtest_x509_vfy.c test/buildtest_x509v3.c tools/c_rehash.pl PERLASM_SCHEME= auto APPS_OPENSSL=apps/openssl -crypto/include/internal/bn_conf.h: crypto/include/internal/bn_conf.h.in configdata.pm +include/crypto/bn_conf.h: include/crypto/bn_conf.h.in configdata.pm "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/bn_conf.h.in" > $@ -crypto/include/internal/dso_conf.h: crypto/include/internal/dso_conf.h.in configdata.pm + "-omakefile" "include/crypto/bn_conf.h.in" > $@ +include/crypto/dso_conf.h: include/crypto/dso_conf.h.in configdata.pm "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ - "-omakefile" "crypto/include/internal/dso_conf.h.in" > $@ + "-omakefile" "include/crypto/dso_conf.h.in" > $@ include/openssl/opensslconf.h: include/openssl/opensslconf.h.in configdata.pm "$(PERL)" "-I$(BLDDIR)" -Mconfigdata "util/dofile.pl" \ "-omakefile" "include/openssl/opensslconf.h.in" > $@ diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm index 60838a7aa0d12e..765ef97df004ce 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -235,6 +235,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -351,8 +352,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -620,14 +621,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -703,6 +696,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1492,6 +1493,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3224,7 +3231,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3232,6 +3238,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3730,14 +3737,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4178,6 +4177,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4860,49 +4867,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4912,7 +4911,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4930,13 +4928,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4950,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5570,7 +5464,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5580,188 +5473,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5791,25 +5653,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5819,31 +5677,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5853,31 +5706,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5895,284 +5743,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6182,295 +5983,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6230,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6237,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6244,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6251,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,7 +6258,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6518,163 +6265,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6692,241 +6412,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_devcrypto.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6934,21 +6614,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6956,13 +6633,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6970,81 +6645,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7052,334 +6714,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7389,79 +6989,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7480,7 +7067,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7490,361 +7076,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7866,265 +7392,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8134,31 +7616,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8168,13 +7645,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8200,19 +7675,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8238,13 +7710,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8270,727 +7740,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9041,6 +8390,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9285,7 +8642,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9611,7 +8967,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9657,7 +9012,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9723,7 +9077,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9748,7 +9101,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9846,7 +9198,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9896,18 +9247,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9918,6 +9266,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9981,10 +9333,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10013,6 +9361,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10277,6 +9629,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15237,7 +14590,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15245,6 +14597,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15472,6 +14825,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15574,10 +14935,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15606,6 +14963,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s deleted file mode 100644 index 1ac5376af25fe1..00000000000000 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s +++ /dev/null @@ -1,3218 +0,0 @@ -.text -.type __x86_AES_encrypt_compact,@function -.align 4 -__x86_AES_encrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L000loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ecx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ecx,%edi - xorl %esi,%ecx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ecx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%ecx - andl %edx,%ebp - leal (%edx,%edx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %edx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %edx,%edi - xorl %esi,%edx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%edx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%edx - andl %eax,%ebp - leal (%eax,%eax,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %eax,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %eax,%edi - xorl %esi,%eax - rorl $24,%edi - xorl %ebp,%esi - roll $24,%eax - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%eax - andl %ebx,%ebp - leal (%ebx,%ebx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ebx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ebx,%edi - xorl %esi,%ebx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ebx - xorl %edi,%esi - xorl %esi,%ebx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L000loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.type __sse_AES_encrypt_compact,@function -.align 4 -__sse_AES_encrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L001loop: - pshufw $8,%mm0,%mm1 - pshufw $13,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $13,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $8,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $8,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - movd %mm2,%eax - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - movd %mm6,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $8,%esi - shrl $16,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shrl $16,%eax - movd %ecx,%mm1 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - andl $255,%eax - orl %esi,%ecx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - andl $255,%ebx - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%ecx - shll $16,%eax - movzbl -128(%ebp,%edi,1),%esi - orl %eax,%edx - shll $8,%esi - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - orl %ebx,%edx - movl 20(%esp),%edi - movd %ecx,%mm4 - movd %edx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L002out - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - movq %mm0,%mm1 - movq %mm4,%mm5 - pcmpgtb %mm0,%mm3 - pcmpgtb %mm4,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - pshufw $177,%mm0,%mm2 - pshufw $177,%mm4,%mm6 - paddb %mm0,%mm0 - paddb %mm4,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pshufw $177,%mm2,%mm3 - pshufw $177,%mm6,%mm7 - pxor %mm0,%mm1 - pxor %mm4,%mm5 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm3,%mm2 - movq %mm7,%mm6 - pslld $8,%mm3 - pslld $8,%mm7 - psrld $24,%mm2 - psrld $24,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - psrld $8,%mm1 - psrld $8,%mm5 - movl -128(%ebp),%eax - pslld $24,%mm3 - pslld $24,%mm7 - movl -64(%ebp),%ebx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl (%ebp),%ecx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl 64(%ebp),%edx - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L001loop -.align 4,0x90 -L002out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.type __x86_AES_encrypt,@function -.align 4 -__x86_AES_encrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L003loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl (%ebp,%esi,8),%esi - movzbl %ch,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movzbl %bh,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - movl (%ebp,%edx,8),%edx - movzbl %ah,%eax - xorl 3(%ebp,%eax,8),%edx - movl 4(%esp),%eax - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - xorl 1(%ebp,%ecx,8),%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L003loop - movl %eax,%esi - andl $255,%esi - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %bh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %ch,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %dh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movzbl %bh,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movl 2(%ebp,%edx,8),%edx - andl $255,%edx - movzbl %ah,%eax - movl (%ebp,%eax,8),%eax - andl $65280,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movl (%ebp,%ebx,8),%ebx - andl $16711680,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movl 2(%ebp,%ecx,8),%ecx - andl $4278190080,%ecx - xorl %ecx,%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Te: -.long 2774754246,2774754246 -.long 2222750968,2222750968 -.long 2574743534,2574743534 -.long 2373680118,2373680118 -.long 234025727,234025727 -.long 3177933782,3177933782 -.long 2976870366,2976870366 -.long 1422247313,1422247313 -.long 1345335392,1345335392 -.long 50397442,50397442 -.long 2842126286,2842126286 -.long 2099981142,2099981142 -.long 436141799,436141799 -.long 1658312629,1658312629 -.long 3870010189,3870010189 -.long 2591454956,2591454956 -.long 1170918031,1170918031 -.long 2642575903,2642575903 -.long 1086966153,1086966153 -.long 2273148410,2273148410 -.long 368769775,368769775 -.long 3948501426,3948501426 -.long 3376891790,3376891790 -.long 200339707,200339707 -.long 3970805057,3970805057 -.long 1742001331,1742001331 -.long 4255294047,4255294047 -.long 3937382213,3937382213 -.long 3214711843,3214711843 -.long 4154762323,4154762323 -.long 2524082916,2524082916 -.long 1539358875,1539358875 -.long 3266819957,3266819957 -.long 486407649,486407649 -.long 2928907069,2928907069 -.long 1780885068,1780885068 -.long 1513502316,1513502316 -.long 1094664062,1094664062 -.long 49805301,49805301 -.long 1338821763,1338821763 -.long 1546925160,1546925160 -.long 4104496465,4104496465 -.long 887481809,887481809 -.long 150073849,150073849 -.long 2473685474,2473685474 -.long 1943591083,1943591083 -.long 1395732834,1395732834 -.long 1058346282,1058346282 -.long 201589768,201589768 -.long 1388824469,1388824469 -.long 1696801606,1696801606 -.long 1589887901,1589887901 -.long 672667696,672667696 -.long 2711000631,2711000631 -.long 251987210,251987210 -.long 3046808111,3046808111 -.long 151455502,151455502 -.long 907153956,907153956 -.long 2608889883,2608889883 -.long 1038279391,1038279391 -.long 652995533,652995533 -.long 1764173646,1764173646 -.long 3451040383,3451040383 -.long 2675275242,2675275242 -.long 453576978,453576978 -.long 2659418909,2659418909 -.long 1949051992,1949051992 -.long 773462580,773462580 -.long 756751158,756751158 -.long 2993581788,2993581788 -.long 3998898868,3998898868 -.long 4221608027,4221608027 -.long 4132590244,4132590244 -.long 1295727478,1295727478 -.long 1641469623,1641469623 -.long 3467883389,3467883389 -.long 2066295122,2066295122 -.long 1055122397,1055122397 -.long 1898917726,1898917726 -.long 2542044179,2542044179 -.long 4115878822,4115878822 -.long 1758581177,1758581177 -.long 0,0 -.long 753790401,753790401 -.long 1612718144,1612718144 -.long 536673507,536673507 -.long 3367088505,3367088505 -.long 3982187446,3982187446 -.long 3194645204,3194645204 -.long 1187761037,1187761037 -.long 3653156455,3653156455 -.long 1262041458,1262041458 -.long 3729410708,3729410708 -.long 3561770136,3561770136 -.long 3898103984,3898103984 -.long 1255133061,1255133061 -.long 1808847035,1808847035 -.long 720367557,720367557 -.long 3853167183,3853167183 -.long 385612781,385612781 -.long 3309519750,3309519750 -.long 3612167578,3612167578 -.long 1429418854,1429418854 -.long 2491778321,2491778321 -.long 3477423498,3477423498 -.long 284817897,284817897 -.long 100794884,100794884 -.long 2172616702,2172616702 -.long 4031795360,4031795360 -.long 1144798328,1144798328 -.long 3131023141,3131023141 -.long 3819481163,3819481163 -.long 4082192802,4082192802 -.long 4272137053,4272137053 -.long 3225436288,3225436288 -.long 2324664069,2324664069 -.long 2912064063,2912064063 -.long 3164445985,3164445985 -.long 1211644016,1211644016 -.long 83228145,83228145 -.long 3753688163,3753688163 -.long 3249976951,3249976951 -.long 1977277103,1977277103 -.long 1663115586,1663115586 -.long 806359072,806359072 -.long 452984805,452984805 -.long 250868733,250868733 -.long 1842533055,1842533055 -.long 1288555905,1288555905 -.long 336333848,336333848 -.long 890442534,890442534 -.long 804056259,804056259 -.long 3781124030,3781124030 -.long 2727843637,2727843637 -.long 3427026056,3427026056 -.long 957814574,957814574 -.long 1472513171,1472513171 -.long 4071073621,4071073621 -.long 2189328124,2189328124 -.long 1195195770,1195195770 -.long 2892260552,2892260552 -.long 3881655738,3881655738 -.long 723065138,723065138 -.long 2507371494,2507371494 -.long 2690670784,2690670784 -.long 2558624025,2558624025 -.long 3511635870,3511635870 -.long 2145180835,2145180835 -.long 1713513028,1713513028 -.long 2116692564,2116692564 -.long 2878378043,2878378043 -.long 2206763019,2206763019 -.long 3393603212,3393603212 -.long 703524551,703524551 -.long 3552098411,3552098411 -.long 1007948840,1007948840 -.long 2044649127,2044649127 -.long 3797835452,3797835452 -.long 487262998,487262998 -.long 1994120109,1994120109 -.long 1004593371,1004593371 -.long 1446130276,1446130276 -.long 1312438900,1312438900 -.long 503974420,503974420 -.long 3679013266,3679013266 -.long 168166924,168166924 -.long 1814307912,1814307912 -.long 3831258296,3831258296 -.long 1573044895,1573044895 -.long 1859376061,1859376061 -.long 4021070915,4021070915 -.long 2791465668,2791465668 -.long 2828112185,2828112185 -.long 2761266481,2761266481 -.long 937747667,937747667 -.long 2339994098,2339994098 -.long 854058965,854058965 -.long 1137232011,1137232011 -.long 1496790894,1496790894 -.long 3077402074,3077402074 -.long 2358086913,2358086913 -.long 1691735473,1691735473 -.long 3528347292,3528347292 -.long 3769215305,3769215305 -.long 3027004632,3027004632 -.long 4199962284,4199962284 -.long 133494003,133494003 -.long 636152527,636152527 -.long 2942657994,2942657994 -.long 2390391540,2390391540 -.long 3920539207,3920539207 -.long 403179536,403179536 -.long 3585784431,3585784431 -.long 2289596656,2289596656 -.long 1864705354,1864705354 -.long 1915629148,1915629148 -.long 605822008,605822008 -.long 4054230615,4054230615 -.long 3350508659,3350508659 -.long 1371981463,1371981463 -.long 602466507,602466507 -.long 2094914977,2094914977 -.long 2624877800,2624877800 -.long 555687742,555687742 -.long 3712699286,3712699286 -.long 3703422305,3703422305 -.long 2257292045,2257292045 -.long 2240449039,2240449039 -.long 2423288032,2423288032 -.long 1111375484,1111375484 -.long 3300242801,3300242801 -.long 2858837708,2858837708 -.long 3628615824,3628615824 -.long 84083462,84083462 -.long 32962295,32962295 -.long 302911004,302911004 -.long 2741068226,2741068226 -.long 1597322602,1597322602 -.long 4183250862,4183250862 -.long 3501832553,3501832553 -.long 2441512471,2441512471 -.long 1489093017,1489093017 -.long 656219450,656219450 -.long 3114180135,3114180135 -.long 954327513,954327513 -.long 335083755,335083755 -.long 3013122091,3013122091 -.long 856756514,856756514 -.long 3144247762,3144247762 -.long 1893325225,1893325225 -.long 2307821063,2307821063 -.long 2811532339,2811532339 -.long 3063651117,3063651117 -.long 572399164,572399164 -.long 2458355477,2458355477 -.long 552200649,552200649 -.long 1238290055,1238290055 -.long 4283782570,4283782570 -.long 2015897680,2015897680 -.long 2061492133,2061492133 -.long 2408352771,2408352771 -.long 4171342169,4171342169 -.long 2156497161,2156497161 -.long 386731290,386731290 -.long 3669999461,3669999461 -.long 837215959,837215959 -.long 3326231172,3326231172 -.long 3093850320,3093850320 -.long 3275833730,3275833730 -.long 2962856233,2962856233 -.long 1999449434,1999449434 -.long 286199582,286199582 -.long 3417354363,3417354363 -.long 4233385128,4233385128 -.long 3602627437,3602627437 -.long 974525996,974525996 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.long 1,2,4,8 -.long 16,32,64,128 -.long 27,54,0,0 -.long 0,0,0,0 -.globl _AES_encrypt -.type _AES_encrypt,@function -.align 4 -_AES_encrypt: -L_AES_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L004pic_point -L004pic_point: - popl %ebp - leal __GLOBAL_OFFSET_TABLE_+[.-L004pic_point](%ebp),%eax - movl _OPENSSL_ia32cap_P@GOT(%eax),%eax - leal LAES_Te-L004pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L005x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L005x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.type __x86_AES_decrypt_compact,@function -.align 4 -__x86_AES_decrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L006loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%eax - subl %edi,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %ecx,%eax - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ecx,%ebx - roll $8,%ecx - xorl %esi,%ebp - xorl %eax,%ecx - xorl %ebp,%eax - xorl %ebx,%ecx - xorl %ebp,%ebx - roll $24,%eax - xorl %ebp,%ecx - roll $16,%ebx - xorl %eax,%ecx - roll $8,%ebp - xorl %ebx,%ecx - movl 4(%esp),%eax - xorl %ebp,%ecx - movl %ecx,12(%esp) - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %edx,%ebx - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %edx,%ecx - roll $8,%edx - xorl %esi,%ebp - xorl %ebx,%edx - xorl %ebp,%ebx - xorl %ecx,%edx - xorl %ebp,%ecx - roll $24,%ebx - xorl %ebp,%edx - roll $16,%ecx - xorl %ebx,%edx - roll $8,%ebp - xorl %ecx,%edx - movl 8(%esp),%ebx - xorl %ebp,%edx - movl %edx,16(%esp) - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %eax,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %eax,%edx - roll $8,%eax - xorl %esi,%ebp - xorl %ecx,%eax - xorl %ebp,%ecx - xorl %edx,%eax - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%eax - roll $16,%edx - xorl %ecx,%eax - roll $8,%ebp - xorl %edx,%eax - xorl %ebp,%eax - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ebx,%edx - roll $8,%ebx - xorl %esi,%ebp - xorl %ecx,%ebx - xorl %ebp,%ecx - xorl %edx,%ebx - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%ebp - xorl %edx,%ebx - movl 12(%esp),%ecx - xorl %ebp,%ebx - movl 16(%esp),%edx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L006loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.type __sse_AES_decrypt_compact,@function -.align 4 -__sse_AES_decrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L007loop: - pshufw $12,%mm0,%mm1 - pshufw $9,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $6,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $3,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movd %mm2,%eax - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $16,%esi - movd %mm6,%ebx - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %al,%edi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $16,%esi - shrl $16,%eax - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shrl $16,%ebx - shll $8,%esi - movd %edx,%mm1 - movzbl -128(%ebp,%edi,1),%edx - movzbl %bh,%edi - shll $24,%edx - andl $255,%ebx - orl %esi,%edx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movzbl %ah,%eax - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - orl %ebx,%edx - shll $16,%esi - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%edx - shll $24,%eax - orl %eax,%ecx - movl 20(%esp),%edi - movd %edx,%mm4 - movd %ecx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L008out - movq %mm0,%mm3 - movq %mm4,%mm7 - pshufw $228,%mm0,%mm2 - pshufw $228,%mm4,%mm6 - movq %mm0,%mm1 - movq %mm4,%mm5 - pshufw $177,%mm0,%mm0 - pshufw $177,%mm4,%mm4 - pslld $8,%mm2 - pslld $8,%mm6 - psrld $8,%mm3 - psrld $8,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pslld $16,%mm2 - pslld $16,%mm6 - psrld $16,%mm3 - psrld $16,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movq 8(%esp),%mm3 - pxor %mm2,%mm2 - pxor %mm6,%mm6 - pcmpgtb %mm1,%mm2 - pcmpgtb %mm5,%mm6 - pand %mm3,%mm2 - pand %mm3,%mm6 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm2,%mm1 - pxor %mm6,%mm5 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq %mm1,%mm2 - movq %mm5,%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pslld $24,%mm3 - pslld $24,%mm7 - psrld $8,%mm2 - psrld $8,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pshufw $177,%mm1,%mm3 - pshufw $177,%mm5,%mm7 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - pshufw $177,%mm1,%mm2 - pshufw $177,%mm5,%mm6 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pslld $8,%mm1 - pslld $8,%mm5 - psrld $8,%mm3 - psrld $8,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl -128(%ebp),%eax - pslld $16,%mm1 - pslld $16,%mm5 - movl -64(%ebp),%ebx - psrld $16,%mm3 - psrld $16,%mm7 - movl (%ebp),%ecx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl 64(%ebp),%edx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L007loop -.align 4,0x90 -L008out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.type __x86_AES_decrypt,@function -.align 4 -__x86_AES_decrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L009loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ebx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %ah,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - andl $255,%edx - movl (%ebp,%edx,8),%edx - movzbl %ch,%ecx - xorl 3(%ebp,%ecx,8),%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - shrl $24,%eax - xorl 1(%ebp,%eax,8),%edx - movl 4(%esp),%eax - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L009loop - leal 2176(%ebp),%ebp - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi - leal -128(%ebp),%ebp - movl %eax,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl (%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl (%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl (%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl (%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - leal -2048(%ebp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Td: -.long 1353184337,1353184337 -.long 1399144830,1399144830 -.long 3282310938,3282310938 -.long 2522752826,2522752826 -.long 3412831035,3412831035 -.long 4047871263,4047871263 -.long 2874735276,2874735276 -.long 2466505547,2466505547 -.long 1442459680,1442459680 -.long 4134368941,4134368941 -.long 2440481928,2440481928 -.long 625738485,625738485 -.long 4242007375,4242007375 -.long 3620416197,3620416197 -.long 2151953702,2151953702 -.long 2409849525,2409849525 -.long 1230680542,1230680542 -.long 1729870373,1729870373 -.long 2551114309,2551114309 -.long 3787521629,3787521629 -.long 41234371,41234371 -.long 317738113,317738113 -.long 2744600205,2744600205 -.long 3338261355,3338261355 -.long 3881799427,3881799427 -.long 2510066197,2510066197 -.long 3950669247,3950669247 -.long 3663286933,3663286933 -.long 763608788,763608788 -.long 3542185048,3542185048 -.long 694804553,694804553 -.long 1154009486,1154009486 -.long 1787413109,1787413109 -.long 2021232372,2021232372 -.long 1799248025,1799248025 -.long 3715217703,3715217703 -.long 3058688446,3058688446 -.long 397248752,397248752 -.long 1722556617,1722556617 -.long 3023752829,3023752829 -.long 407560035,407560035 -.long 2184256229,2184256229 -.long 1613975959,1613975959 -.long 1165972322,1165972322 -.long 3765920945,3765920945 -.long 2226023355,2226023355 -.long 480281086,480281086 -.long 2485848313,2485848313 -.long 1483229296,1483229296 -.long 436028815,436028815 -.long 2272059028,2272059028 -.long 3086515026,3086515026 -.long 601060267,601060267 -.long 3791801202,3791801202 -.long 1468997603,1468997603 -.long 715871590,715871590 -.long 120122290,120122290 -.long 63092015,63092015 -.long 2591802758,2591802758 -.long 2768779219,2768779219 -.long 4068943920,4068943920 -.long 2997206819,2997206819 -.long 3127509762,3127509762 -.long 1552029421,1552029421 -.long 723308426,723308426 -.long 2461301159,2461301159 -.long 4042393587,4042393587 -.long 2715969870,2715969870 -.long 3455375973,3455375973 -.long 3586000134,3586000134 -.long 526529745,526529745 -.long 2331944644,2331944644 -.long 2639474228,2639474228 -.long 2689987490,2689987490 -.long 853641733,853641733 -.long 1978398372,1978398372 -.long 971801355,971801355 -.long 2867814464,2867814464 -.long 111112542,111112542 -.long 1360031421,1360031421 -.long 4186579262,4186579262 -.long 1023860118,1023860118 -.long 2919579357,2919579357 -.long 1186850381,1186850381 -.long 3045938321,3045938321 -.long 90031217,90031217 -.long 1876166148,1876166148 -.long 4279586912,4279586912 -.long 620468249,620468249 -.long 2548678102,2548678102 -.long 3426959497,3426959497 -.long 2006899047,2006899047 -.long 3175278768,3175278768 -.long 2290845959,2290845959 -.long 945494503,945494503 -.long 3689859193,3689859193 -.long 1191869601,1191869601 -.long 3910091388,3910091388 -.long 3374220536,3374220536 -.long 0,0 -.long 2206629897,2206629897 -.long 1223502642,1223502642 -.long 2893025566,2893025566 -.long 1316117100,1316117100 -.long 4227796733,4227796733 -.long 1446544655,1446544655 -.long 517320253,517320253 -.long 658058550,658058550 -.long 1691946762,1691946762 -.long 564550760,564550760 -.long 3511966619,3511966619 -.long 976107044,976107044 -.long 2976320012,2976320012 -.long 266819475,266819475 -.long 3533106868,3533106868 -.long 2660342555,2660342555 -.long 1338359936,1338359936 -.long 2720062561,2720062561 -.long 1766553434,1766553434 -.long 370807324,370807324 -.long 179999714,179999714 -.long 3844776128,3844776128 -.long 1138762300,1138762300 -.long 488053522,488053522 -.long 185403662,185403662 -.long 2915535858,2915535858 -.long 3114841645,3114841645 -.long 3366526484,3366526484 -.long 2233069911,2233069911 -.long 1275557295,1275557295 -.long 3151862254,3151862254 -.long 4250959779,4250959779 -.long 2670068215,2670068215 -.long 3170202204,3170202204 -.long 3309004356,3309004356 -.long 880737115,880737115 -.long 1982415755,1982415755 -.long 3703972811,3703972811 -.long 1761406390,1761406390 -.long 1676797112,1676797112 -.long 3403428311,3403428311 -.long 277177154,277177154 -.long 1076008723,1076008723 -.long 538035844,538035844 -.long 2099530373,2099530373 -.long 4164795346,4164795346 -.long 288553390,288553390 -.long 1839278535,1839278535 -.long 1261411869,1261411869 -.long 4080055004,4080055004 -.long 3964831245,3964831245 -.long 3504587127,3504587127 -.long 1813426987,1813426987 -.long 2579067049,2579067049 -.long 4199060497,4199060497 -.long 577038663,577038663 -.long 3297574056,3297574056 -.long 440397984,440397984 -.long 3626794326,3626794326 -.long 4019204898,4019204898 -.long 3343796615,3343796615 -.long 3251714265,3251714265 -.long 4272081548,4272081548 -.long 906744984,906744984 -.long 3481400742,3481400742 -.long 685669029,685669029 -.long 646887386,646887386 -.long 2764025151,2764025151 -.long 3835509292,3835509292 -.long 227702864,227702864 -.long 2613862250,2613862250 -.long 1648787028,1648787028 -.long 3256061430,3256061430 -.long 3904428176,3904428176 -.long 1593260334,1593260334 -.long 4121936770,4121936770 -.long 3196083615,3196083615 -.long 2090061929,2090061929 -.long 2838353263,2838353263 -.long 3004310991,3004310991 -.long 999926984,999926984 -.long 2809993232,2809993232 -.long 1852021992,1852021992 -.long 2075868123,2075868123 -.long 158869197,158869197 -.long 4095236462,4095236462 -.long 28809964,28809964 -.long 2828685187,2828685187 -.long 1701746150,1701746150 -.long 2129067946,2129067946 -.long 147831841,147831841 -.long 3873969647,3873969647 -.long 3650873274,3650873274 -.long 3459673930,3459673930 -.long 3557400554,3557400554 -.long 3598495785,3598495785 -.long 2947720241,2947720241 -.long 824393514,824393514 -.long 815048134,815048134 -.long 3227951669,3227951669 -.long 935087732,935087732 -.long 2798289660,2798289660 -.long 2966458592,2966458592 -.long 366520115,366520115 -.long 1251476721,1251476721 -.long 4158319681,4158319681 -.long 240176511,240176511 -.long 804688151,804688151 -.long 2379631990,2379631990 -.long 1303441219,1303441219 -.long 1414376140,1414376140 -.long 3741619940,3741619940 -.long 3820343710,3820343710 -.long 461924940,461924940 -.long 3089050817,3089050817 -.long 2136040774,2136040774 -.long 82468509,82468509 -.long 1563790337,1563790337 -.long 1937016826,1937016826 -.long 776014843,776014843 -.long 1511876531,1511876531 -.long 1389550482,1389550482 -.long 861278441,861278441 -.long 323475053,323475053 -.long 2355222426,2355222426 -.long 2047648055,2047648055 -.long 2383738969,2383738969 -.long 2302415851,2302415851 -.long 3995576782,3995576782 -.long 902390199,902390199 -.long 3991215329,3991215329 -.long 1018251130,1018251130 -.long 1507840668,1507840668 -.long 1064563285,1064563285 -.long 2043548696,2043548696 -.long 3208103795,3208103795 -.long 3939366739,3939366739 -.long 1537932639,1537932639 -.long 342834655,342834655 -.long 2262516856,2262516856 -.long 2180231114,2180231114 -.long 1053059257,1053059257 -.long 741614648,741614648 -.long 1598071746,1598071746 -.long 1925389590,1925389590 -.long 203809468,203809468 -.long 2336832552,2336832552 -.long 1100287487,1100287487 -.long 1895934009,1895934009 -.long 3736275976,3736275976 -.long 2632234200,2632234200 -.long 2428589668,2428589668 -.long 1636092795,1636092795 -.long 1890988757,1890988757 -.long 1952214088,1952214088 -.long 1113045200,1113045200 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.globl _AES_decrypt -.type _AES_decrypt,@function -.align 4 -_AES_decrypt: -L_AES_decrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L010pic_point -L010pic_point: - popl %ebp - leal __GLOBAL_OFFSET_TABLE_+[.-L010pic_point](%ebp),%eax - movl _OPENSSL_ia32cap_P@GOT(%eax),%eax - leal LAES_Td-L010pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L011x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L011x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_cbc_encrypt -.type _AES_cbc_encrypt,@function -.align 4 -_AES_cbc_encrypt: -L_AES_cbc_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%ecx - cmpl $0,%ecx - je L012drop_out - call L013pic_point -L013pic_point: - popl %ebp - leal __GLOBAL_OFFSET_TABLE_+[.-L013pic_point](%ebp),%eax - movl _OPENSSL_ia32cap_P@GOT(%eax),%eax - cmpl $0,40(%esp) - leal LAES_Te-L013pic_point(%ebp),%ebp - jne L014picked_te - leal LAES_Td-LAES_Te(%ebp),%ebp -L014picked_te: - pushfl - cld - cmpl $512,%ecx - jb L015slow_way - testl $15,%ecx - jnz L015slow_way - btl $28,(%eax) - jc L015slow_way - leal -324(%esp),%esi - andl $-64,%esi - movl %ebp,%eax - leal 2304(%ebp),%ebx - movl %esi,%edx - andl $4095,%eax - andl $4095,%ebx - andl $4095,%edx - cmpl %ebx,%edx - jb L016tbl_break_out - subl %ebx,%edx - subl %edx,%esi - jmp L017tbl_ok -.align 2,0x90 -L016tbl_break_out: - subl %eax,%edx - andl $4095,%edx - addl $384,%edx - subl %edx,%esi -.align 2,0x90 -L017tbl_ok: - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 12(%edx),%edi - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl $0,316(%esp) - movl %edi,%ebx - movl $61,%ecx - subl %ebp,%ebx - movl %edi,%esi - andl $4095,%ebx - leal 76(%esp),%edi - cmpl $2304,%ebx - jb L018do_copy - cmpl $3852,%ebx - jb L019skip_copy -.align 2,0x90 -L018do_copy: - movl %edi,44(%esp) -.long 2784229001 -L019skip_copy: - movl $16,%edi -.align 2,0x90 -L020prefetch_tbl: - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%esi - leal 128(%ebp),%ebp - subl $1,%edi - jnz L020prefetch_tbl - subl $2048,%ebp - movl 32(%esp),%esi - movl 48(%esp),%edi - cmpl $0,%edx - je L021fast_decrypt - movl (%edi),%eax - movl 4(%edi),%ebx -.align 4,0x90 -L022fast_enc_loop: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - leal 16(%esi),%esi - movl 40(%esp),%ecx - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L022fast_enc_loop - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L023skip_ezero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L023skip_ezero: - movl 28(%esp),%esp - popfl -L012drop_out: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L021fast_decrypt: - cmpl 36(%esp),%esi - je L024fast_dec_in_place - movl %edi,52(%esp) -.align 2,0x90 -.align 4,0x90 -L025fast_dec_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 52(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 36(%esp),%edi - movl 32(%esp),%esi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl %esi,52(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edi - movl %edi,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L025fast_dec_loop - movl 52(%esp),%edi - movl 48(%esp),%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - jmp L026fast_dec_out -.align 4,0x90 -L024fast_dec_in_place: -L027fast_dec_in_place_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 48(%esp),%edi - movl 36(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L027fast_dec_in_place_loop -.align 2,0x90 -L026fast_dec_out: - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L028skip_dzero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L028skip_dzero: - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L015slow_way: - movl (%eax),%eax - movl 36(%esp),%edi - leal -80(%esp),%esi - andl $-64,%esi - leal -143(%edi),%ebx - subl %esi,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esi - leal 768(%esi),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl %eax,52(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl %esi,%edi - movl %eax,%esi - cmpl $0,%edx - je L029slow_decrypt - cmpl $16,%ecx - movl %ebx,%edx - jb L030slow_enc_tail - btl $25,52(%esp) - jnc L031slow_enc_x86 - movq (%edi),%mm0 - movq 8(%edi),%mm4 -.align 4,0x90 -L032slow_enc_loop_sse: - pxor (%esi),%mm0 - pxor 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl 40(%esp),%ecx - movq %mm0,(%edi) - movq %mm4,8(%edi) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L032slow_enc_loop_sse - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L031slow_enc_x86: - movl (%edi),%eax - movl 4(%edi),%ebx -.align 2,0x90 -L033slow_enc_loop_x86: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L033slow_enc_loop_x86 - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L030slow_enc_tail: - emms - movl %edx,%edi - movl $16,%ebx - subl %ecx,%ebx - cmpl %esi,%edi - je L034enc_in_place -.align 2,0x90 -.long 2767451785 - jmp L035enc_skip_in_place -L034enc_in_place: - leal (%edi,%ecx,1),%edi -L035enc_skip_in_place: - movl %ebx,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2868115081 - movl 48(%esp),%edi - movl %edx,%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl $16,40(%esp) - jmp L033slow_enc_loop_x86 -.align 4,0x90 -L029slow_decrypt: - btl $25,52(%esp) - jnc L036slow_dec_loop_x86 -.align 2,0x90 -L037slow_dec_loop_sse: - movq (%esi),%mm0 - movq 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_decrypt_compact - movl 32(%esp),%esi - leal 60(%esp),%eax - movl 36(%esp),%ebx - movl 40(%esp),%ecx - movl 48(%esp),%edi - movq (%esi),%mm1 - movq 8(%esi),%mm5 - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movq %mm1,(%edi) - movq %mm5,8(%edi) - subl $16,%ecx - jc L038slow_dec_partial_sse - movq %mm0,(%ebx) - movq %mm4,8(%ebx) - leal 16(%ebx),%ebx - movl %ebx,36(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - movl %ecx,40(%esp) - jnz L037slow_dec_loop_sse - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L038slow_dec_partial_sse: - movq %mm0,(%eax) - movq %mm4,8(%eax) - emms - addl $16,%ecx - movl %ebx,%edi - movl %eax,%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L036slow_dec_loop_x86: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt_compact - movl 48(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - subl $16,%esi - jc L039slow_dec_partial_x86 - movl %esi,40(%esp) - movl 36(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - leal 16(%esi),%esi - movl %esi,32(%esp) - jnz L036slow_dec_loop_x86 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L039slow_dec_partial_x86: - leal 60(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 32(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl 36(%esp),%edi - leal 60(%esp),%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.type __x86_AES_set_encrypt_key,@function -.align 4 -__x86_AES_set_encrypt_key: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 24(%esp),%esi - movl 32(%esp),%edi - testl $-1,%esi - jz L040badpointer - testl $-1,%edi - jz L040badpointer - call L041pic_point -L041pic_point: - popl %ebp - leal LAES_Te-L041pic_point(%ebp),%ebp - leal 2176(%ebp),%ebp - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx - movl 28(%esp),%ecx - cmpl $128,%ecx - je L04210rounds - cmpl $192,%ecx - je L04312rounds - cmpl $256,%ecx - je L04414rounds - movl $-2,%eax - jmp L045exit -L04210rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - xorl %ecx,%ecx - jmp L04610shortcut -.align 2,0x90 -L04710loop: - movl (%edi),%eax - movl 12(%edi),%edx -L04610shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,16(%edi) - xorl 4(%edi),%eax - movl %eax,20(%edi) - xorl 8(%edi),%eax - movl %eax,24(%edi) - xorl 12(%edi),%eax - movl %eax,28(%edi) - incl %ecx - addl $16,%edi - cmpl $10,%ecx - jl L04710loop - movl $10,80(%edi) - xorl %eax,%eax - jmp L045exit -L04312rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%ecx - movl 20(%esi),%edx - movl %ecx,16(%edi) - movl %edx,20(%edi) - xorl %ecx,%ecx - jmp L04812shortcut -.align 2,0x90 -L04912loop: - movl (%edi),%eax - movl 20(%edi),%edx -L04812shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,24(%edi) - xorl 4(%edi),%eax - movl %eax,28(%edi) - xorl 8(%edi),%eax - movl %eax,32(%edi) - xorl 12(%edi),%eax - movl %eax,36(%edi) - cmpl $7,%ecx - je L05012break - incl %ecx - xorl 16(%edi),%eax - movl %eax,40(%edi) - xorl 20(%edi),%eax - movl %eax,44(%edi) - addl $24,%edi - jmp L04912loop -L05012break: - movl $12,72(%edi) - xorl %eax,%eax - jmp L045exit -L04414rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%eax - movl 20(%esi),%ebx - movl 24(%esi),%ecx - movl 28(%esi),%edx - movl %eax,16(%edi) - movl %ebx,20(%edi) - movl %ecx,24(%edi) - movl %edx,28(%edi) - xorl %ecx,%ecx - jmp L05114shortcut -.align 2,0x90 -L05214loop: - movl 28(%edi),%edx -L05114shortcut: - movl (%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,32(%edi) - xorl 4(%edi),%eax - movl %eax,36(%edi) - xorl 8(%edi),%eax - movl %eax,40(%edi) - xorl 12(%edi),%eax - movl %eax,44(%edi) - cmpl $6,%ecx - je L05314break - incl %ecx - movl %eax,%edx - movl 16(%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - movl %eax,48(%edi) - xorl 20(%edi),%eax - movl %eax,52(%edi) - xorl 24(%edi),%eax - movl %eax,56(%edi) - xorl 28(%edi),%eax - movl %eax,60(%edi) - addl $32,%edi - jmp L05214loop -L05314break: - movl $14,48(%edi) - xorl %eax,%eax - jmp L045exit -L040badpointer: - movl $-1,%eax -L045exit: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_set_encrypt_key -.type _AES_set_encrypt_key,@function -.align 4 -_AES_set_encrypt_key: -L_AES_set_encrypt_key_begin: - call __x86_AES_set_encrypt_key - ret -.globl _AES_set_decrypt_key -.type _AES_set_decrypt_key,@function -.align 4 -_AES_set_decrypt_key: -L_AES_set_decrypt_key_begin: - call __x86_AES_set_encrypt_key - cmpl $0,%eax - je L054proceed - ret -L054proceed: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%esi - movl 240(%esi),%ecx - leal (,%ecx,4),%ecx - leal (%esi,%ecx,4),%edi -.align 2,0x90 -L055invert: - movl (%esi),%eax - movl 4(%esi),%ebx - movl (%edi),%ecx - movl 4(%edi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,(%esi) - movl %edx,4(%esi) - movl 8(%esi),%eax - movl 12(%esi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,8(%edi) - movl %ebx,12(%edi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - addl $16,%esi - subl $16,%edi - cmpl %edi,%esi - jne L055invert - movl 28(%esp),%edi - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,28(%esp) - movl 16(%edi),%eax -.align 2,0x90 -L056permute: - addl $16,%edi - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %eax,%ebx - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - xorl %eax,%ecx - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - roll $8,%eax - xorl %esi,%edx - movl 4(%edi),%ebp - xorl %ebx,%eax - xorl %edx,%ebx - xorl %ecx,%eax - roll $24,%ebx - xorl %edx,%ecx - xorl %edx,%eax - roll $16,%ecx - xorl %ebx,%eax - roll $8,%edx - xorl %ecx,%eax - movl %ebp,%ebx - xorl %edx,%eax - movl %eax,(%edi) - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - xorl %ebx,%edx - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - roll $8,%ebx - xorl %esi,%eax - movl 8(%edi),%ebp - xorl %ecx,%ebx - xorl %eax,%ecx - xorl %edx,%ebx - roll $24,%ecx - xorl %eax,%edx - xorl %eax,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%eax - xorl %edx,%ebx - movl %ebp,%ecx - xorl %eax,%ebx - movl %ebx,4(%edi) - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %ecx,%edx - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - xorl %ecx,%eax - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - roll $8,%ecx - xorl %esi,%ebx - movl 12(%edi),%ebp - xorl %edx,%ecx - xorl %ebx,%edx - xorl %eax,%ecx - roll $24,%edx - xorl %ebx,%eax - xorl %ebx,%ecx - roll $16,%eax - xorl %edx,%ecx - roll $8,%ebx - xorl %eax,%ecx - movl %ebp,%edx - xorl %ebx,%ecx - movl %ecx,8(%edi) - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %edx,%eax - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - xorl %edx,%ebx - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - roll $8,%edx - xorl %esi,%ecx - movl 16(%edi),%ebp - xorl %eax,%edx - xorl %ecx,%eax - xorl %ebx,%edx - roll $24,%eax - xorl %ecx,%ebx - xorl %ecx,%edx - roll $16,%ebx - xorl %eax,%edx - roll $8,%ecx - xorl %ebx,%edx - movl %ebp,%eax - xorl %ecx,%edx - movl %edx,12(%edi) - cmpl 28(%esp),%edi - jb L056permute - xorl %eax,%eax - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.byte 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -.byte 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -.byte 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.comm _OPENSSL_ia32cap_P,16 diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h index feabbb00ba4bc3..cc24d30a9b9b75 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Fri Sep 13 15:57:16 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:48 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -36,12 +36,13 @@ static const char compiler_flags[] = { 'M',' ','-','D','S','H','A','2','5','6','_','A','S','M',' ','-', 'D','S','H','A','5','1','2','_','A','S','M',' ','-','D','R','C', '4','_','A','S','M',' ','-','D','M','D','5','_','A','S','M',' ', - '-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','V', - 'P','A','E','S','_','A','S','M',' ','-','D','W','H','I','R','L', - 'P','O','O','L','_','A','S','M',' ','-','D','G','H','A','S','H', - '_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z', - '2','5','6','_','A','S','M',' ','-','D','P','O','L','Y','1','3', - '0','5','_','A','S','M',' ','-','D','_','T','H','R','E','A','D', - '_','S','A','F','E',' ','-','D','_','R','E','E','N','T','R','A', - 'N','T',' ','-','D','N','D','E','B','U','G','\0' + '-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','A', + 'E','S','N','I','_','A','S','M',' ','-','D','V','P','A','E','S', + '_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L', + '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M', + ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_', + 'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A', + 'S','M',' ','-','D','_','T','H','R','E','A','D','_','S','A','F', + 'E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-', + 'D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s index 569a636888684a..5299520882c6cd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s @@ -4405,19 +4405,15 @@ L009pic: orl 4(%edi),%eax orl 8(%edi),%eax orl 12(%edi),%eax + movl 576(%esp),%ebx + notl %ebx + orl %ebx,%eax + movl 580(%esp),%ebx + notl %ebx + orl %ebx,%eax + orl 584(%esp),%eax .byte 62 jnz L010add_proceed - movl 576(%esp),%eax - andl 580(%esp),%eax - movl 584(%esp),%ebx - jz L010add_proceed - testl %ebx,%ebx - jz L011add_double - movl 616(%esp),%edi - xorl %eax,%eax - movl $24,%ecx -.byte 252,243,171 - jmp L012add_done .align 4,0x90 L011add_double: movl 620(%esp),%esi diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h index dbeaee16f18f92..febd51aca07f47 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h @@ -93,9 +93,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi index 96efa1c4bb1118..55742c5a7dfc39 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi @@ -15,6 +15,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi index 5e6af396479e3a..380077db34bbeb 100644 --- a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi @@ -713,6 +713,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm index 15ac34550bee59..08151c2b5bbcad 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -235,6 +235,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -351,8 +352,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -620,14 +621,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -703,6 +696,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1492,6 +1493,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3224,7 +3231,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3232,6 +3238,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3730,14 +3737,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4178,6 +4177,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4860,49 +4867,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4912,7 +4911,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4930,13 +4928,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4950,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5570,7 +5464,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5580,188 +5473,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5791,25 +5653,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5819,31 +5677,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5853,31 +5706,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5895,284 +5743,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6182,295 +5983,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6230,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6237,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6244,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6251,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,7 +6258,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6518,163 +6265,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6692,241 +6412,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_devcrypto.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6934,21 +6614,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6956,13 +6633,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6970,81 +6645,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7052,334 +6714,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7389,79 +6989,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7480,7 +7067,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7490,361 +7076,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7866,265 +7392,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8134,31 +7616,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8168,13 +7645,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8200,19 +7675,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8238,13 +7710,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8270,727 +7740,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9041,6 +8390,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9285,7 +8642,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9611,7 +8967,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9657,7 +9012,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9723,7 +9077,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9748,7 +9101,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9846,7 +9198,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9896,18 +9247,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9918,6 +9266,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9981,10 +9333,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10013,6 +9361,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10277,6 +9629,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15237,7 +14590,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15245,6 +14597,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15472,6 +14825,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15574,10 +14935,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15606,6 +14963,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s deleted file mode 100644 index 1ac5376af25fe1..00000000000000 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s +++ /dev/null @@ -1,3218 +0,0 @@ -.text -.type __x86_AES_encrypt_compact,@function -.align 4 -__x86_AES_encrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L000loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ecx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ecx,%edi - xorl %esi,%ecx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ecx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%ecx - andl %edx,%ebp - leal (%edx,%edx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %edx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %edx,%edi - xorl %esi,%edx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%edx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%edx - andl %eax,%ebp - leal (%eax,%eax,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %eax,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %eax,%edi - xorl %esi,%eax - rorl $24,%edi - xorl %ebp,%esi - roll $24,%eax - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%eax - andl %ebx,%ebp - leal (%ebx,%ebx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ebx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ebx,%edi - xorl %esi,%ebx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ebx - xorl %edi,%esi - xorl %esi,%ebx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L000loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.type __sse_AES_encrypt_compact,@function -.align 4 -__sse_AES_encrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L001loop: - pshufw $8,%mm0,%mm1 - pshufw $13,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $13,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $8,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $8,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - movd %mm2,%eax - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - movd %mm6,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $8,%esi - shrl $16,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shrl $16,%eax - movd %ecx,%mm1 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - andl $255,%eax - orl %esi,%ecx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - andl $255,%ebx - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%ecx - shll $16,%eax - movzbl -128(%ebp,%edi,1),%esi - orl %eax,%edx - shll $8,%esi - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - orl %ebx,%edx - movl 20(%esp),%edi - movd %ecx,%mm4 - movd %edx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L002out - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - movq %mm0,%mm1 - movq %mm4,%mm5 - pcmpgtb %mm0,%mm3 - pcmpgtb %mm4,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - pshufw $177,%mm0,%mm2 - pshufw $177,%mm4,%mm6 - paddb %mm0,%mm0 - paddb %mm4,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pshufw $177,%mm2,%mm3 - pshufw $177,%mm6,%mm7 - pxor %mm0,%mm1 - pxor %mm4,%mm5 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm3,%mm2 - movq %mm7,%mm6 - pslld $8,%mm3 - pslld $8,%mm7 - psrld $24,%mm2 - psrld $24,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - psrld $8,%mm1 - psrld $8,%mm5 - movl -128(%ebp),%eax - pslld $24,%mm3 - pslld $24,%mm7 - movl -64(%ebp),%ebx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl (%ebp),%ecx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl 64(%ebp),%edx - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L001loop -.align 4,0x90 -L002out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.type __x86_AES_encrypt,@function -.align 4 -__x86_AES_encrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L003loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl (%ebp,%esi,8),%esi - movzbl %ch,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movzbl %bh,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - movl (%ebp,%edx,8),%edx - movzbl %ah,%eax - xorl 3(%ebp,%eax,8),%edx - movl 4(%esp),%eax - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - xorl 1(%ebp,%ecx,8),%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L003loop - movl %eax,%esi - andl $255,%esi - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %bh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %ch,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %dh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movzbl %bh,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movl 2(%ebp,%edx,8),%edx - andl $255,%edx - movzbl %ah,%eax - movl (%ebp,%eax,8),%eax - andl $65280,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movl (%ebp,%ebx,8),%ebx - andl $16711680,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movl 2(%ebp,%ecx,8),%ecx - andl $4278190080,%ecx - xorl %ecx,%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Te: -.long 2774754246,2774754246 -.long 2222750968,2222750968 -.long 2574743534,2574743534 -.long 2373680118,2373680118 -.long 234025727,234025727 -.long 3177933782,3177933782 -.long 2976870366,2976870366 -.long 1422247313,1422247313 -.long 1345335392,1345335392 -.long 50397442,50397442 -.long 2842126286,2842126286 -.long 2099981142,2099981142 -.long 436141799,436141799 -.long 1658312629,1658312629 -.long 3870010189,3870010189 -.long 2591454956,2591454956 -.long 1170918031,1170918031 -.long 2642575903,2642575903 -.long 1086966153,1086966153 -.long 2273148410,2273148410 -.long 368769775,368769775 -.long 3948501426,3948501426 -.long 3376891790,3376891790 -.long 200339707,200339707 -.long 3970805057,3970805057 -.long 1742001331,1742001331 -.long 4255294047,4255294047 -.long 3937382213,3937382213 -.long 3214711843,3214711843 -.long 4154762323,4154762323 -.long 2524082916,2524082916 -.long 1539358875,1539358875 -.long 3266819957,3266819957 -.long 486407649,486407649 -.long 2928907069,2928907069 -.long 1780885068,1780885068 -.long 1513502316,1513502316 -.long 1094664062,1094664062 -.long 49805301,49805301 -.long 1338821763,1338821763 -.long 1546925160,1546925160 -.long 4104496465,4104496465 -.long 887481809,887481809 -.long 150073849,150073849 -.long 2473685474,2473685474 -.long 1943591083,1943591083 -.long 1395732834,1395732834 -.long 1058346282,1058346282 -.long 201589768,201589768 -.long 1388824469,1388824469 -.long 1696801606,1696801606 -.long 1589887901,1589887901 -.long 672667696,672667696 -.long 2711000631,2711000631 -.long 251987210,251987210 -.long 3046808111,3046808111 -.long 151455502,151455502 -.long 907153956,907153956 -.long 2608889883,2608889883 -.long 1038279391,1038279391 -.long 652995533,652995533 -.long 1764173646,1764173646 -.long 3451040383,3451040383 -.long 2675275242,2675275242 -.long 453576978,453576978 -.long 2659418909,2659418909 -.long 1949051992,1949051992 -.long 773462580,773462580 -.long 756751158,756751158 -.long 2993581788,2993581788 -.long 3998898868,3998898868 -.long 4221608027,4221608027 -.long 4132590244,4132590244 -.long 1295727478,1295727478 -.long 1641469623,1641469623 -.long 3467883389,3467883389 -.long 2066295122,2066295122 -.long 1055122397,1055122397 -.long 1898917726,1898917726 -.long 2542044179,2542044179 -.long 4115878822,4115878822 -.long 1758581177,1758581177 -.long 0,0 -.long 753790401,753790401 -.long 1612718144,1612718144 -.long 536673507,536673507 -.long 3367088505,3367088505 -.long 3982187446,3982187446 -.long 3194645204,3194645204 -.long 1187761037,1187761037 -.long 3653156455,3653156455 -.long 1262041458,1262041458 -.long 3729410708,3729410708 -.long 3561770136,3561770136 -.long 3898103984,3898103984 -.long 1255133061,1255133061 -.long 1808847035,1808847035 -.long 720367557,720367557 -.long 3853167183,3853167183 -.long 385612781,385612781 -.long 3309519750,3309519750 -.long 3612167578,3612167578 -.long 1429418854,1429418854 -.long 2491778321,2491778321 -.long 3477423498,3477423498 -.long 284817897,284817897 -.long 100794884,100794884 -.long 2172616702,2172616702 -.long 4031795360,4031795360 -.long 1144798328,1144798328 -.long 3131023141,3131023141 -.long 3819481163,3819481163 -.long 4082192802,4082192802 -.long 4272137053,4272137053 -.long 3225436288,3225436288 -.long 2324664069,2324664069 -.long 2912064063,2912064063 -.long 3164445985,3164445985 -.long 1211644016,1211644016 -.long 83228145,83228145 -.long 3753688163,3753688163 -.long 3249976951,3249976951 -.long 1977277103,1977277103 -.long 1663115586,1663115586 -.long 806359072,806359072 -.long 452984805,452984805 -.long 250868733,250868733 -.long 1842533055,1842533055 -.long 1288555905,1288555905 -.long 336333848,336333848 -.long 890442534,890442534 -.long 804056259,804056259 -.long 3781124030,3781124030 -.long 2727843637,2727843637 -.long 3427026056,3427026056 -.long 957814574,957814574 -.long 1472513171,1472513171 -.long 4071073621,4071073621 -.long 2189328124,2189328124 -.long 1195195770,1195195770 -.long 2892260552,2892260552 -.long 3881655738,3881655738 -.long 723065138,723065138 -.long 2507371494,2507371494 -.long 2690670784,2690670784 -.long 2558624025,2558624025 -.long 3511635870,3511635870 -.long 2145180835,2145180835 -.long 1713513028,1713513028 -.long 2116692564,2116692564 -.long 2878378043,2878378043 -.long 2206763019,2206763019 -.long 3393603212,3393603212 -.long 703524551,703524551 -.long 3552098411,3552098411 -.long 1007948840,1007948840 -.long 2044649127,2044649127 -.long 3797835452,3797835452 -.long 487262998,487262998 -.long 1994120109,1994120109 -.long 1004593371,1004593371 -.long 1446130276,1446130276 -.long 1312438900,1312438900 -.long 503974420,503974420 -.long 3679013266,3679013266 -.long 168166924,168166924 -.long 1814307912,1814307912 -.long 3831258296,3831258296 -.long 1573044895,1573044895 -.long 1859376061,1859376061 -.long 4021070915,4021070915 -.long 2791465668,2791465668 -.long 2828112185,2828112185 -.long 2761266481,2761266481 -.long 937747667,937747667 -.long 2339994098,2339994098 -.long 854058965,854058965 -.long 1137232011,1137232011 -.long 1496790894,1496790894 -.long 3077402074,3077402074 -.long 2358086913,2358086913 -.long 1691735473,1691735473 -.long 3528347292,3528347292 -.long 3769215305,3769215305 -.long 3027004632,3027004632 -.long 4199962284,4199962284 -.long 133494003,133494003 -.long 636152527,636152527 -.long 2942657994,2942657994 -.long 2390391540,2390391540 -.long 3920539207,3920539207 -.long 403179536,403179536 -.long 3585784431,3585784431 -.long 2289596656,2289596656 -.long 1864705354,1864705354 -.long 1915629148,1915629148 -.long 605822008,605822008 -.long 4054230615,4054230615 -.long 3350508659,3350508659 -.long 1371981463,1371981463 -.long 602466507,602466507 -.long 2094914977,2094914977 -.long 2624877800,2624877800 -.long 555687742,555687742 -.long 3712699286,3712699286 -.long 3703422305,3703422305 -.long 2257292045,2257292045 -.long 2240449039,2240449039 -.long 2423288032,2423288032 -.long 1111375484,1111375484 -.long 3300242801,3300242801 -.long 2858837708,2858837708 -.long 3628615824,3628615824 -.long 84083462,84083462 -.long 32962295,32962295 -.long 302911004,302911004 -.long 2741068226,2741068226 -.long 1597322602,1597322602 -.long 4183250862,4183250862 -.long 3501832553,3501832553 -.long 2441512471,2441512471 -.long 1489093017,1489093017 -.long 656219450,656219450 -.long 3114180135,3114180135 -.long 954327513,954327513 -.long 335083755,335083755 -.long 3013122091,3013122091 -.long 856756514,856756514 -.long 3144247762,3144247762 -.long 1893325225,1893325225 -.long 2307821063,2307821063 -.long 2811532339,2811532339 -.long 3063651117,3063651117 -.long 572399164,572399164 -.long 2458355477,2458355477 -.long 552200649,552200649 -.long 1238290055,1238290055 -.long 4283782570,4283782570 -.long 2015897680,2015897680 -.long 2061492133,2061492133 -.long 2408352771,2408352771 -.long 4171342169,4171342169 -.long 2156497161,2156497161 -.long 386731290,386731290 -.long 3669999461,3669999461 -.long 837215959,837215959 -.long 3326231172,3326231172 -.long 3093850320,3093850320 -.long 3275833730,3275833730 -.long 2962856233,2962856233 -.long 1999449434,1999449434 -.long 286199582,286199582 -.long 3417354363,3417354363 -.long 4233385128,4233385128 -.long 3602627437,3602627437 -.long 974525996,974525996 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.long 1,2,4,8 -.long 16,32,64,128 -.long 27,54,0,0 -.long 0,0,0,0 -.globl _AES_encrypt -.type _AES_encrypt,@function -.align 4 -_AES_encrypt: -L_AES_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L004pic_point -L004pic_point: - popl %ebp - leal __GLOBAL_OFFSET_TABLE_+[.-L004pic_point](%ebp),%eax - movl _OPENSSL_ia32cap_P@GOT(%eax),%eax - leal LAES_Te-L004pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L005x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L005x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.type __x86_AES_decrypt_compact,@function -.align 4 -__x86_AES_decrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L006loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%eax - subl %edi,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %ecx,%eax - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ecx,%ebx - roll $8,%ecx - xorl %esi,%ebp - xorl %eax,%ecx - xorl %ebp,%eax - xorl %ebx,%ecx - xorl %ebp,%ebx - roll $24,%eax - xorl %ebp,%ecx - roll $16,%ebx - xorl %eax,%ecx - roll $8,%ebp - xorl %ebx,%ecx - movl 4(%esp),%eax - xorl %ebp,%ecx - movl %ecx,12(%esp) - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %edx,%ebx - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %edx,%ecx - roll $8,%edx - xorl %esi,%ebp - xorl %ebx,%edx - xorl %ebp,%ebx - xorl %ecx,%edx - xorl %ebp,%ecx - roll $24,%ebx - xorl %ebp,%edx - roll $16,%ecx - xorl %ebx,%edx - roll $8,%ebp - xorl %ecx,%edx - movl 8(%esp),%ebx - xorl %ebp,%edx - movl %edx,16(%esp) - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %eax,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %eax,%edx - roll $8,%eax - xorl %esi,%ebp - xorl %ecx,%eax - xorl %ebp,%ecx - xorl %edx,%eax - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%eax - roll $16,%edx - xorl %ecx,%eax - roll $8,%ebp - xorl %edx,%eax - xorl %ebp,%eax - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ebx,%edx - roll $8,%ebx - xorl %esi,%ebp - xorl %ecx,%ebx - xorl %ebp,%ecx - xorl %edx,%ebx - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%ebp - xorl %edx,%ebx - movl 12(%esp),%ecx - xorl %ebp,%ebx - movl 16(%esp),%edx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L006loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.type __sse_AES_decrypt_compact,@function -.align 4 -__sse_AES_decrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L007loop: - pshufw $12,%mm0,%mm1 - pshufw $9,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $6,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $3,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movd %mm2,%eax - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $16,%esi - movd %mm6,%ebx - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %al,%edi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $16,%esi - shrl $16,%eax - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shrl $16,%ebx - shll $8,%esi - movd %edx,%mm1 - movzbl -128(%ebp,%edi,1),%edx - movzbl %bh,%edi - shll $24,%edx - andl $255,%ebx - orl %esi,%edx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movzbl %ah,%eax - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - orl %ebx,%edx - shll $16,%esi - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%edx - shll $24,%eax - orl %eax,%ecx - movl 20(%esp),%edi - movd %edx,%mm4 - movd %ecx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L008out - movq %mm0,%mm3 - movq %mm4,%mm7 - pshufw $228,%mm0,%mm2 - pshufw $228,%mm4,%mm6 - movq %mm0,%mm1 - movq %mm4,%mm5 - pshufw $177,%mm0,%mm0 - pshufw $177,%mm4,%mm4 - pslld $8,%mm2 - pslld $8,%mm6 - psrld $8,%mm3 - psrld $8,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pslld $16,%mm2 - pslld $16,%mm6 - psrld $16,%mm3 - psrld $16,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movq 8(%esp),%mm3 - pxor %mm2,%mm2 - pxor %mm6,%mm6 - pcmpgtb %mm1,%mm2 - pcmpgtb %mm5,%mm6 - pand %mm3,%mm2 - pand %mm3,%mm6 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm2,%mm1 - pxor %mm6,%mm5 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq %mm1,%mm2 - movq %mm5,%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pslld $24,%mm3 - pslld $24,%mm7 - psrld $8,%mm2 - psrld $8,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pshufw $177,%mm1,%mm3 - pshufw $177,%mm5,%mm7 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - pshufw $177,%mm1,%mm2 - pshufw $177,%mm5,%mm6 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pslld $8,%mm1 - pslld $8,%mm5 - psrld $8,%mm3 - psrld $8,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl -128(%ebp),%eax - pslld $16,%mm1 - pslld $16,%mm5 - movl -64(%ebp),%ebx - psrld $16,%mm3 - psrld $16,%mm7 - movl (%ebp),%ecx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl 64(%ebp),%edx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L007loop -.align 4,0x90 -L008out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.type __x86_AES_decrypt,@function -.align 4 -__x86_AES_decrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L009loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ebx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %ah,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - andl $255,%edx - movl (%ebp,%edx,8),%edx - movzbl %ch,%ecx - xorl 3(%ebp,%ecx,8),%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - shrl $24,%eax - xorl 1(%ebp,%eax,8),%edx - movl 4(%esp),%eax - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L009loop - leal 2176(%ebp),%ebp - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi - leal -128(%ebp),%ebp - movl %eax,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl (%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl (%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl (%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl (%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - leal -2048(%ebp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Td: -.long 1353184337,1353184337 -.long 1399144830,1399144830 -.long 3282310938,3282310938 -.long 2522752826,2522752826 -.long 3412831035,3412831035 -.long 4047871263,4047871263 -.long 2874735276,2874735276 -.long 2466505547,2466505547 -.long 1442459680,1442459680 -.long 4134368941,4134368941 -.long 2440481928,2440481928 -.long 625738485,625738485 -.long 4242007375,4242007375 -.long 3620416197,3620416197 -.long 2151953702,2151953702 -.long 2409849525,2409849525 -.long 1230680542,1230680542 -.long 1729870373,1729870373 -.long 2551114309,2551114309 -.long 3787521629,3787521629 -.long 41234371,41234371 -.long 317738113,317738113 -.long 2744600205,2744600205 -.long 3338261355,3338261355 -.long 3881799427,3881799427 -.long 2510066197,2510066197 -.long 3950669247,3950669247 -.long 3663286933,3663286933 -.long 763608788,763608788 -.long 3542185048,3542185048 -.long 694804553,694804553 -.long 1154009486,1154009486 -.long 1787413109,1787413109 -.long 2021232372,2021232372 -.long 1799248025,1799248025 -.long 3715217703,3715217703 -.long 3058688446,3058688446 -.long 397248752,397248752 -.long 1722556617,1722556617 -.long 3023752829,3023752829 -.long 407560035,407560035 -.long 2184256229,2184256229 -.long 1613975959,1613975959 -.long 1165972322,1165972322 -.long 3765920945,3765920945 -.long 2226023355,2226023355 -.long 480281086,480281086 -.long 2485848313,2485848313 -.long 1483229296,1483229296 -.long 436028815,436028815 -.long 2272059028,2272059028 -.long 3086515026,3086515026 -.long 601060267,601060267 -.long 3791801202,3791801202 -.long 1468997603,1468997603 -.long 715871590,715871590 -.long 120122290,120122290 -.long 63092015,63092015 -.long 2591802758,2591802758 -.long 2768779219,2768779219 -.long 4068943920,4068943920 -.long 2997206819,2997206819 -.long 3127509762,3127509762 -.long 1552029421,1552029421 -.long 723308426,723308426 -.long 2461301159,2461301159 -.long 4042393587,4042393587 -.long 2715969870,2715969870 -.long 3455375973,3455375973 -.long 3586000134,3586000134 -.long 526529745,526529745 -.long 2331944644,2331944644 -.long 2639474228,2639474228 -.long 2689987490,2689987490 -.long 853641733,853641733 -.long 1978398372,1978398372 -.long 971801355,971801355 -.long 2867814464,2867814464 -.long 111112542,111112542 -.long 1360031421,1360031421 -.long 4186579262,4186579262 -.long 1023860118,1023860118 -.long 2919579357,2919579357 -.long 1186850381,1186850381 -.long 3045938321,3045938321 -.long 90031217,90031217 -.long 1876166148,1876166148 -.long 4279586912,4279586912 -.long 620468249,620468249 -.long 2548678102,2548678102 -.long 3426959497,3426959497 -.long 2006899047,2006899047 -.long 3175278768,3175278768 -.long 2290845959,2290845959 -.long 945494503,945494503 -.long 3689859193,3689859193 -.long 1191869601,1191869601 -.long 3910091388,3910091388 -.long 3374220536,3374220536 -.long 0,0 -.long 2206629897,2206629897 -.long 1223502642,1223502642 -.long 2893025566,2893025566 -.long 1316117100,1316117100 -.long 4227796733,4227796733 -.long 1446544655,1446544655 -.long 517320253,517320253 -.long 658058550,658058550 -.long 1691946762,1691946762 -.long 564550760,564550760 -.long 3511966619,3511966619 -.long 976107044,976107044 -.long 2976320012,2976320012 -.long 266819475,266819475 -.long 3533106868,3533106868 -.long 2660342555,2660342555 -.long 1338359936,1338359936 -.long 2720062561,2720062561 -.long 1766553434,1766553434 -.long 370807324,370807324 -.long 179999714,179999714 -.long 3844776128,3844776128 -.long 1138762300,1138762300 -.long 488053522,488053522 -.long 185403662,185403662 -.long 2915535858,2915535858 -.long 3114841645,3114841645 -.long 3366526484,3366526484 -.long 2233069911,2233069911 -.long 1275557295,1275557295 -.long 3151862254,3151862254 -.long 4250959779,4250959779 -.long 2670068215,2670068215 -.long 3170202204,3170202204 -.long 3309004356,3309004356 -.long 880737115,880737115 -.long 1982415755,1982415755 -.long 3703972811,3703972811 -.long 1761406390,1761406390 -.long 1676797112,1676797112 -.long 3403428311,3403428311 -.long 277177154,277177154 -.long 1076008723,1076008723 -.long 538035844,538035844 -.long 2099530373,2099530373 -.long 4164795346,4164795346 -.long 288553390,288553390 -.long 1839278535,1839278535 -.long 1261411869,1261411869 -.long 4080055004,4080055004 -.long 3964831245,3964831245 -.long 3504587127,3504587127 -.long 1813426987,1813426987 -.long 2579067049,2579067049 -.long 4199060497,4199060497 -.long 577038663,577038663 -.long 3297574056,3297574056 -.long 440397984,440397984 -.long 3626794326,3626794326 -.long 4019204898,4019204898 -.long 3343796615,3343796615 -.long 3251714265,3251714265 -.long 4272081548,4272081548 -.long 906744984,906744984 -.long 3481400742,3481400742 -.long 685669029,685669029 -.long 646887386,646887386 -.long 2764025151,2764025151 -.long 3835509292,3835509292 -.long 227702864,227702864 -.long 2613862250,2613862250 -.long 1648787028,1648787028 -.long 3256061430,3256061430 -.long 3904428176,3904428176 -.long 1593260334,1593260334 -.long 4121936770,4121936770 -.long 3196083615,3196083615 -.long 2090061929,2090061929 -.long 2838353263,2838353263 -.long 3004310991,3004310991 -.long 999926984,999926984 -.long 2809993232,2809993232 -.long 1852021992,1852021992 -.long 2075868123,2075868123 -.long 158869197,158869197 -.long 4095236462,4095236462 -.long 28809964,28809964 -.long 2828685187,2828685187 -.long 1701746150,1701746150 -.long 2129067946,2129067946 -.long 147831841,147831841 -.long 3873969647,3873969647 -.long 3650873274,3650873274 -.long 3459673930,3459673930 -.long 3557400554,3557400554 -.long 3598495785,3598495785 -.long 2947720241,2947720241 -.long 824393514,824393514 -.long 815048134,815048134 -.long 3227951669,3227951669 -.long 935087732,935087732 -.long 2798289660,2798289660 -.long 2966458592,2966458592 -.long 366520115,366520115 -.long 1251476721,1251476721 -.long 4158319681,4158319681 -.long 240176511,240176511 -.long 804688151,804688151 -.long 2379631990,2379631990 -.long 1303441219,1303441219 -.long 1414376140,1414376140 -.long 3741619940,3741619940 -.long 3820343710,3820343710 -.long 461924940,461924940 -.long 3089050817,3089050817 -.long 2136040774,2136040774 -.long 82468509,82468509 -.long 1563790337,1563790337 -.long 1937016826,1937016826 -.long 776014843,776014843 -.long 1511876531,1511876531 -.long 1389550482,1389550482 -.long 861278441,861278441 -.long 323475053,323475053 -.long 2355222426,2355222426 -.long 2047648055,2047648055 -.long 2383738969,2383738969 -.long 2302415851,2302415851 -.long 3995576782,3995576782 -.long 902390199,902390199 -.long 3991215329,3991215329 -.long 1018251130,1018251130 -.long 1507840668,1507840668 -.long 1064563285,1064563285 -.long 2043548696,2043548696 -.long 3208103795,3208103795 -.long 3939366739,3939366739 -.long 1537932639,1537932639 -.long 342834655,342834655 -.long 2262516856,2262516856 -.long 2180231114,2180231114 -.long 1053059257,1053059257 -.long 741614648,741614648 -.long 1598071746,1598071746 -.long 1925389590,1925389590 -.long 203809468,203809468 -.long 2336832552,2336832552 -.long 1100287487,1100287487 -.long 1895934009,1895934009 -.long 3736275976,3736275976 -.long 2632234200,2632234200 -.long 2428589668,2428589668 -.long 1636092795,1636092795 -.long 1890988757,1890988757 -.long 1952214088,1952214088 -.long 1113045200,1113045200 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.globl _AES_decrypt -.type _AES_decrypt,@function -.align 4 -_AES_decrypt: -L_AES_decrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L010pic_point -L010pic_point: - popl %ebp - leal __GLOBAL_OFFSET_TABLE_+[.-L010pic_point](%ebp),%eax - movl _OPENSSL_ia32cap_P@GOT(%eax),%eax - leal LAES_Td-L010pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L011x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L011x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_cbc_encrypt -.type _AES_cbc_encrypt,@function -.align 4 -_AES_cbc_encrypt: -L_AES_cbc_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%ecx - cmpl $0,%ecx - je L012drop_out - call L013pic_point -L013pic_point: - popl %ebp - leal __GLOBAL_OFFSET_TABLE_+[.-L013pic_point](%ebp),%eax - movl _OPENSSL_ia32cap_P@GOT(%eax),%eax - cmpl $0,40(%esp) - leal LAES_Te-L013pic_point(%ebp),%ebp - jne L014picked_te - leal LAES_Td-LAES_Te(%ebp),%ebp -L014picked_te: - pushfl - cld - cmpl $512,%ecx - jb L015slow_way - testl $15,%ecx - jnz L015slow_way - btl $28,(%eax) - jc L015slow_way - leal -324(%esp),%esi - andl $-64,%esi - movl %ebp,%eax - leal 2304(%ebp),%ebx - movl %esi,%edx - andl $4095,%eax - andl $4095,%ebx - andl $4095,%edx - cmpl %ebx,%edx - jb L016tbl_break_out - subl %ebx,%edx - subl %edx,%esi - jmp L017tbl_ok -.align 2,0x90 -L016tbl_break_out: - subl %eax,%edx - andl $4095,%edx - addl $384,%edx - subl %edx,%esi -.align 2,0x90 -L017tbl_ok: - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 12(%edx),%edi - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl $0,316(%esp) - movl %edi,%ebx - movl $61,%ecx - subl %ebp,%ebx - movl %edi,%esi - andl $4095,%ebx - leal 76(%esp),%edi - cmpl $2304,%ebx - jb L018do_copy - cmpl $3852,%ebx - jb L019skip_copy -.align 2,0x90 -L018do_copy: - movl %edi,44(%esp) -.long 2784229001 -L019skip_copy: - movl $16,%edi -.align 2,0x90 -L020prefetch_tbl: - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%esi - leal 128(%ebp),%ebp - subl $1,%edi - jnz L020prefetch_tbl - subl $2048,%ebp - movl 32(%esp),%esi - movl 48(%esp),%edi - cmpl $0,%edx - je L021fast_decrypt - movl (%edi),%eax - movl 4(%edi),%ebx -.align 4,0x90 -L022fast_enc_loop: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - leal 16(%esi),%esi - movl 40(%esp),%ecx - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L022fast_enc_loop - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L023skip_ezero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L023skip_ezero: - movl 28(%esp),%esp - popfl -L012drop_out: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L021fast_decrypt: - cmpl 36(%esp),%esi - je L024fast_dec_in_place - movl %edi,52(%esp) -.align 2,0x90 -.align 4,0x90 -L025fast_dec_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 52(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 36(%esp),%edi - movl 32(%esp),%esi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl %esi,52(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edi - movl %edi,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L025fast_dec_loop - movl 52(%esp),%edi - movl 48(%esp),%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - jmp L026fast_dec_out -.align 4,0x90 -L024fast_dec_in_place: -L027fast_dec_in_place_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 48(%esp),%edi - movl 36(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L027fast_dec_in_place_loop -.align 2,0x90 -L026fast_dec_out: - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L028skip_dzero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L028skip_dzero: - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L015slow_way: - movl (%eax),%eax - movl 36(%esp),%edi - leal -80(%esp),%esi - andl $-64,%esi - leal -143(%edi),%ebx - subl %esi,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esi - leal 768(%esi),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl %eax,52(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl %esi,%edi - movl %eax,%esi - cmpl $0,%edx - je L029slow_decrypt - cmpl $16,%ecx - movl %ebx,%edx - jb L030slow_enc_tail - btl $25,52(%esp) - jnc L031slow_enc_x86 - movq (%edi),%mm0 - movq 8(%edi),%mm4 -.align 4,0x90 -L032slow_enc_loop_sse: - pxor (%esi),%mm0 - pxor 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl 40(%esp),%ecx - movq %mm0,(%edi) - movq %mm4,8(%edi) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L032slow_enc_loop_sse - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L031slow_enc_x86: - movl (%edi),%eax - movl 4(%edi),%ebx -.align 2,0x90 -L033slow_enc_loop_x86: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L033slow_enc_loop_x86 - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L030slow_enc_tail: - emms - movl %edx,%edi - movl $16,%ebx - subl %ecx,%ebx - cmpl %esi,%edi - je L034enc_in_place -.align 2,0x90 -.long 2767451785 - jmp L035enc_skip_in_place -L034enc_in_place: - leal (%edi,%ecx,1),%edi -L035enc_skip_in_place: - movl %ebx,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2868115081 - movl 48(%esp),%edi - movl %edx,%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl $16,40(%esp) - jmp L033slow_enc_loop_x86 -.align 4,0x90 -L029slow_decrypt: - btl $25,52(%esp) - jnc L036slow_dec_loop_x86 -.align 2,0x90 -L037slow_dec_loop_sse: - movq (%esi),%mm0 - movq 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_decrypt_compact - movl 32(%esp),%esi - leal 60(%esp),%eax - movl 36(%esp),%ebx - movl 40(%esp),%ecx - movl 48(%esp),%edi - movq (%esi),%mm1 - movq 8(%esi),%mm5 - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movq %mm1,(%edi) - movq %mm5,8(%edi) - subl $16,%ecx - jc L038slow_dec_partial_sse - movq %mm0,(%ebx) - movq %mm4,8(%ebx) - leal 16(%ebx),%ebx - movl %ebx,36(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - movl %ecx,40(%esp) - jnz L037slow_dec_loop_sse - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L038slow_dec_partial_sse: - movq %mm0,(%eax) - movq %mm4,8(%eax) - emms - addl $16,%ecx - movl %ebx,%edi - movl %eax,%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L036slow_dec_loop_x86: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt_compact - movl 48(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - subl $16,%esi - jc L039slow_dec_partial_x86 - movl %esi,40(%esp) - movl 36(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - leal 16(%esi),%esi - movl %esi,32(%esp) - jnz L036slow_dec_loop_x86 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L039slow_dec_partial_x86: - leal 60(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 32(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl 36(%esp),%edi - leal 60(%esp),%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.type __x86_AES_set_encrypt_key,@function -.align 4 -__x86_AES_set_encrypt_key: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 24(%esp),%esi - movl 32(%esp),%edi - testl $-1,%esi - jz L040badpointer - testl $-1,%edi - jz L040badpointer - call L041pic_point -L041pic_point: - popl %ebp - leal LAES_Te-L041pic_point(%ebp),%ebp - leal 2176(%ebp),%ebp - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx - movl 28(%esp),%ecx - cmpl $128,%ecx - je L04210rounds - cmpl $192,%ecx - je L04312rounds - cmpl $256,%ecx - je L04414rounds - movl $-2,%eax - jmp L045exit -L04210rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - xorl %ecx,%ecx - jmp L04610shortcut -.align 2,0x90 -L04710loop: - movl (%edi),%eax - movl 12(%edi),%edx -L04610shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,16(%edi) - xorl 4(%edi),%eax - movl %eax,20(%edi) - xorl 8(%edi),%eax - movl %eax,24(%edi) - xorl 12(%edi),%eax - movl %eax,28(%edi) - incl %ecx - addl $16,%edi - cmpl $10,%ecx - jl L04710loop - movl $10,80(%edi) - xorl %eax,%eax - jmp L045exit -L04312rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%ecx - movl 20(%esi),%edx - movl %ecx,16(%edi) - movl %edx,20(%edi) - xorl %ecx,%ecx - jmp L04812shortcut -.align 2,0x90 -L04912loop: - movl (%edi),%eax - movl 20(%edi),%edx -L04812shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,24(%edi) - xorl 4(%edi),%eax - movl %eax,28(%edi) - xorl 8(%edi),%eax - movl %eax,32(%edi) - xorl 12(%edi),%eax - movl %eax,36(%edi) - cmpl $7,%ecx - je L05012break - incl %ecx - xorl 16(%edi),%eax - movl %eax,40(%edi) - xorl 20(%edi),%eax - movl %eax,44(%edi) - addl $24,%edi - jmp L04912loop -L05012break: - movl $12,72(%edi) - xorl %eax,%eax - jmp L045exit -L04414rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%eax - movl 20(%esi),%ebx - movl 24(%esi),%ecx - movl 28(%esi),%edx - movl %eax,16(%edi) - movl %ebx,20(%edi) - movl %ecx,24(%edi) - movl %edx,28(%edi) - xorl %ecx,%ecx - jmp L05114shortcut -.align 2,0x90 -L05214loop: - movl 28(%edi),%edx -L05114shortcut: - movl (%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,32(%edi) - xorl 4(%edi),%eax - movl %eax,36(%edi) - xorl 8(%edi),%eax - movl %eax,40(%edi) - xorl 12(%edi),%eax - movl %eax,44(%edi) - cmpl $6,%ecx - je L05314break - incl %ecx - movl %eax,%edx - movl 16(%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - movl %eax,48(%edi) - xorl 20(%edi),%eax - movl %eax,52(%edi) - xorl 24(%edi),%eax - movl %eax,56(%edi) - xorl 28(%edi),%eax - movl %eax,60(%edi) - addl $32,%edi - jmp L05214loop -L05314break: - movl $14,48(%edi) - xorl %eax,%eax - jmp L045exit -L040badpointer: - movl $-1,%eax -L045exit: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_set_encrypt_key -.type _AES_set_encrypt_key,@function -.align 4 -_AES_set_encrypt_key: -L_AES_set_encrypt_key_begin: - call __x86_AES_set_encrypt_key - ret -.globl _AES_set_decrypt_key -.type _AES_set_decrypt_key,@function -.align 4 -_AES_set_decrypt_key: -L_AES_set_decrypt_key_begin: - call __x86_AES_set_encrypt_key - cmpl $0,%eax - je L054proceed - ret -L054proceed: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%esi - movl 240(%esi),%ecx - leal (,%ecx,4),%ecx - leal (%esi,%ecx,4),%edi -.align 2,0x90 -L055invert: - movl (%esi),%eax - movl 4(%esi),%ebx - movl (%edi),%ecx - movl 4(%edi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,(%esi) - movl %edx,4(%esi) - movl 8(%esi),%eax - movl 12(%esi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,8(%edi) - movl %ebx,12(%edi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - addl $16,%esi - subl $16,%edi - cmpl %edi,%esi - jne L055invert - movl 28(%esp),%edi - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,28(%esp) - movl 16(%edi),%eax -.align 2,0x90 -L056permute: - addl $16,%edi - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %eax,%ebx - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - xorl %eax,%ecx - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - roll $8,%eax - xorl %esi,%edx - movl 4(%edi),%ebp - xorl %ebx,%eax - xorl %edx,%ebx - xorl %ecx,%eax - roll $24,%ebx - xorl %edx,%ecx - xorl %edx,%eax - roll $16,%ecx - xorl %ebx,%eax - roll $8,%edx - xorl %ecx,%eax - movl %ebp,%ebx - xorl %edx,%eax - movl %eax,(%edi) - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - xorl %ebx,%edx - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - roll $8,%ebx - xorl %esi,%eax - movl 8(%edi),%ebp - xorl %ecx,%ebx - xorl %eax,%ecx - xorl %edx,%ebx - roll $24,%ecx - xorl %eax,%edx - xorl %eax,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%eax - xorl %edx,%ebx - movl %ebp,%ecx - xorl %eax,%ebx - movl %ebx,4(%edi) - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %ecx,%edx - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - xorl %ecx,%eax - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - roll $8,%ecx - xorl %esi,%ebx - movl 12(%edi),%ebp - xorl %edx,%ecx - xorl %ebx,%edx - xorl %eax,%ecx - roll $24,%edx - xorl %ebx,%eax - xorl %ebx,%ecx - roll $16,%eax - xorl %edx,%ecx - roll $8,%ebx - xorl %eax,%ecx - movl %ebp,%edx - xorl %ebx,%ecx - movl %ecx,8(%edi) - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %edx,%eax - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - xorl %edx,%ebx - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - roll $8,%edx - xorl %esi,%ecx - movl 16(%edi),%ebp - xorl %eax,%edx - xorl %ecx,%eax - xorl %ebx,%edx - roll $24,%eax - xorl %ecx,%ebx - xorl %ecx,%edx - roll $16,%ebx - xorl %eax,%edx - roll $8,%ecx - xorl %ebx,%edx - movl %ebp,%eax - xorl %ecx,%edx - movl %edx,12(%edi) - cmpl 28(%esp),%edi - jb L056permute - xorl %eax,%eax - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.byte 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -.byte 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -.byte 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.comm _OPENSSL_ia32cap_P,16 diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h index e3bc6a9e02edd8..96c786974c2af5 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Fri Sep 13 15:57:23 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:52 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -38,11 +38,12 @@ static const char compiler_flags[] = { ' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-','D', 'R','C','4','_','A','S','M',' ','-','D','M','D','5','_','A','S', 'M',' ','-','D','R','M','D','1','6','0','_','A','S','M',' ','-', - 'D','V','P','A','E','S','_','A','S','M',' ','-','D','W','H','I', - 'R','L','P','O','O','L','_','A','S','M',' ','-','D','G','H','A', - 'S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I','S', - 'T','Z','2','5','6','_','A','S','M',' ','-','D','P','O','L','Y', - '1','3','0','5','_','A','S','M',' ','-','D','_','T','H','R','E', - 'A','D','_','S','A','F','E',' ','-','D','_','R','E','E','N','T', - 'R','A','N','T',' ','-','D','N','D','E','B','U','G','\0' + 'D','A','E','S','N','I','_','A','S','M',' ','-','D','V','P','A', + 'E','S','_','A','S','M',' ','-','D','W','H','I','R','L','P','O', + 'O','L','_','A','S','M',' ','-','D','G','H','A','S','H','_','A', + 'S','M',' ','-','D','E','C','P','_','N','I','S','T','Z','2','5', + '6','_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5', + '_','A','S','M',' ','-','D','_','T','H','R','E','A','D','_','S', + 'A','F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T', + ' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s index 569a636888684a..5299520882c6cd 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s @@ -4405,19 +4405,15 @@ L009pic: orl 4(%edi),%eax orl 8(%edi),%eax orl 12(%edi),%eax + movl 576(%esp),%ebx + notl %ebx + orl %ebx,%eax + movl 580(%esp),%ebx + notl %ebx + orl %ebx,%eax + orl 584(%esp),%eax .byte 62 jnz L010add_proceed - movl 576(%esp),%eax - andl 580(%esp),%eax - movl 584(%esp),%ebx - jz L010add_proceed - testl %ebx,%ebx - jz L011add_double - movl 616(%esp),%edi - xorl %eax,%eax - movl $24,%ecx -.byte 252,243,171 - jmp L012add_done .align 4,0x90 L011add_double: movl 620(%esp),%esi diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h index dbeaee16f18f92..febd51aca07f47 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h @@ -93,9 +93,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi index 96efa1c4bb1118..55742c5a7dfc39 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi @@ -15,6 +15,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi index 0645934ea717a8..86277a3f35ea43 100644 --- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi @@ -713,6 +713,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm index c406c0cc9873b8..c8fd824b7fa837 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -232,6 +232,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -349,8 +350,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -618,14 +619,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -701,6 +694,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1490,6 +1491,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3209,7 +3216,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3217,6 +3223,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3715,14 +3722,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4163,6 +4162,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4845,49 +4852,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4909,7 +4908,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4923,613 +4921,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5547,188 +5443,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5758,13 +5623,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5774,43 +5637,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5820,31 +5676,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5862,278 +5713,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6143,301 +5948,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6445,7 +6200,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6453,7 +6207,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6461,7 +6214,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6469,7 +6221,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6477,7 +6228,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6485,163 +6235,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6659,229 +6382,191 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_devcrypto.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6889,21 +6574,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6911,13 +6593,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6925,81 +6605,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7007,328 +6674,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7338,85 +6944,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7439,361 +7031,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7815,259 +7347,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8077,31 +7566,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8111,7 +7595,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8137,13 +7620,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8169,7 +7650,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8195,709 +7675,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8948,6 +8310,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9192,7 +8562,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9518,7 +8887,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9564,7 +8932,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9630,7 +8997,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9655,7 +9021,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9753,7 +9118,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9803,18 +9167,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9825,6 +9186,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9888,10 +9253,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9920,6 +9281,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10184,6 +9549,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15079,7 +14445,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15087,6 +14452,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15314,6 +14680,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15416,10 +14790,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15448,6 +14818,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h index c1c537b3fb0604..4d7a6c77c175cd 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86" -#define DATE "built on: Fri Sep 13 15:57:29 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:56 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h index bc67d870590f21..435e0e58ef14a2 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm index 958b30cc6a1612..49248aba5ea4b1 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1501,6 +1502,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3256,7 +3263,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3264,6 +3270,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3762,14 +3769,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4210,6 +4209,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4904,49 +4911,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4956,25 +4955,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4992,13 +4987,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5012,613 +5005,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5632,7 +5523,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5642,182 +5532,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5827,19 +5687,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5865,31 +5722,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5899,37 +5751,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5939,31 +5785,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5981,278 +5822,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6262,301 +6057,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6564,7 +6309,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6572,7 +6316,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6580,7 +6323,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6588,7 +6330,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6596,7 +6337,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6604,163 +6344,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6778,247 +6491,206 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_devcrypto.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7026,21 +6698,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7048,13 +6717,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7062,81 +6729,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7144,328 +6798,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7475,91 +7068,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7578,7 +7156,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7588,361 +7165,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7964,265 +7481,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8232,31 +7705,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8266,7 +7734,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8280,7 +7747,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8298,19 +7764,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8324,7 +7787,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8342,13 +7804,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8374,727 +7834,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9145,6 +8484,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9389,7 +8736,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9715,7 +9061,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9761,7 +9106,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9827,7 +9171,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9852,7 +9195,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9950,7 +9292,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -10000,18 +9341,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10022,6 +9360,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10085,10 +9427,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10117,6 +9455,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10381,6 +9723,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15391,7 +14734,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15399,6 +14741,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15626,6 +14969,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15728,10 +15079,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15760,6 +15107,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s deleted file mode 100644 index f0c1685fb93450..00000000000000 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2649 +0,0 @@ -.text -.type _x86_64_AES_encrypt,@function -.align 16 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Lenc_loop -.align 16 -.Lenc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz .Lenc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_encrypt,.-_x86_64_AES_encrypt -.type _x86_64_AES_encrypt_compact,@function -.align 16 -_x86_64_AES_encrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Lenc_loop_compact -.align 16 -.Lenc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Lenc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp .Lenc_loop_compact -.align 16 -.Lenc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -.globl asm_AES_encrypt -.hidden asm_AES_encrypt -asm_AES_encrypt: -AES_encrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Lenc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Lenc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_encrypt,.-AES_encrypt -.type _x86_64_AES_decrypt,@function -.align 16 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Ldec_loop -.align 16 -.Ldec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz .Ldec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_decrypt,.-_x86_64_AES_decrypt -.type _x86_64_AES_decrypt_compact,@function -.align 16 -_x86_64_AES_decrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Ldec_loop_compact - -.align 16 -.Ldec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Ldec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp .Ldec_loop_compact -.align 16 -.Ldec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -.globl asm_AES_decrypt -.hidden asm_AES_decrypt -asm_AES_decrypt: -AES_decrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Ldec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Ldec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_decrypt,.-AES_decrypt -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - subq $8,%rsp -.cfi_adjust_cfa_offset 8 -.Lenc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Lenc_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_encrypt_key,.-AES_set_encrypt_key - -.type _x86_64_AES_set_encrypt_key,@function -.align 16 -_x86_64_AES_set_encrypt_key: -.cfi_startproc - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz .Lbadpointer - testq $-1,%rdi - jz .Lbadpointer - - leaq .LAES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je .L10rounds - cmpl $192,%ecx - je .L12rounds - cmpl $256,%ecx - je .L14rounds - movq $-2,%rax - jmp .Lexit - -.L10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L10shortcut -.align 4 -.L10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -.L10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl .L10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L12shortcut -.align 4 -.L12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -.L12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je .L12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp .L12loop -.L12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L14shortcut -.align 4 -.L14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -.L14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je .L14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp .L14loop -.L14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp .Lexit - -.Lbadpointer: - movq $-1,%rax -.Lexit: -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - pushq %rdx -.cfi_adjust_cfa_offset 8 -.Ldec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne .Labort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.align 4 -.Linvert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne .Linvert - - leaq .LAES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.align 4 -.Lpermute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz .Lpermute - - xorq %rax,%rax -.Labort: - movq 8(%rsp),%r15 -.cfi_restore %r15 - movq 16(%rsp),%r14 -.cfi_restore %r14 - movq 24(%rsp),%r13 -.cfi_restore %r13 - movq 32(%rsp),%r12 -.cfi_restore %r12 - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Ldec_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_decrypt_key,.-AES_set_decrypt_key -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 - -.globl asm_AES_cbc_encrypt -.hidden asm_AES_cbc_encrypt -asm_AES_cbc_encrypt: -AES_cbc_encrypt: -.cfi_startproc - cmpq $0,%rdx - je .Lcbc_epilogue - pushfq - - -.cfi_adjust_cfa_offset 8 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-32 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-40 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-48 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-56 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-64 -.Lcbc_prologue: - - cld - movl %r9d,%r9d - - leaq .LAES_Te(%rip),%r14 - leaq .LAES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - -.cfi_remember_state - movl OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb .Lcbc_slow_prologue - testq $15,%rdx - jnz .Lcbc_slow_prologue - btl $28,%r10d - jc .Lcbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb .Lcbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp .Lcbc_te_ok -.Lcbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.align 4 -.Lcbc_te_ok: - - xchgq %rsp,%r15 -.cfi_def_cfa_register %r15 - - movq %r15,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb .Lcbc_do_ecopy - cmpq $4096-248,%r10 - jb .Lcbc_skip_ecopy -.align 4 -.Lcbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -.Lcbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.align 4 -.Lcbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz .Lcbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je .LFAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.align 4 -.Lcbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz .Lcbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_fast_cleanup - - -.align 16 -.LFAST_DECRYPT: - cmpq %r8,%r9 - je .Lcbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.align 4 -.Lcbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz .Lcbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp .Lcbc_fast_cleanup - -.align 16 -.Lcbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.align 4 -.Lcbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz .Lcbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp .Lcbc_fast_dec_in_place_loop -.Lcbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.align 4 -.Lcbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je .Lcbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp .Lcbc_exit - - -.align 16 -.Lcbc_slow_prologue: -.cfi_restore_state - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp -.cfi_def_cfa_register %rbp - - movq %rbp,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je .LSLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz .Lcbc_slow_enc_tail - -.align 4 -.Lcbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz .Lcbc_slow_enc_loop - testq $15,%r10 - jnz .Lcbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp .Lcbc_slow_enc_loop - -.align 16 -.LSLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.align 4 -.Lcbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc .Lcbc_slow_dec_partial - jz .Lcbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp .Lcbc_slow_dec_loop -.Lcbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp .Lcbc_exit - -.align 16 -.Lcbc_exit: - movq 16(%rsp),%rsi -.cfi_def_cfa %rsi,64 - movq (%rsi),%r15 -.cfi_restore %r15 - movq 8(%rsi),%r14 -.cfi_restore %r14 - movq 16(%rsi),%r13 -.cfi_restore %r13 - movq 24(%rsi),%r12 -.cfi_restore %r12 - movq 32(%rsi),%rbp -.cfi_restore %rbp - movq 40(%rsi),%rbx -.cfi_restore %rbx - leaq 48(%rsi),%rsp -.cfi_def_cfa %rsp,16 -.Lcbc_popfq: - popfq - - -.cfi_adjust_cfa_offset -8 -.Lcbc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_cbc_encrypt,.-AES_cbc_encrypt -.align 64 -.LAES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.align 64 -.LAES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 64 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s index 4d2dfe44898fd5..978bd2b6239c15 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha1_enc,@function .align 32 aesni_cbc_sha1_enc: +.cfi_startproc movl OPENSSL_ia32cap_P+0(%rip),%r10d movq OPENSSL_ia32cap_P+4(%rip),%r11 @@ -17,6 +18,7 @@ aesni_cbc_sha1_enc: je aesni_cbc_sha1_enc_avx jmp aesni_cbc_sha1_enc_ssse3 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc .type aesni_cbc_sha1_enc_ssse3,@function .align 32 @@ -2730,6 +2732,7 @@ K_XX_XX: .type aesni_cbc_sha1_enc_shaext,@function .align 32 aesni_cbc_sha1_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 @@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s index 5a47b3ee51b741..dd09f1b290af62 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha256_enc,@function .align 16 aesni_cbc_sha256_enc: +.cfi_startproc leaq OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -30,6 +31,7 @@ aesni_cbc_sha256_enc: ud2 .Lprobe: .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc .align 64 @@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi +.cfi_def_cfa %rsi,8 leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi .cfi_def_cfa %rsi,8 vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2: .type aesni_cbc_sha256_enc_shaext,@function .align 32 aesni_cbc_sha256_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 @@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s index 2986a647c1bb05..c1e791eff59235 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ aesni_ecb_encrypt: .type aesni_ccm64_encrypt_blocks,@function .align 16 aesni_ccm64_encrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa .Lincrement64(%rip),%xmm9 @@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks .globl aesni_ccm64_decrypt_blocks .type aesni_ccm64_decrypt_blocks,@function .align 16 aesni_ccm64_decrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks .globl aesni_ctr32_encrypt_blocks .type aesni_ctr32_encrypt_blocks,@function @@ -2790,6 +2794,7 @@ aesni_ocb_encrypt: .type __ocb_encrypt6,@function .align 32 __ocb_encrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2887,11 +2892,13 @@ __ocb_encrypt6: .byte 102,65,15,56,221,246 .byte 102,65,15,56,221,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt6,.-__ocb_encrypt6 .type __ocb_encrypt4,@function .align 32 __ocb_encrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2956,11 +2963,13 @@ __ocb_encrypt4: .byte 102,65,15,56,221,228 .byte 102,65,15,56,221,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt4,.-__ocb_encrypt4 .type __ocb_encrypt1,@function .align 32 __ocb_encrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2991,6 +3000,7 @@ __ocb_encrypt1: .byte 102,15,56,221,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt1,.-__ocb_encrypt1 .globl aesni_ocb_decrypt @@ -3233,6 +3243,7 @@ aesni_ocb_decrypt: .type __ocb_decrypt6,@function .align 32 __ocb_decrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3324,11 +3335,13 @@ __ocb_decrypt6: .byte 102,65,15,56,223,246 .byte 102,65,15,56,223,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt6,.-__ocb_decrypt6 .type __ocb_decrypt4,@function .align 32 __ocb_decrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3389,11 +3402,13 @@ __ocb_decrypt4: .byte 102,65,15,56,223,228 .byte 102,65,15,56,223,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt4,.-__ocb_decrypt4 .type __ocb_decrypt1,@function .align 32 __ocb_decrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3423,6 +3438,7 @@ __ocb_decrypt1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt1,.-__ocb_decrypt1 .globl aesni_cbc_encrypt .type aesni_cbc_encrypt,@function @@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key: addq $8,%rsp .cfi_adjust_cfa_offset -8 .byte 0xf3,0xc3 -.cfi_endproc .LSEH_end_set_encrypt_key: .align 16 @@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key: shufps $170,%xmm1,%xmm1 xorps %xmm1,%xmm2 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_set_encrypt_key,.-aesni_set_encrypt_key .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key .align 64 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index e1f3abadbc7214..00000000000000 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2595 +0,0 @@ -.text - - - - -.type _bsaes_encrypt8,@function -.align 64 -_bsaes_encrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Lenc_sbox -.align 16 -.Lenc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Lenc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl .Lenc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz .Lenc_loop - movdqa 64(%r11),%xmm7 - jmp .Lenc_loop -.align 16 -.Lenc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_encrypt8,.-_bsaes_encrypt8 - -.type _bsaes_decrypt8,@function -.align 64 -_bsaes_decrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Ldec_sbox -.align 16 -.Ldec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Ldec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl .Ldec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz .Ldec_loop - movdqa -32(%r11),%xmm7 - jmp .Ldec_loop -.align 16 -.Ldec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_decrypt8,.-_bsaes_decrypt8 -.type _bsaes_key_convert,@function -.align 16 -_bsaes_key_convert: -.cfi_startproc - leaq .Lmasks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp .Lkey_loop -.align 16 -.Lkey_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz .Lkey_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_key_convert,.-_bsaes_key_convert - -.globl bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,@function -.align 16 -bsaes_cbc_encrypt: -.cfi_startproc - cmpl $0,%r9d - jne asm_AES_cbc_encrypt - cmpq $128,%rdx - jb asm_AES_cbc_encrypt - - movq %rsp,%rax -.Lcbc_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -.Lcbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc .Lcbc_dec_loop - - addq $8,%r14 - jz .Lcbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb .Lcbc_dec_one - movdqu 16(%r12),%xmm0 - je .Lcbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb .Lcbc_dec_three - movdqu 48(%r12),%xmm2 - je .Lcbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb .Lcbc_dec_five - movdqu 80(%r12),%xmm4 - je .Lcbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -.Lcbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lcbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lcbc_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lcbc_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt - -.globl bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,@function -.align 16 -bsaes_ctr32_encrypt_blocks: -.cfi_startproc - movq %rsp,%rax -.Lctr_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb .Lctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq .LADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp .Lctr_enc_loop -.align 16 -.Lctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq .LBS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc .Lctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq .LADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz .Lctr_enc_loop - - jmp .Lctr_enc_done -.align 16 -.Lctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb .Lctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je .Lctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb .Lctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je .Lctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb .Lctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je .Lctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp .Lctr_enc_done - -.align 16 -.Lctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz .Lctr_enc_short - -.Lctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lctr_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lctr_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,@function -.align 16 -bsaes_xts_encrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_enc_short - jmp .Lxts_enc_loop - -.align 16 -.Lxts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_enc_loop - -.Lxts_enc_short: - addq $0x80,%r14 - jz .Lxts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_enc_done: - andl $15,%ebx - jz .Lxts_enc_ret - movq %r13,%rdx - -.Lxts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -.Lxts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt - -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,@function -.align 16 -bsaes_xts_decrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_dec_short - jmp .Lxts_dec_loop - -.align 16 -.Lxts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_dec_loop - -.Lxts_dec_short: - addq $0x80,%r14 - jz .Lxts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_dec_done: - andl $15,%ebx - jz .Lxts_dec_ret - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -.Lxts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -.Lxts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt -.type _bsaes_const,@object -.align 64 -_bsaes_const: -.LM0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -.LISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -.LISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -.LBS0: -.quad 0x5555555555555555, 0x5555555555555555 -.LBS1: -.quad 0x3333333333333333, 0x3333333333333333 -.LBS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -.LSR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -.LSRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -.LM0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -.LSWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -.LSWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -.LADD1: -.quad 0x0000000000000000, 0x0000000100000000 -.LADD2: -.quad 0x0000000000000000, 0x0000000200000000 -.LADD3: -.quad 0x0000000000000000, 0x0000000300000000 -.LADD4: -.quad 0x0000000000000000, 0x0000000400000000 -.LADD5: -.quad 0x0000000000000000, 0x0000000500000000 -.LADD6: -.quad 0x0000000000000000, 0x0000000600000000 -.LADD7: -.quad 0x0000000000000000, 0x0000000700000000 -.LADD8: -.quad 0x0000000000000000, 0x0000000800000000 -.Lxts_magic: -.long 0x87,0,1,0 -.Lmasks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -.LM0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -.L63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.align 64 -.size _bsaes_const,.-_bsaes_const diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s index f8e4a805887366..7876e0b8f93d9c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s @@ -29,7 +29,7 @@ rsaz_512_sqr: subq $128+24,%rsp .cfi_adjust_cfa_offset 128+24 .Lsqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -44,6 +44,7 @@ rsaz_512_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -82,31 +83,29 @@ rsaz_512_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -114,7 +113,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -122,7 +121,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -130,7 +129,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -138,39 +137,39 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -178,7 +177,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -186,9 +185,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -196,36 +193,40 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -234,9 +235,8 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -245,32 +245,33 @@ rsaz_512_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -278,97 +279,99 @@ rsaz_512_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -378,6 +381,10 @@ rsaz_512_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -406,9 +413,9 @@ rsaz_512_sqr: .Loop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -416,40 +423,39 @@ rsaz_512_sqr: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -467,24 +473,25 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -492,7 +499,7 @@ rsaz_512_sqr: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -500,27 +507,28 @@ rsaz_512_sqr: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -535,25 +543,25 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -564,18 +572,19 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -588,18 +597,19 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -609,31 +619,31 @@ rsaz_512_sqr: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -647,6 +657,9 @@ rsaz_512_sqr: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one: .type __rsaz_512_reduce,@function .align 32 __rsaz_512_reduce: +.cfi_startproc movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1519,10 +1533,12 @@ __rsaz_512_reduce: jne .Lreduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reduce,.-__rsaz_512_reduce .type __rsaz_512_reducex,@function .align 32 __rsaz_512_reducex: +.cfi_startproc imulq %r8,%rdx xorq %rsi,%rsi @@ -1575,10 +1591,12 @@ __rsaz_512_reducex: jne .Lreduction_loopx .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reducex,.-__rsaz_512_reducex .type __rsaz_512_subtract,@function .align 32 __rsaz_512_subtract: +.cfi_startproc movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1632,10 +1650,12 @@ __rsaz_512_subtract: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_subtract,.-__rsaz_512_subtract .type __rsaz_512_mul,@function .align 32 __rsaz_512_mul: +.cfi_startproc leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1774,10 +1794,12 @@ __rsaz_512_mul: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mul,.-__rsaz_512_mul .type __rsaz_512_mulx,@function .align 32 __rsaz_512_mulx: +.cfi_startproc mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1894,11 +1916,13 @@ __rsaz_512_mulx: movq %r15,8+64+56(%rsp) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mulx,.-__rsaz_512_mulx .globl rsaz_512_scatter4 .type rsaz_512_scatter4,@function .align 16 rsaz_512_scatter4: +.cfi_startproc leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp .Loop_scatter @@ -1911,12 +1935,14 @@ rsaz_512_scatter4: decl %r9d jnz .Loop_scatter .byte 0xf3,0xc3 +.cfi_endproc .size rsaz_512_scatter4,.-rsaz_512_scatter4 .globl rsaz_512_gather4 .type rsaz_512_gather4,@function .align 16 rsaz_512_gather4: +.cfi_startproc movd %edx,%xmm8 movdqa .Linc+16(%rip),%xmm1 movdqa .Linc(%rip),%xmm0 @@ -1980,6 +2006,7 @@ rsaz_512_gather4: jnz .Loop_gather .byte 0xf3,0xc3 .LSEH_end_rsaz_512_gather4: +.cfi_endproc .size rsaz_512_gather4,.-rsaz_512_gather4 .align 64 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s index df4b6610a02a47..40a60a3c8fc6b9 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ bn_mul4x_mont_gather5: .type mul4x_internal,@function .align 32 mul4x_internal: +.cfi_startproc shlq $5,%r9 movd 8(%rax),%xmm5 leaq .Linc(%rip),%rax @@ -1071,6 +1072,7 @@ mul4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqr4x_sub_entry +.cfi_endproc .size mul4x_internal,.-mul4x_internal .globl bn_power5 .type bn_power5,@function @@ -1213,6 +1215,7 @@ bn_power5: .align 32 bn_sqr8x_internal: __bn_sqr8x_internal: +.cfi_startproc @@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction: cmpq %rdx,%rdi jb .L8x_reduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size bn_sqr8x_internal,.-bn_sqr8x_internal .type __bn_post4x_internal,@function .align 32 __bn_post4x_internal: +.cfi_startproc movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2041,15 +2046,18 @@ __bn_post4x_internal: movq %r9,%r10 negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_post4x_internal,.-__bn_post4x_internal .globl bn_from_montgomery .type bn_from_montgomery,@function .align 32 bn_from_montgomery: +.cfi_startproc testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_from_montgomery,.-bn_from_montgomery .type bn_from_mont8x,@function @@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5: .type mulx4x_internal,@function .align 32 mulx4x_internal: +.cfi_startproc movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2751,6 +2760,7 @@ mulx4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqrx4x_sub_entry +.cfi_endproc .size mulx4x_internal,.-mulx4x_internal .type bn_powerx5,@function .align 32 @@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction: .size bn_sqrx8x_internal,.-bn_sqrx8x_internal .align 32 __bn_postx4x_internal: +.cfi_startproc movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3556,11 +3567,13 @@ __bn_postx4x_internal: negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_postx4x_internal,.-__bn_postx4x_internal .globl bn_get_bits5 .type bn_get_bits5,@function .align 16 bn_get_bits5: +.cfi_startproc leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3574,12 +3587,14 @@ bn_get_bits5: shrl %cl,%eax andl $31,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_get_bits5,.-bn_get_bits5 .globl bn_scatter5 .type bn_scatter5,@function .align 16 bn_scatter5: +.cfi_startproc cmpl $0,%esi jz .Lscatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3592,6 +3607,7 @@ bn_scatter5: jnz .Lscatter .Lscatter_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size bn_scatter5,.-bn_scatter5 .globl bn_gather5 @@ -3599,6 +3615,7 @@ bn_scatter5: .align 32 bn_gather5: .LSEH_begin_bn_gather5: +.cfi_startproc .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 @@ -3756,6 +3773,7 @@ bn_gather5: leaq (%r10),%rsp .byte 0xf3,0xc3 .LSEH_end_bn_gather5: +.cfi_endproc .size bn_gather5,.-bn_gather5 .align 64 .Linc: diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h index 3eb8d7ca6bad4a..b52f1881d3036e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Fri Sep 13 15:57:33 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:59 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -35,12 +35,12 @@ static const char compiler_flags[] = { '_','A','S','M',' ','-','D','S','H','A','5','1','2','_','A','S', 'M',' ','-','D','K','E','C','C','A','K','1','6','0','0','_','A', 'S','M',' ','-','D','R','C','4','_','A','S','M',' ','-','D','M', - 'D','5','_','A','S','M',' ','-','D','V','P','A','E','S','_','A', - 'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-', - 'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S', - 'M',' ','-','D','X','2','5','5','1','9','_','A','S','M',' ','-', - 'D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D', - '_','T','H','R','E','A','D','_','S','A','F','E',' ','-','D','_', - 'R','E','E','N','T','R','A','N','T',' ','-','D','N','D','E','B', - 'U','G','\0' + 'D','5','_','A','S','M',' ','-','D','A','E','S','N','I','_','A', + 'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-', + 'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P', + '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D', + 'X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L', + 'Y','1','3','0','5','_','A','S','M',' ','-','D','_','T','H','R', + 'E','A','D','_','S','A','F','E',' ','-','D','_','R','E','E','N', + 'T','R','A','N','T',' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s index 405566b01cca6f..eeb20dd2291da7 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s @@ -5,11 +5,13 @@ .type Camellia_EncryptBlock,@function .align 16 Camellia_EncryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Lenc_rounds +.cfi_endproc .size Camellia_EncryptBlock,.-Camellia_EncryptBlock .globl Camellia_EncryptBlock_Rounds @@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds: .type _x86_64_Camellia_encrypt,@function .align 16 _x86_64_Camellia_encrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt: movl %edx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt @@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt: .type Camellia_DecryptBlock,@function .align 16 Camellia_DecryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Ldec_rounds +.cfi_endproc .size Camellia_DecryptBlock,.-Camellia_DecryptBlock .globl Camellia_DecryptBlock_Rounds @@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds: .type _x86_64_Camellia_decrypt,@function .align 16 _x86_64_Camellia_decrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt: movl %ebx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt .globl Camellia_Ekeygen .type Camellia_Ekeygen,@function diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s index 62b9ac6616ba72..5c9e4050416212 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx: .type ecp_nistz256_to_mont,@function .align 32 ecp_nistz256_to_mont: +.cfi_startproc movl $0x80100,%ecx andl OPENSSL_ia32cap_P+8(%rip),%ecx leaq .LRR(%rip),%rdx jmp .Lmul_mont +.cfi_endproc .size ecp_nistz256_to_mont,.-ecp_nistz256_to_mont @@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont: .type ecp_nistz256_scatter_w5,@function .align 32 ecp_nistz256_scatter_w5: +.cfi_startproc leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5: movdqa %xmm5,80(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5 @@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5: .type ecp_nistz256_scatter_w7,@function .align 32 ecp_nistz256_scatter_w7: +.cfi_startproc movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7: movdqa %xmm3,48(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7 @@ -5655,26 +5661,16 @@ ecp_nistz256_point_add: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedq - testq %r9,%r9 - jz .Ladd_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedq -.align 32 .Ladd_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedx - testq %r9,%r9 - jz .Ladd_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedx -.align 32 .Ladd_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s index 2a18eaee288ce7..1788e568cda5d2 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s @@ -400,12 +400,14 @@ x25519_fe51_mul121666: .type x25519_fe64_eligible,@function .align 32 x25519_fe64_eligible: +.cfi_startproc movl OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx cmpl $0x80100,%ecx cmovel %ecx,%eax .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_eligible,.-x25519_fe64_eligible .globl x25519_fe64_mul @@ -648,6 +650,7 @@ x25519_fe64_sqr: .align 32 x25519_fe64_mul121666: .Lfe64_mul121666_body: +.cfi_startproc movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -676,6 +679,7 @@ x25519_fe64_mul121666: .Lfe64_mul121666_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_mul121666,.-x25519_fe64_mul121666 .globl x25519_fe64_add @@ -683,6 +687,7 @@ x25519_fe64_mul121666: .align 32 x25519_fe64_add: .Lfe64_add_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -711,6 +716,7 @@ x25519_fe64_add: .Lfe64_add_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_add,.-x25519_fe64_add .globl x25519_fe64_sub @@ -718,6 +724,7 @@ x25519_fe64_add: .align 32 x25519_fe64_sub: .Lfe64_sub_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -746,6 +753,7 @@ x25519_fe64_sub: .Lfe64_sub_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_sub,.-x25519_fe64_sub .globl x25519_fe64_tobytes @@ -753,6 +761,7 @@ x25519_fe64_sub: .align 32 x25519_fe64_tobytes: .Lfe64_to_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -788,5 +797,6 @@ x25519_fe64_tobytes: .Lfe64_to_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_tobytes,.-x25519_fe64_tobytes .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s index 6a7a9577c7142f..01d89630a42f73 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .type _aesni_ctr32_ghash_6x,@function .align 32 _aesni_ctr32_ghash_6x: +.cfi_startproc vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x: vpxor %xmm4,%xmm8,%xmm8 .byte 0xf3,0xc3 +.cfi_endproc .size _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x .globl aesni_gcm_decrypt .type aesni_gcm_decrypt,@function @@ -416,6 +418,7 @@ aesni_gcm_decrypt: .type _aesni_ctr32_6x,@function .align 32 _aesni_ctr32_6x: +.cfi_startproc vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -502,6 +505,7 @@ _aesni_ctr32_6x: vpshufb %xmm0,%xmm1,%xmm1 vpxor %xmm4,%xmm14,%xmm14 jmp .Loop_ctr32 +.cfi_endproc .size _aesni_ctr32_6x,.-_aesni_ctr32_6x .globl aesni_gcm_encrypt diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s index deb4f74bfbcd1b..987a65aab38147 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .type poly1305_init,@function .align 32 poly1305_init: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -47,6 +48,7 @@ poly1305_init: movl $1,%eax .Lno_key: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init,.-poly1305_init .type poly1305_blocks,@function @@ -167,6 +169,7 @@ poly1305_blocks: .type poly1305_emit,@function .align 32 poly1305_emit: +.cfi_startproc .Lemit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -187,10 +190,12 @@ poly1305_emit: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit,.-poly1305_emit .type __poly1305_block,@function .align 32 __poly1305_block: +.cfi_startproc mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -230,11 +235,13 @@ __poly1305_block: adcq $0,%rbx adcq $0,%rbp .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_block,.-__poly1305_block .type __poly1305_init_avx,@function .align 32 __poly1305_init_avx: +.cfi_startproc movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -392,6 +399,7 @@ __poly1305_init_avx: leaq -48-64(%rdi),%rdi .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_init_avx,.-__poly1305_init_avx .type poly1305_blocks_avx,@function @@ -1232,6 +1240,7 @@ poly1305_blocks_avx: .type poly1305_emit_avx,@function .align 32 poly1305_emit_avx: +.cfi_startproc cmpl $0,20(%rdi) je .Lemit @@ -1282,6 +1291,7 @@ poly1305_emit_avx: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_avx,.-poly1305_emit_avx .type poly1305_blocks_avx2,@function .align 32 @@ -2478,6 +2488,7 @@ poly1305_blocks_avx512: .type poly1305_init_base2_44,@function .align 32 poly1305_init_base2_44: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -2511,10 +2522,12 @@ poly1305_init_base2_44: movq %r11,8(%rdx) movl $1,%eax .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init_base2_44,.-poly1305_init_base2_44 .type poly1305_blocks_vpmadd52,@function .align 32 poly1305_blocks_vpmadd52: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52 @@ -2621,10 +2634,12 @@ poly1305_blocks_vpmadd52: .Lno_data_vpmadd52: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52 .type poly1305_blocks_vpmadd52_4x,@function .align 32 poly1305_blocks_vpmadd52_4x: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52_4x @@ -3049,10 +3064,12 @@ poly1305_blocks_vpmadd52_4x: .Lno_data_vpmadd52_4x: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x .type poly1305_blocks_vpmadd52_8x,@function .align 32 poly1305_blocks_vpmadd52_8x: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52_8x @@ -3393,10 +3410,12 @@ poly1305_blocks_vpmadd52_8x: .Lno_data_vpmadd52_8x: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x .type poly1305_emit_base2_44,@function .align 32 poly1305_emit_base2_44: +.cfi_startproc movq 0(%rdi),%r8 movq 8(%rdi),%r9 movq 16(%rdi),%r10 @@ -3427,6 +3446,7 @@ poly1305_emit_base2_44: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_base2_44,.-poly1305_emit_base2_44 .align 64 .Lconst: @@ -3465,6 +3485,7 @@ poly1305_emit_base2_44: .type xor128_encrypt_n_pad,@function .align 16 xor128_encrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -3506,12 +3527,14 @@ xor128_encrypt_n_pad: .Ldone_enc: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_encrypt_n_pad,.-xor128_encrypt_n_pad .globl xor128_decrypt_n_pad .type xor128_decrypt_n_pad,@function .align 16 xor128_decrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -3557,4 +3580,5 @@ xor128_decrypt_n_pad: .Ldone_dec: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_decrypt_n_pad,.-xor128_decrypt_n_pad diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s index fba70351d48d5c..b97c757550aad0 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl RC4 .type RC4,@function .align 16 -RC4: orq %rsi,%rsi +RC4: +.cfi_startproc + orq %rsi,%rsi jne .Lentry .byte 0xf3,0xc3 .Lentry: -.cfi_startproc pushq %rbx .cfi_adjust_cfa_offset 8 .cfi_offset %rbx,-16 @@ -533,6 +534,7 @@ RC4: orq %rsi,%rsi .type RC4_set_key,@function .align 16 RC4_set_key: +.cfi_startproc leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -599,12 +601,14 @@ RC4_set_key: movl %eax,-8(%rdi) movl %eax,-4(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size RC4_set_key,.-RC4_set_key .globl RC4_options .type RC4_options,@function .align 16 RC4_options: +.cfi_startproc leaq .Lopts(%rip),%rax movl OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -617,6 +621,7 @@ RC4_options: addq $12,%rax .Ldone: .byte 0xf3,0xc3 +.cfi_endproc .align 64 .Lopts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s index e511f25035b2b8..09617d014bdb7b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .type __KeccakF1600,@function .align 32 __KeccakF1600: +.cfi_startproc movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -255,6 +256,7 @@ __KeccakF1600: leaq -192(%r15),%r15 .byte 0xf3,0xc3 +.cfi_endproc .size __KeccakF1600,.-__KeccakF1600 .type KeccakF1600,@function diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s index e436521a040f66..98541727e555da 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s @@ -1421,8 +1421,8 @@ _shaext_shortcut: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) -.cfi_endproc .byte 0xf3,0xc3 +.cfi_endproc .size sha1_block_data_order_shaext,.-sha1_block_data_order_shaext .type sha1_block_data_order_ssse3,@function .align 16 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s index 42b24df18e5afe..9357385da3c49b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .align 64 sha256_block_data_order_shaext: _shaext_shortcut: +.cfi_startproc leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1977,6 +1978,7 @@ _shaext_shortcut: movdqu %xmm1,(%rdi) movdqu %xmm2,16(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size sha256_block_data_order_shaext,.-sha256_block_data_order_shaext .type sha256_block_data_order_ssse3,@function .align 64 @@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2: leaq 448(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08 + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s index 5931a2a93234d0..939f1ca71c9394 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2: leaq 1152(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08 + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s index fd17eaaba49576..9268ce8c9a9d63 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s @@ -12,6 +12,7 @@ .type OPENSSL_atomic_add,@function .align 16 OPENSSL_atomic_add: +.cfi_startproc movl (%rdi),%eax .Lspin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -20,16 +21,19 @@ OPENSSL_atomic_add: movl %r8d,%eax .byte 0x48,0x98 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_atomic_add,.-OPENSSL_atomic_add .globl OPENSSL_rdtsc .type OPENSSL_rdtsc,@function .align 16 OPENSSL_rdtsc: +.cfi_startproc rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_rdtsc,.-OPENSSL_rdtsc .globl OPENSSL_ia32_cpuid @@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid: .type OPENSSL_cleanse,@function .align 16 OPENSSL_cleanse: +.cfi_startproc xorq %rax,%rax cmpq $15,%rsi jae .Lot @@ -234,12 +239,14 @@ OPENSSL_cleanse: cmpq $0,%rsi jne .Little .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_cleanse,.-OPENSSL_cleanse .globl CRYPTO_memcmp .type CRYPTO_memcmp,@function .align 16 CRYPTO_memcmp: +.cfi_startproc xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -268,11 +275,13 @@ CRYPTO_memcmp: shrq $63,%rax .Lno_data: .byte 0xf3,0xc3 +.cfi_endproc .size CRYPTO_memcmp,.-CRYPTO_memcmp .globl OPENSSL_wipe_cpu .type OPENSSL_wipe_cpu,@function .align 16 OPENSSL_wipe_cpu: +.cfi_startproc pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -299,11 +308,13 @@ OPENSSL_wipe_cpu: xorq %r11,%r11 leaq 8(%rsp),%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu .globl OPENSSL_instrument_bus .type OPENSSL_instrument_bus,@function .align 16 OPENSSL_instrument_bus: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -330,12 +341,14 @@ OPENSSL_instrument_bus: movq %r11,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus .globl OPENSSL_instrument_bus2 .type OPENSSL_instrument_bus2,@function .align 16 OPENSSL_instrument_bus2: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -378,11 +391,13 @@ OPENSSL_instrument_bus2: movq 8(%rsp),%rax subq %rcx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 .globl OPENSSL_ia32_rdrand_bytes .type OPENSSL_ia32_rdrand_bytes,@function .align 16 OPENSSL_ia32_rdrand_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdrand_bytes @@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes: .Ldone_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes .globl OPENSSL_ia32_rdseed_bytes .type OPENSSL_ia32_rdseed_bytes,@function .align 16 OPENSSL_ia32_rdseed_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdseed_bytes @@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes: .Ldone_rdseed_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h index 6094de421edbe2..80bda2b852187b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h @@ -93,9 +93,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi index 046ed1ab79500b..6ced0528cacc41 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi @@ -15,6 +15,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi index 08b438900a5857..fec8bfc6a2f6e1 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi @@ -723,6 +723,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm index bf9459acade3c8..30164e88aa0d0c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1501,6 +1502,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3256,7 +3263,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3264,6 +3270,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3762,14 +3769,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4210,6 +4209,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4904,49 +4911,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4956,25 +4955,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4992,13 +4987,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5012,613 +5005,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5632,7 +5523,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5642,182 +5532,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5827,19 +5687,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5865,31 +5722,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5899,37 +5751,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5939,31 +5785,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5981,278 +5822,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6262,301 +6057,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6564,7 +6309,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6572,7 +6316,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6580,7 +6323,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6588,7 +6330,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6596,7 +6337,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6604,163 +6344,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6778,247 +6491,206 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_devcrypto.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7026,21 +6698,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7048,13 +6717,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7062,81 +6729,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7144,328 +6798,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7475,91 +7068,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7578,7 +7156,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7588,361 +7165,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7964,265 +7481,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8232,31 +7705,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8266,7 +7734,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8280,7 +7747,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8298,19 +7764,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8324,7 +7787,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8342,13 +7804,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8374,727 +7834,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9145,6 +8484,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9389,7 +8736,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9715,7 +9061,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9761,7 +9106,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9827,7 +9171,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9852,7 +9195,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9950,7 +9292,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -10000,18 +9341,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10022,6 +9360,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10085,10 +9427,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10117,6 +9455,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10381,6 +9723,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15391,7 +14734,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15399,6 +14741,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15626,6 +14969,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15728,10 +15079,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15760,6 +15107,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s deleted file mode 100644 index f0c1685fb93450..00000000000000 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2649 +0,0 @@ -.text -.type _x86_64_AES_encrypt,@function -.align 16 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Lenc_loop -.align 16 -.Lenc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz .Lenc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_encrypt,.-_x86_64_AES_encrypt -.type _x86_64_AES_encrypt_compact,@function -.align 16 -_x86_64_AES_encrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Lenc_loop_compact -.align 16 -.Lenc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Lenc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp .Lenc_loop_compact -.align 16 -.Lenc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -.globl asm_AES_encrypt -.hidden asm_AES_encrypt -asm_AES_encrypt: -AES_encrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Lenc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Lenc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_encrypt,.-AES_encrypt -.type _x86_64_AES_decrypt,@function -.align 16 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Ldec_loop -.align 16 -.Ldec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz .Ldec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_decrypt,.-_x86_64_AES_decrypt -.type _x86_64_AES_decrypt_compact,@function -.align 16 -_x86_64_AES_decrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Ldec_loop_compact - -.align 16 -.Ldec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Ldec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp .Ldec_loop_compact -.align 16 -.Ldec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -.globl asm_AES_decrypt -.hidden asm_AES_decrypt -asm_AES_decrypt: -AES_decrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Ldec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Ldec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_decrypt,.-AES_decrypt -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - subq $8,%rsp -.cfi_adjust_cfa_offset 8 -.Lenc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Lenc_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_encrypt_key,.-AES_set_encrypt_key - -.type _x86_64_AES_set_encrypt_key,@function -.align 16 -_x86_64_AES_set_encrypt_key: -.cfi_startproc - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz .Lbadpointer - testq $-1,%rdi - jz .Lbadpointer - - leaq .LAES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je .L10rounds - cmpl $192,%ecx - je .L12rounds - cmpl $256,%ecx - je .L14rounds - movq $-2,%rax - jmp .Lexit - -.L10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L10shortcut -.align 4 -.L10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -.L10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl .L10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L12shortcut -.align 4 -.L12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -.L12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je .L12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp .L12loop -.L12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L14shortcut -.align 4 -.L14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -.L14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je .L14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp .L14loop -.L14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp .Lexit - -.Lbadpointer: - movq $-1,%rax -.Lexit: -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - pushq %rdx -.cfi_adjust_cfa_offset 8 -.Ldec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne .Labort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.align 4 -.Linvert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne .Linvert - - leaq .LAES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.align 4 -.Lpermute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz .Lpermute - - xorq %rax,%rax -.Labort: - movq 8(%rsp),%r15 -.cfi_restore %r15 - movq 16(%rsp),%r14 -.cfi_restore %r14 - movq 24(%rsp),%r13 -.cfi_restore %r13 - movq 32(%rsp),%r12 -.cfi_restore %r12 - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Ldec_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_decrypt_key,.-AES_set_decrypt_key -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 - -.globl asm_AES_cbc_encrypt -.hidden asm_AES_cbc_encrypt -asm_AES_cbc_encrypt: -AES_cbc_encrypt: -.cfi_startproc - cmpq $0,%rdx - je .Lcbc_epilogue - pushfq - - -.cfi_adjust_cfa_offset 8 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-32 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-40 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-48 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-56 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-64 -.Lcbc_prologue: - - cld - movl %r9d,%r9d - - leaq .LAES_Te(%rip),%r14 - leaq .LAES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - -.cfi_remember_state - movl OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb .Lcbc_slow_prologue - testq $15,%rdx - jnz .Lcbc_slow_prologue - btl $28,%r10d - jc .Lcbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb .Lcbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp .Lcbc_te_ok -.Lcbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.align 4 -.Lcbc_te_ok: - - xchgq %rsp,%r15 -.cfi_def_cfa_register %r15 - - movq %r15,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb .Lcbc_do_ecopy - cmpq $4096-248,%r10 - jb .Lcbc_skip_ecopy -.align 4 -.Lcbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -.Lcbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.align 4 -.Lcbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz .Lcbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je .LFAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.align 4 -.Lcbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz .Lcbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_fast_cleanup - - -.align 16 -.LFAST_DECRYPT: - cmpq %r8,%r9 - je .Lcbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.align 4 -.Lcbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz .Lcbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp .Lcbc_fast_cleanup - -.align 16 -.Lcbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.align 4 -.Lcbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz .Lcbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp .Lcbc_fast_dec_in_place_loop -.Lcbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.align 4 -.Lcbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je .Lcbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp .Lcbc_exit - - -.align 16 -.Lcbc_slow_prologue: -.cfi_restore_state - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp -.cfi_def_cfa_register %rbp - - movq %rbp,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je .LSLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz .Lcbc_slow_enc_tail - -.align 4 -.Lcbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz .Lcbc_slow_enc_loop - testq $15,%r10 - jnz .Lcbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp .Lcbc_slow_enc_loop - -.align 16 -.LSLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.align 4 -.Lcbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc .Lcbc_slow_dec_partial - jz .Lcbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp .Lcbc_slow_dec_loop -.Lcbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp .Lcbc_exit - -.align 16 -.Lcbc_exit: - movq 16(%rsp),%rsi -.cfi_def_cfa %rsi,64 - movq (%rsi),%r15 -.cfi_restore %r15 - movq 8(%rsi),%r14 -.cfi_restore %r14 - movq 16(%rsi),%r13 -.cfi_restore %r13 - movq 24(%rsi),%r12 -.cfi_restore %r12 - movq 32(%rsi),%rbp -.cfi_restore %rbp - movq 40(%rsi),%rbx -.cfi_restore %rbx - leaq 48(%rsi),%rsp -.cfi_def_cfa %rsp,16 -.Lcbc_popfq: - popfq - - -.cfi_adjust_cfa_offset -8 -.Lcbc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_cbc_encrypt,.-AES_cbc_encrypt -.align 64 -.LAES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.align 64 -.LAES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 64 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s index 4d2dfe44898fd5..978bd2b6239c15 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha1_enc,@function .align 32 aesni_cbc_sha1_enc: +.cfi_startproc movl OPENSSL_ia32cap_P+0(%rip),%r10d movq OPENSSL_ia32cap_P+4(%rip),%r11 @@ -17,6 +18,7 @@ aesni_cbc_sha1_enc: je aesni_cbc_sha1_enc_avx jmp aesni_cbc_sha1_enc_ssse3 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc .type aesni_cbc_sha1_enc_ssse3,@function .align 32 @@ -2730,6 +2732,7 @@ K_XX_XX: .type aesni_cbc_sha1_enc_shaext,@function .align 32 aesni_cbc_sha1_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 @@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s index 5a47b3ee51b741..dd09f1b290af62 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha256_enc,@function .align 16 aesni_cbc_sha256_enc: +.cfi_startproc leaq OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -30,6 +31,7 @@ aesni_cbc_sha256_enc: ud2 .Lprobe: .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc .align 64 @@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi +.cfi_def_cfa %rsi,8 leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi .cfi_def_cfa %rsi,8 vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2: .type aesni_cbc_sha256_enc_shaext,@function .align 32 aesni_cbc_sha256_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 @@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s index 2986a647c1bb05..c1e791eff59235 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ aesni_ecb_encrypt: .type aesni_ccm64_encrypt_blocks,@function .align 16 aesni_ccm64_encrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa .Lincrement64(%rip),%xmm9 @@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks .globl aesni_ccm64_decrypt_blocks .type aesni_ccm64_decrypt_blocks,@function .align 16 aesni_ccm64_decrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks .globl aesni_ctr32_encrypt_blocks .type aesni_ctr32_encrypt_blocks,@function @@ -2790,6 +2794,7 @@ aesni_ocb_encrypt: .type __ocb_encrypt6,@function .align 32 __ocb_encrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2887,11 +2892,13 @@ __ocb_encrypt6: .byte 102,65,15,56,221,246 .byte 102,65,15,56,221,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt6,.-__ocb_encrypt6 .type __ocb_encrypt4,@function .align 32 __ocb_encrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2956,11 +2963,13 @@ __ocb_encrypt4: .byte 102,65,15,56,221,228 .byte 102,65,15,56,221,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt4,.-__ocb_encrypt4 .type __ocb_encrypt1,@function .align 32 __ocb_encrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2991,6 +3000,7 @@ __ocb_encrypt1: .byte 102,15,56,221,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt1,.-__ocb_encrypt1 .globl aesni_ocb_decrypt @@ -3233,6 +3243,7 @@ aesni_ocb_decrypt: .type __ocb_decrypt6,@function .align 32 __ocb_decrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3324,11 +3335,13 @@ __ocb_decrypt6: .byte 102,65,15,56,223,246 .byte 102,65,15,56,223,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt6,.-__ocb_decrypt6 .type __ocb_decrypt4,@function .align 32 __ocb_decrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3389,11 +3402,13 @@ __ocb_decrypt4: .byte 102,65,15,56,223,228 .byte 102,65,15,56,223,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt4,.-__ocb_decrypt4 .type __ocb_decrypt1,@function .align 32 __ocb_decrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3423,6 +3438,7 @@ __ocb_decrypt1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt1,.-__ocb_decrypt1 .globl aesni_cbc_encrypt .type aesni_cbc_encrypt,@function @@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key: addq $8,%rsp .cfi_adjust_cfa_offset -8 .byte 0xf3,0xc3 -.cfi_endproc .LSEH_end_set_encrypt_key: .align 16 @@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key: shufps $170,%xmm1,%xmm1 xorps %xmm1,%xmm2 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_set_encrypt_key,.-aesni_set_encrypt_key .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key .align 64 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index e1f3abadbc7214..00000000000000 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2595 +0,0 @@ -.text - - - - -.type _bsaes_encrypt8,@function -.align 64 -_bsaes_encrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Lenc_sbox -.align 16 -.Lenc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Lenc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl .Lenc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz .Lenc_loop - movdqa 64(%r11),%xmm7 - jmp .Lenc_loop -.align 16 -.Lenc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_encrypt8,.-_bsaes_encrypt8 - -.type _bsaes_decrypt8,@function -.align 64 -_bsaes_decrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Ldec_sbox -.align 16 -.Ldec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Ldec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl .Ldec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz .Ldec_loop - movdqa -32(%r11),%xmm7 - jmp .Ldec_loop -.align 16 -.Ldec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_decrypt8,.-_bsaes_decrypt8 -.type _bsaes_key_convert,@function -.align 16 -_bsaes_key_convert: -.cfi_startproc - leaq .Lmasks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp .Lkey_loop -.align 16 -.Lkey_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz .Lkey_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_key_convert,.-_bsaes_key_convert - -.globl bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,@function -.align 16 -bsaes_cbc_encrypt: -.cfi_startproc - cmpl $0,%r9d - jne asm_AES_cbc_encrypt - cmpq $128,%rdx - jb asm_AES_cbc_encrypt - - movq %rsp,%rax -.Lcbc_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -.Lcbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc .Lcbc_dec_loop - - addq $8,%r14 - jz .Lcbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb .Lcbc_dec_one - movdqu 16(%r12),%xmm0 - je .Lcbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb .Lcbc_dec_three - movdqu 48(%r12),%xmm2 - je .Lcbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb .Lcbc_dec_five - movdqu 80(%r12),%xmm4 - je .Lcbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -.Lcbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lcbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lcbc_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lcbc_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt - -.globl bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,@function -.align 16 -bsaes_ctr32_encrypt_blocks: -.cfi_startproc - movq %rsp,%rax -.Lctr_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb .Lctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq .LADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp .Lctr_enc_loop -.align 16 -.Lctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq .LBS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc .Lctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq .LADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz .Lctr_enc_loop - - jmp .Lctr_enc_done -.align 16 -.Lctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb .Lctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je .Lctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb .Lctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je .Lctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb .Lctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je .Lctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp .Lctr_enc_done - -.align 16 -.Lctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz .Lctr_enc_short - -.Lctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lctr_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lctr_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,@function -.align 16 -bsaes_xts_encrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_enc_short - jmp .Lxts_enc_loop - -.align 16 -.Lxts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_enc_loop - -.Lxts_enc_short: - addq $0x80,%r14 - jz .Lxts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_enc_done: - andl $15,%ebx - jz .Lxts_enc_ret - movq %r13,%rdx - -.Lxts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -.Lxts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt - -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,@function -.align 16 -bsaes_xts_decrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_dec_short - jmp .Lxts_dec_loop - -.align 16 -.Lxts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_dec_loop - -.Lxts_dec_short: - addq $0x80,%r14 - jz .Lxts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_dec_done: - andl $15,%ebx - jz .Lxts_dec_ret - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -.Lxts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -.Lxts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt -.type _bsaes_const,@object -.align 64 -_bsaes_const: -.LM0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -.LISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -.LISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -.LBS0: -.quad 0x5555555555555555, 0x5555555555555555 -.LBS1: -.quad 0x3333333333333333, 0x3333333333333333 -.LBS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -.LSR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -.LSRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -.LM0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -.LSWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -.LSWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -.LADD1: -.quad 0x0000000000000000, 0x0000000100000000 -.LADD2: -.quad 0x0000000000000000, 0x0000000200000000 -.LADD3: -.quad 0x0000000000000000, 0x0000000300000000 -.LADD4: -.quad 0x0000000000000000, 0x0000000400000000 -.LADD5: -.quad 0x0000000000000000, 0x0000000500000000 -.LADD6: -.quad 0x0000000000000000, 0x0000000600000000 -.LADD7: -.quad 0x0000000000000000, 0x0000000700000000 -.LADD8: -.quad 0x0000000000000000, 0x0000000800000000 -.Lxts_magic: -.long 0x87,0,1,0 -.Lmasks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -.LM0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -.L63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.align 64 -.size _bsaes_const,.-_bsaes_const diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s index f8e4a805887366..7876e0b8f93d9c 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s @@ -29,7 +29,7 @@ rsaz_512_sqr: subq $128+24,%rsp .cfi_adjust_cfa_offset 128+24 .Lsqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -44,6 +44,7 @@ rsaz_512_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -82,31 +83,29 @@ rsaz_512_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -114,7 +113,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -122,7 +121,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -130,7 +129,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -138,39 +137,39 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -178,7 +177,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -186,9 +185,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -196,36 +193,40 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -234,9 +235,8 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -245,32 +245,33 @@ rsaz_512_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -278,97 +279,99 @@ rsaz_512_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -378,6 +381,10 @@ rsaz_512_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -406,9 +413,9 @@ rsaz_512_sqr: .Loop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -416,40 +423,39 @@ rsaz_512_sqr: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -467,24 +473,25 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -492,7 +499,7 @@ rsaz_512_sqr: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -500,27 +507,28 @@ rsaz_512_sqr: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -535,25 +543,25 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -564,18 +572,19 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -588,18 +597,19 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -609,31 +619,31 @@ rsaz_512_sqr: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -647,6 +657,9 @@ rsaz_512_sqr: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one: .type __rsaz_512_reduce,@function .align 32 __rsaz_512_reduce: +.cfi_startproc movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1519,10 +1533,12 @@ __rsaz_512_reduce: jne .Lreduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reduce,.-__rsaz_512_reduce .type __rsaz_512_reducex,@function .align 32 __rsaz_512_reducex: +.cfi_startproc imulq %r8,%rdx xorq %rsi,%rsi @@ -1575,10 +1591,12 @@ __rsaz_512_reducex: jne .Lreduction_loopx .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reducex,.-__rsaz_512_reducex .type __rsaz_512_subtract,@function .align 32 __rsaz_512_subtract: +.cfi_startproc movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1632,10 +1650,12 @@ __rsaz_512_subtract: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_subtract,.-__rsaz_512_subtract .type __rsaz_512_mul,@function .align 32 __rsaz_512_mul: +.cfi_startproc leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1774,10 +1794,12 @@ __rsaz_512_mul: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mul,.-__rsaz_512_mul .type __rsaz_512_mulx,@function .align 32 __rsaz_512_mulx: +.cfi_startproc mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1894,11 +1916,13 @@ __rsaz_512_mulx: movq %r15,8+64+56(%rsp) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mulx,.-__rsaz_512_mulx .globl rsaz_512_scatter4 .type rsaz_512_scatter4,@function .align 16 rsaz_512_scatter4: +.cfi_startproc leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp .Loop_scatter @@ -1911,12 +1935,14 @@ rsaz_512_scatter4: decl %r9d jnz .Loop_scatter .byte 0xf3,0xc3 +.cfi_endproc .size rsaz_512_scatter4,.-rsaz_512_scatter4 .globl rsaz_512_gather4 .type rsaz_512_gather4,@function .align 16 rsaz_512_gather4: +.cfi_startproc movd %edx,%xmm8 movdqa .Linc+16(%rip),%xmm1 movdqa .Linc(%rip),%xmm0 @@ -1980,6 +2006,7 @@ rsaz_512_gather4: jnz .Loop_gather .byte 0xf3,0xc3 .LSEH_end_rsaz_512_gather4: +.cfi_endproc .size rsaz_512_gather4,.-rsaz_512_gather4 .align 64 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s index df4b6610a02a47..40a60a3c8fc6b9 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ bn_mul4x_mont_gather5: .type mul4x_internal,@function .align 32 mul4x_internal: +.cfi_startproc shlq $5,%r9 movd 8(%rax),%xmm5 leaq .Linc(%rip),%rax @@ -1071,6 +1072,7 @@ mul4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqr4x_sub_entry +.cfi_endproc .size mul4x_internal,.-mul4x_internal .globl bn_power5 .type bn_power5,@function @@ -1213,6 +1215,7 @@ bn_power5: .align 32 bn_sqr8x_internal: __bn_sqr8x_internal: +.cfi_startproc @@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction: cmpq %rdx,%rdi jb .L8x_reduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size bn_sqr8x_internal,.-bn_sqr8x_internal .type __bn_post4x_internal,@function .align 32 __bn_post4x_internal: +.cfi_startproc movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2041,15 +2046,18 @@ __bn_post4x_internal: movq %r9,%r10 negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_post4x_internal,.-__bn_post4x_internal .globl bn_from_montgomery .type bn_from_montgomery,@function .align 32 bn_from_montgomery: +.cfi_startproc testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_from_montgomery,.-bn_from_montgomery .type bn_from_mont8x,@function @@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5: .type mulx4x_internal,@function .align 32 mulx4x_internal: +.cfi_startproc movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2751,6 +2760,7 @@ mulx4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqrx4x_sub_entry +.cfi_endproc .size mulx4x_internal,.-mulx4x_internal .type bn_powerx5,@function .align 32 @@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction: .size bn_sqrx8x_internal,.-bn_sqrx8x_internal .align 32 __bn_postx4x_internal: +.cfi_startproc movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3556,11 +3567,13 @@ __bn_postx4x_internal: negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_postx4x_internal,.-__bn_postx4x_internal .globl bn_get_bits5 .type bn_get_bits5,@function .align 16 bn_get_bits5: +.cfi_startproc leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3574,12 +3587,14 @@ bn_get_bits5: shrl %cl,%eax andl $31,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_get_bits5,.-bn_get_bits5 .globl bn_scatter5 .type bn_scatter5,@function .align 16 bn_scatter5: +.cfi_startproc cmpl $0,%esi jz .Lscatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3592,6 +3607,7 @@ bn_scatter5: jnz .Lscatter .Lscatter_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size bn_scatter5,.-bn_scatter5 .globl bn_gather5 @@ -3599,6 +3615,7 @@ bn_scatter5: .align 32 bn_gather5: .LSEH_begin_bn_gather5: +.cfi_startproc .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 @@ -3756,6 +3773,7 @@ bn_gather5: leaq (%r10),%rsp .byte 0xf3,0xc3 .LSEH_end_bn_gather5: +.cfi_endproc .size bn_gather5,.-bn_gather5 .align 64 .Linc: diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h index c9ffd0c3c093bf..6cb84c034f6626 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Fri Sep 13 15:57:48 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:08 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -36,12 +36,12 @@ static const char compiler_flags[] = { '5','6','_','A','S','M',' ','-','D','S','H','A','5','1','2','_', 'A','S','M',' ','-','D','K','E','C','C','A','K','1','6','0','0', '_','A','S','M',' ','-','D','R','C','4','_','A','S','M',' ','-', - 'D','M','D','5','_','A','S','M',' ','-','D','V','P','A','E','S', - '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M', - ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_', - 'A','S','M',' ','-','D','X','2','5','5','1','9','_','A','S','M', - ' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ', - '-','D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-', - 'D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D', - 'E','B','U','G','\0' + 'D','M','D','5','_','A','S','M',' ','-','D','A','E','S','N','I', + '_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M', + ' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E', + 'C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ', + '-','D','X','2','5','5','1','9','_','A','S','M',' ','-','D','P', + 'O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','_','T', + 'H','R','E','A','D','_','S','A','F','E',' ','-','D','_','R','E', + 'E','N','T','R','A','N','T',' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s index 405566b01cca6f..eeb20dd2291da7 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s @@ -5,11 +5,13 @@ .type Camellia_EncryptBlock,@function .align 16 Camellia_EncryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Lenc_rounds +.cfi_endproc .size Camellia_EncryptBlock,.-Camellia_EncryptBlock .globl Camellia_EncryptBlock_Rounds @@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds: .type _x86_64_Camellia_encrypt,@function .align 16 _x86_64_Camellia_encrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt: movl %edx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt @@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt: .type Camellia_DecryptBlock,@function .align 16 Camellia_DecryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Ldec_rounds +.cfi_endproc .size Camellia_DecryptBlock,.-Camellia_DecryptBlock .globl Camellia_DecryptBlock_Rounds @@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds: .type _x86_64_Camellia_decrypt,@function .align 16 _x86_64_Camellia_decrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt: movl %ebx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt .globl Camellia_Ekeygen .type Camellia_Ekeygen,@function diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s index 62b9ac6616ba72..5c9e4050416212 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s @@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx: .type ecp_nistz256_to_mont,@function .align 32 ecp_nistz256_to_mont: +.cfi_startproc movl $0x80100,%ecx andl OPENSSL_ia32cap_P+8(%rip),%ecx leaq .LRR(%rip),%rdx jmp .Lmul_mont +.cfi_endproc .size ecp_nistz256_to_mont,.-ecp_nistz256_to_mont @@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont: .type ecp_nistz256_scatter_w5,@function .align 32 ecp_nistz256_scatter_w5: +.cfi_startproc leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5: movdqa %xmm5,80(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5 @@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5: .type ecp_nistz256_scatter_w7,@function .align 32 ecp_nistz256_scatter_w7: +.cfi_startproc movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7: movdqa %xmm3,48(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7 @@ -5655,26 +5661,16 @@ ecp_nistz256_point_add: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedq - testq %r9,%r9 - jz .Ladd_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedq -.align 32 .Ladd_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedx - testq %r9,%r9 - jz .Ladd_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedx -.align 32 .Ladd_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s index 2a18eaee288ce7..1788e568cda5d2 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s @@ -400,12 +400,14 @@ x25519_fe51_mul121666: .type x25519_fe64_eligible,@function .align 32 x25519_fe64_eligible: +.cfi_startproc movl OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx cmpl $0x80100,%ecx cmovel %ecx,%eax .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_eligible,.-x25519_fe64_eligible .globl x25519_fe64_mul @@ -648,6 +650,7 @@ x25519_fe64_sqr: .align 32 x25519_fe64_mul121666: .Lfe64_mul121666_body: +.cfi_startproc movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -676,6 +679,7 @@ x25519_fe64_mul121666: .Lfe64_mul121666_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_mul121666,.-x25519_fe64_mul121666 .globl x25519_fe64_add @@ -683,6 +687,7 @@ x25519_fe64_mul121666: .align 32 x25519_fe64_add: .Lfe64_add_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -711,6 +716,7 @@ x25519_fe64_add: .Lfe64_add_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_add,.-x25519_fe64_add .globl x25519_fe64_sub @@ -718,6 +724,7 @@ x25519_fe64_add: .align 32 x25519_fe64_sub: .Lfe64_sub_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -746,6 +753,7 @@ x25519_fe64_sub: .Lfe64_sub_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_sub,.-x25519_fe64_sub .globl x25519_fe64_tobytes @@ -753,6 +761,7 @@ x25519_fe64_sub: .align 32 x25519_fe64_tobytes: .Lfe64_to_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -788,5 +797,6 @@ x25519_fe64_tobytes: .Lfe64_to_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_tobytes,.-x25519_fe64_tobytes .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s index 6a7a9577c7142f..01d89630a42f73 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .type _aesni_ctr32_ghash_6x,@function .align 32 _aesni_ctr32_ghash_6x: +.cfi_startproc vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x: vpxor %xmm4,%xmm8,%xmm8 .byte 0xf3,0xc3 +.cfi_endproc .size _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x .globl aesni_gcm_decrypt .type aesni_gcm_decrypt,@function @@ -416,6 +418,7 @@ aesni_gcm_decrypt: .type _aesni_ctr32_6x,@function .align 32 _aesni_ctr32_6x: +.cfi_startproc vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -502,6 +505,7 @@ _aesni_ctr32_6x: vpshufb %xmm0,%xmm1,%xmm1 vpxor %xmm4,%xmm14,%xmm14 jmp .Loop_ctr32 +.cfi_endproc .size _aesni_ctr32_6x,.-_aesni_ctr32_6x .globl aesni_gcm_encrypt diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s index 6f4cac8d3920c1..2636c52bbe5e48 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .type poly1305_init,@function .align 32 poly1305_init: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -42,6 +43,7 @@ poly1305_init: movl $1,%eax .Lno_key: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init,.-poly1305_init .type poly1305_blocks,@function @@ -162,6 +164,7 @@ poly1305_blocks: .type poly1305_emit,@function .align 32 poly1305_emit: +.cfi_startproc .Lemit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -182,10 +185,12 @@ poly1305_emit: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit,.-poly1305_emit .type __poly1305_block,@function .align 32 __poly1305_block: +.cfi_startproc mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -225,11 +230,13 @@ __poly1305_block: adcq $0,%rbx adcq $0,%rbp .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_block,.-__poly1305_block .type __poly1305_init_avx,@function .align 32 __poly1305_init_avx: +.cfi_startproc movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -387,6 +394,7 @@ __poly1305_init_avx: leaq -48-64(%rdi),%rdi .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_init_avx,.-__poly1305_init_avx .type poly1305_blocks_avx,@function @@ -1227,6 +1235,7 @@ poly1305_blocks_avx: .type poly1305_emit_avx,@function .align 32 poly1305_emit_avx: +.cfi_startproc cmpl $0,20(%rdi) je .Lemit @@ -1277,6 +1286,7 @@ poly1305_emit_avx: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_avx,.-poly1305_emit_avx .type poly1305_blocks_avx2,@function .align 32 @@ -1959,6 +1969,7 @@ poly1305_blocks_avx2: .type xor128_encrypt_n_pad,@function .align 16 xor128_encrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -2000,12 +2011,14 @@ xor128_encrypt_n_pad: .Ldone_enc: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_encrypt_n_pad,.-xor128_encrypt_n_pad .globl xor128_decrypt_n_pad .type xor128_decrypt_n_pad,@function .align 16 xor128_decrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -2051,4 +2064,5 @@ xor128_decrypt_n_pad: .Ldone_dec: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_decrypt_n_pad,.-xor128_decrypt_n_pad diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s index fba70351d48d5c..b97c757550aad0 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl RC4 .type RC4,@function .align 16 -RC4: orq %rsi,%rsi +RC4: +.cfi_startproc + orq %rsi,%rsi jne .Lentry .byte 0xf3,0xc3 .Lentry: -.cfi_startproc pushq %rbx .cfi_adjust_cfa_offset 8 .cfi_offset %rbx,-16 @@ -533,6 +534,7 @@ RC4: orq %rsi,%rsi .type RC4_set_key,@function .align 16 RC4_set_key: +.cfi_startproc leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -599,12 +601,14 @@ RC4_set_key: movl %eax,-8(%rdi) movl %eax,-4(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size RC4_set_key,.-RC4_set_key .globl RC4_options .type RC4_options,@function .align 16 RC4_options: +.cfi_startproc leaq .Lopts(%rip),%rax movl OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -617,6 +621,7 @@ RC4_options: addq $12,%rax .Ldone: .byte 0xf3,0xc3 +.cfi_endproc .align 64 .Lopts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s index e511f25035b2b8..09617d014bdb7b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .type __KeccakF1600,@function .align 32 __KeccakF1600: +.cfi_startproc movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -255,6 +256,7 @@ __KeccakF1600: leaq -192(%r15),%r15 .byte 0xf3,0xc3 +.cfi_endproc .size __KeccakF1600,.-__KeccakF1600 .type KeccakF1600,@function diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s index e436521a040f66..98541727e555da 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s @@ -1421,8 +1421,8 @@ _shaext_shortcut: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) -.cfi_endproc .byte 0xf3,0xc3 +.cfi_endproc .size sha1_block_data_order_shaext,.-sha1_block_data_order_shaext .type sha1_block_data_order_ssse3,@function .align 16 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s index 42b24df18e5afe..9357385da3c49b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .align 64 sha256_block_data_order_shaext: _shaext_shortcut: +.cfi_startproc leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1977,6 +1978,7 @@ _shaext_shortcut: movdqu %xmm1,(%rdi) movdqu %xmm2,16(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size sha256_block_data_order_shaext,.-sha256_block_data_order_shaext .type sha256_block_data_order_ssse3,@function .align 64 @@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2: leaq 448(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08 + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s index 5931a2a93234d0..939f1ca71c9394 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2: leaq 1152(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08 + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s index fd17eaaba49576..9268ce8c9a9d63 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s @@ -12,6 +12,7 @@ .type OPENSSL_atomic_add,@function .align 16 OPENSSL_atomic_add: +.cfi_startproc movl (%rdi),%eax .Lspin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -20,16 +21,19 @@ OPENSSL_atomic_add: movl %r8d,%eax .byte 0x48,0x98 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_atomic_add,.-OPENSSL_atomic_add .globl OPENSSL_rdtsc .type OPENSSL_rdtsc,@function .align 16 OPENSSL_rdtsc: +.cfi_startproc rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_rdtsc,.-OPENSSL_rdtsc .globl OPENSSL_ia32_cpuid @@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid: .type OPENSSL_cleanse,@function .align 16 OPENSSL_cleanse: +.cfi_startproc xorq %rax,%rax cmpq $15,%rsi jae .Lot @@ -234,12 +239,14 @@ OPENSSL_cleanse: cmpq $0,%rsi jne .Little .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_cleanse,.-OPENSSL_cleanse .globl CRYPTO_memcmp .type CRYPTO_memcmp,@function .align 16 CRYPTO_memcmp: +.cfi_startproc xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -268,11 +275,13 @@ CRYPTO_memcmp: shrq $63,%rax .Lno_data: .byte 0xf3,0xc3 +.cfi_endproc .size CRYPTO_memcmp,.-CRYPTO_memcmp .globl OPENSSL_wipe_cpu .type OPENSSL_wipe_cpu,@function .align 16 OPENSSL_wipe_cpu: +.cfi_startproc pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -299,11 +308,13 @@ OPENSSL_wipe_cpu: xorq %r11,%r11 leaq 8(%rsp),%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu .globl OPENSSL_instrument_bus .type OPENSSL_instrument_bus,@function .align 16 OPENSSL_instrument_bus: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -330,12 +341,14 @@ OPENSSL_instrument_bus: movq %r11,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus .globl OPENSSL_instrument_bus2 .type OPENSSL_instrument_bus2,@function .align 16 OPENSSL_instrument_bus2: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -378,11 +391,13 @@ OPENSSL_instrument_bus2: movq 8(%rsp),%rax subq %rcx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 .globl OPENSSL_ia32_rdrand_bytes .type OPENSSL_ia32_rdrand_bytes,@function .align 16 OPENSSL_ia32_rdrand_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdrand_bytes @@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes: .Ldone_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes .globl OPENSSL_ia32_rdseed_bytes .type OPENSSL_ia32_rdseed_bytes,@function .align 16 OPENSSL_ia32_rdseed_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdseed_bytes @@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes: .Ldone_rdseed_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h index 6094de421edbe2..80bda2b852187b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h @@ -93,9 +93,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi index 046ed1ab79500b..6ced0528cacc41 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi @@ -15,6 +15,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi index e9ccff96476c79..d56ffb91862e1a 100644 --- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi @@ -723,6 +723,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm index 84e3b187535590..23a0ff1905e00e 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "BSD-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -233,6 +233,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -350,8 +351,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -619,14 +620,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -702,6 +695,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1499,6 +1500,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3218,7 +3225,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3226,6 +3232,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3724,14 +3731,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4172,6 +4171,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4866,49 +4873,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4930,7 +4929,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4944,613 +4942,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5568,188 +5464,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5779,13 +5644,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5795,43 +5658,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5841,31 +5697,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5883,278 +5734,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6164,301 +5969,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6466,7 +6221,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6474,7 +6228,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6482,7 +6235,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6490,7 +6242,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6498,7 +6249,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6506,163 +6256,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6680,229 +6403,191 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_devcrypto.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6910,21 +6595,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6932,13 +6614,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6946,81 +6626,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7028,328 +6695,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7359,85 +6965,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7460,361 +7052,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7836,259 +7368,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8098,31 +7587,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8132,7 +7616,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8158,13 +7641,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8190,7 +7671,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8216,709 +7696,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8969,6 +8331,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9213,7 +8583,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9539,7 +8908,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9585,7 +8953,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9651,7 +9018,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9676,7 +9042,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9774,7 +9139,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9824,18 +9188,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9846,6 +9207,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9909,10 +9274,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9941,6 +9302,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10205,6 +9570,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15100,7 +14466,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15108,6 +14473,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15335,6 +14701,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15437,10 +14811,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15469,6 +14839,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h index 7702df5969293b..06c423068a45b5 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: BSD-x86_64" -#define DATE "built on: Fri Sep 13 15:58:03 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:17 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h index df65780e39519f..ecb2a2aa8bf834 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm index ecd5ebea5fdb19..1354452500558b 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm @@ -15,7 +15,7 @@ our %config = ( ARFLAGS => [ "/nologo" ], AS => "nasm", CC => "gcc", - CFLAGS => [ "/W3 /wd4090 /nologo /O2 /WX" ], + CFLAGS => [ "/W3 /wd4090 /nologo /O2" ], CPP => "\$(CC) /EP /C", CPPDEFINES => [ ], CPPFLAGS => [ ], @@ -53,13 +53,13 @@ our %config = ( export_var_as_fn => "1", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -115,8 +115,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -125,14 +125,14 @@ our %target = ( AS => "nasm", ASFLAGS => "", CC => "cl", - CFLAGS => "/W3 /wd4090 /nologo /O2 /WX", + CFLAGS => "/W3 /wd4090 /nologo /O2", CPP => "\$(CC) /EP /C", HASHBANGPERL => "/usr/bin/env perl", LD => "link", LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x56535777ac98)", + RANLIB => "CODE(0x5567c34c1cd8)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s", @@ -257,6 +257,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -374,8 +375,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -643,14 +644,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -726,6 +719,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1523,6 +1524,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3254,7 +3261,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3262,6 +3268,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3755,14 +3762,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4203,6 +4202,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4912,49 +4919,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4964,7 +4963,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4982,13 +4980,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5002,613 +4998,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5622,7 +5516,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5632,188 +5525,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5843,25 +5705,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5871,31 +5729,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5905,31 +5758,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5947,284 +5795,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6234,295 +6035,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6530,7 +6282,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6538,7 +6289,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6546,7 +6296,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6554,7 +6303,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6562,7 +6310,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6570,163 +6317,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6744,235 +6464,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6980,21 +6661,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7002,13 +6680,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7016,81 +6692,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7098,334 +6761,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7435,79 +7036,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7526,7 +7114,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7536,361 +7123,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7912,265 +7439,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8180,31 +7663,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8214,13 +7692,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8246,19 +7722,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8284,13 +7757,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8316,727 +7787,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9087,6 +8437,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9331,7 +8689,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9657,7 +9014,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9703,7 +9059,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9769,7 +9124,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9794,7 +9148,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9892,7 +9245,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9942,18 +9294,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9964,6 +9313,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10027,10 +9380,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10059,6 +9408,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10323,6 +9676,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15256,7 +14610,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15264,6 +14617,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15491,6 +14845,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15593,10 +14955,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15625,6 +14983,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm deleted file mode 100644 index 7a17e847c64a73..00000000000000 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm +++ /dev/null @@ -1,3211 +0,0 @@ -%ifidn __OUTPUT_FORMAT__,obj -section code use32 class=code align=64 -%elifidn __OUTPUT_FORMAT__,win32 -$@feat.00 equ 1 -section .text code align=64 -%else -section .text code -%endif -align 16 -__x86_AES_encrypt_compact: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov edi,DWORD [ebp-128] - mov esi,DWORD [ebp-96] - mov edi,DWORD [ebp-64] - mov esi,DWORD [ebp-32] - mov edi,DWORD [ebp] - mov esi,DWORD [32+ebp] - mov edi,DWORD [64+ebp] - mov esi,DWORD [96+ebp] -align 16 -L$000loop: - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ch - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,eax - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx eax,ah - movzx eax,BYTE [eax*1+ebp-128] - shl eax,8 - xor edx,eax - mov eax,DWORD [4+esp] - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,24 - xor edx,ecx - mov ecx,esi - mov ebp,2155905152 - and ebp,ecx - lea edi,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,ecx - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,ecx - xor ecx,esi - ror edi,24 - xor esi,ebp - rol ecx,24 - xor esi,edi - mov ebp,2155905152 - xor ecx,esi - and ebp,edx - lea edi,[edx*1+edx] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,edx - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,edx - xor edx,esi - ror edi,24 - xor esi,ebp - rol edx,24 - xor esi,edi - mov ebp,2155905152 - xor edx,esi - and ebp,eax - lea edi,[eax*1+eax] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,eax - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,eax - xor eax,esi - ror edi,24 - xor esi,ebp - rol eax,24 - xor esi,edi - mov ebp,2155905152 - xor eax,esi - and ebp,ebx - lea edi,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,ebx - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,ebx - xor ebx,esi - ror edi,24 - xor esi,ebp - rol ebx,24 - xor esi,edi - xor ebx,esi - mov edi,DWORD [20+esp] - mov ebp,DWORD [28+esp] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$000loop - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ch - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,eax - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx eax,ah - movzx eax,BYTE [eax*1+ebp-128] - shl eax,8 - xor edx,eax - mov eax,DWORD [4+esp] - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,24 - xor edx,ecx - mov ecx,esi - xor eax,DWORD [16+edi] - xor ebx,DWORD [20+edi] - xor ecx,DWORD [24+edi] - xor edx,DWORD [28+edi] - ret -align 16 -__sse_AES_encrypt_compact: - pxor mm0,[edi] - pxor mm4,[8+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov eax,454761243 - mov DWORD [8+esp],eax - mov DWORD [12+esp],eax - mov eax,DWORD [ebp-128] - mov ebx,DWORD [ebp-96] - mov ecx,DWORD [ebp-64] - mov edx,DWORD [ebp-32] - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov edx,DWORD [96+ebp] -align 16 -L$001loop: - pshufw mm1,mm0,8 - pshufw mm5,mm4,13 - movd eax,mm1 - movd ebx,mm5 - mov DWORD [20+esp],edi - movzx esi,al - movzx edx,ah - pshufw mm2,mm0,13 - movzx ecx,BYTE [esi*1+ebp-128] - movzx edi,bl - movzx edx,BYTE [edx*1+ebp-128] - shr eax,16 - shl edx,8 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,16 - pshufw mm6,mm4,8 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,ah - shl esi,24 - shr ebx,16 - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,8 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shl esi,24 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - movd eax,mm2 - movd mm0,ecx - movzx ecx,BYTE [edi*1+ebp-128] - movzx edi,ah - shl ecx,16 - movd ebx,mm6 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,24 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - shl esi,8 - shr ebx,16 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shr eax,16 - movd mm1,ecx - movzx ecx,BYTE [edi*1+ebp-128] - movzx edi,ah - shl ecx,16 - and eax,255 - or ecx,esi - punpckldq mm0,mm1 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,24 - and ebx,255 - movzx eax,BYTE [eax*1+ebp-128] - or ecx,esi - shl eax,16 - movzx esi,BYTE [edi*1+ebp-128] - or edx,eax - shl esi,8 - movzx ebx,BYTE [ebx*1+ebp-128] - or ecx,esi - or edx,ebx - mov edi,DWORD [20+esp] - movd mm4,ecx - movd mm5,edx - punpckldq mm4,mm5 - add edi,16 - cmp edi,DWORD [24+esp] - ja NEAR L$002out - movq mm2,[8+esp] - pxor mm3,mm3 - pxor mm7,mm7 - movq mm1,mm0 - movq mm5,mm4 - pcmpgtb mm3,mm0 - pcmpgtb mm7,mm4 - pand mm3,mm2 - pand mm7,mm2 - pshufw mm2,mm0,177 - pshufw mm6,mm4,177 - paddb mm0,mm0 - paddb mm4,mm4 - pxor mm0,mm3 - pxor mm4,mm7 - pshufw mm3,mm2,177 - pshufw mm7,mm6,177 - pxor mm1,mm0 - pxor mm5,mm4 - pxor mm0,mm2 - pxor mm4,mm6 - movq mm2,mm3 - movq mm6,mm7 - pslld mm3,8 - pslld mm7,8 - psrld mm2,24 - psrld mm6,24 - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm0,mm2 - pxor mm4,mm6 - movq mm3,mm1 - movq mm7,mm5 - movq mm2,[edi] - movq mm6,[8+edi] - psrld mm1,8 - psrld mm5,8 - mov eax,DWORD [ebp-128] - pslld mm3,24 - pslld mm7,24 - mov ebx,DWORD [ebp-64] - pxor mm0,mm1 - pxor mm4,mm5 - mov ecx,DWORD [ebp] - pxor mm0,mm3 - pxor mm4,mm7 - mov edx,DWORD [64+ebp] - pxor mm0,mm2 - pxor mm4,mm6 - jmp NEAR L$001loop -align 16 -L$002out: - pxor mm0,[edi] - pxor mm4,[8+edi] - ret -align 16 -__x86_AES_encrypt: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi -align 16 -L$003loop: - mov esi,eax - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,bh - xor esi,DWORD [3+edi*8+ebp] - mov edi,ecx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,edx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - mov esi,DWORD [esi*8+ebp] - movzx edi,ch - xor esi,DWORD [3+edi*8+ebp] - mov edi,edx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,eax - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - mov esi,DWORD [esi*8+ebp] - movzx edi,dh - xor esi,DWORD [3+edi*8+ebp] - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - movzx edi,bh - xor esi,DWORD [1+edi*8+ebp] - mov edi,DWORD [20+esp] - mov edx,DWORD [edx*8+ebp] - movzx eax,ah - xor edx,DWORD [3+eax*8+ebp] - mov eax,DWORD [4+esp] - and ebx,255 - xor edx,DWORD [2+ebx*8+ebp] - mov ebx,DWORD [8+esp] - xor edx,DWORD [1+ecx*8+ebp] - mov ecx,esi - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$003loop - mov esi,eax - and esi,255 - mov esi,DWORD [2+esi*8+ebp] - and esi,255 - movzx edi,bh - mov edi,DWORD [edi*8+ebp] - and edi,65280 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - mov edi,DWORD [edi*8+ebp] - and edi,16711680 - xor esi,edi - mov edi,edx - shr edi,24 - mov edi,DWORD [2+edi*8+ebp] - and edi,4278190080 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - mov esi,DWORD [2+esi*8+ebp] - and esi,255 - movzx edi,ch - mov edi,DWORD [edi*8+ebp] - and edi,65280 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - mov edi,DWORD [edi*8+ebp] - and edi,16711680 - xor esi,edi - mov edi,eax - shr edi,24 - mov edi,DWORD [2+edi*8+ebp] - and edi,4278190080 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - mov esi,DWORD [2+esi*8+ebp] - and esi,255 - movzx edi,dh - mov edi,DWORD [edi*8+ebp] - and edi,65280 - xor esi,edi - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - mov edi,DWORD [edi*8+ebp] - and edi,16711680 - xor esi,edi - movzx edi,bh - mov edi,DWORD [2+edi*8+ebp] - and edi,4278190080 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - mov edx,DWORD [2+edx*8+ebp] - and edx,255 - movzx eax,ah - mov eax,DWORD [eax*8+ebp] - and eax,65280 - xor edx,eax - mov eax,DWORD [4+esp] - and ebx,255 - mov ebx,DWORD [ebx*8+ebp] - and ebx,16711680 - xor edx,ebx - mov ebx,DWORD [8+esp] - mov ecx,DWORD [2+ecx*8+ebp] - and ecx,4278190080 - xor edx,ecx - mov ecx,esi - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - ret -align 64 -L$AES_Te: -dd 2774754246,2774754246 -dd 2222750968,2222750968 -dd 2574743534,2574743534 -dd 2373680118,2373680118 -dd 234025727,234025727 -dd 3177933782,3177933782 -dd 2976870366,2976870366 -dd 1422247313,1422247313 -dd 1345335392,1345335392 -dd 50397442,50397442 -dd 2842126286,2842126286 -dd 2099981142,2099981142 -dd 436141799,436141799 -dd 1658312629,1658312629 -dd 3870010189,3870010189 -dd 2591454956,2591454956 -dd 1170918031,1170918031 -dd 2642575903,2642575903 -dd 1086966153,1086966153 -dd 2273148410,2273148410 -dd 368769775,368769775 -dd 3948501426,3948501426 -dd 3376891790,3376891790 -dd 200339707,200339707 -dd 3970805057,3970805057 -dd 1742001331,1742001331 -dd 4255294047,4255294047 -dd 3937382213,3937382213 -dd 3214711843,3214711843 -dd 4154762323,4154762323 -dd 2524082916,2524082916 -dd 1539358875,1539358875 -dd 3266819957,3266819957 -dd 486407649,486407649 -dd 2928907069,2928907069 -dd 1780885068,1780885068 -dd 1513502316,1513502316 -dd 1094664062,1094664062 -dd 49805301,49805301 -dd 1338821763,1338821763 -dd 1546925160,1546925160 -dd 4104496465,4104496465 -dd 887481809,887481809 -dd 150073849,150073849 -dd 2473685474,2473685474 -dd 1943591083,1943591083 -dd 1395732834,1395732834 -dd 1058346282,1058346282 -dd 201589768,201589768 -dd 1388824469,1388824469 -dd 1696801606,1696801606 -dd 1589887901,1589887901 -dd 672667696,672667696 -dd 2711000631,2711000631 -dd 251987210,251987210 -dd 3046808111,3046808111 -dd 151455502,151455502 -dd 907153956,907153956 -dd 2608889883,2608889883 -dd 1038279391,1038279391 -dd 652995533,652995533 -dd 1764173646,1764173646 -dd 3451040383,3451040383 -dd 2675275242,2675275242 -dd 453576978,453576978 -dd 2659418909,2659418909 -dd 1949051992,1949051992 -dd 773462580,773462580 -dd 756751158,756751158 -dd 2993581788,2993581788 -dd 3998898868,3998898868 -dd 4221608027,4221608027 -dd 4132590244,4132590244 -dd 1295727478,1295727478 -dd 1641469623,1641469623 -dd 3467883389,3467883389 -dd 2066295122,2066295122 -dd 1055122397,1055122397 -dd 1898917726,1898917726 -dd 2542044179,2542044179 -dd 4115878822,4115878822 -dd 1758581177,1758581177 -dd 0,0 -dd 753790401,753790401 -dd 1612718144,1612718144 -dd 536673507,536673507 -dd 3367088505,3367088505 -dd 3982187446,3982187446 -dd 3194645204,3194645204 -dd 1187761037,1187761037 -dd 3653156455,3653156455 -dd 1262041458,1262041458 -dd 3729410708,3729410708 -dd 3561770136,3561770136 -dd 3898103984,3898103984 -dd 1255133061,1255133061 -dd 1808847035,1808847035 -dd 720367557,720367557 -dd 3853167183,3853167183 -dd 385612781,385612781 -dd 3309519750,3309519750 -dd 3612167578,3612167578 -dd 1429418854,1429418854 -dd 2491778321,2491778321 -dd 3477423498,3477423498 -dd 284817897,284817897 -dd 100794884,100794884 -dd 2172616702,2172616702 -dd 4031795360,4031795360 -dd 1144798328,1144798328 -dd 3131023141,3131023141 -dd 3819481163,3819481163 -dd 4082192802,4082192802 -dd 4272137053,4272137053 -dd 3225436288,3225436288 -dd 2324664069,2324664069 -dd 2912064063,2912064063 -dd 3164445985,3164445985 -dd 1211644016,1211644016 -dd 83228145,83228145 -dd 3753688163,3753688163 -dd 3249976951,3249976951 -dd 1977277103,1977277103 -dd 1663115586,1663115586 -dd 806359072,806359072 -dd 452984805,452984805 -dd 250868733,250868733 -dd 1842533055,1842533055 -dd 1288555905,1288555905 -dd 336333848,336333848 -dd 890442534,890442534 -dd 804056259,804056259 -dd 3781124030,3781124030 -dd 2727843637,2727843637 -dd 3427026056,3427026056 -dd 957814574,957814574 -dd 1472513171,1472513171 -dd 4071073621,4071073621 -dd 2189328124,2189328124 -dd 1195195770,1195195770 -dd 2892260552,2892260552 -dd 3881655738,3881655738 -dd 723065138,723065138 -dd 2507371494,2507371494 -dd 2690670784,2690670784 -dd 2558624025,2558624025 -dd 3511635870,3511635870 -dd 2145180835,2145180835 -dd 1713513028,1713513028 -dd 2116692564,2116692564 -dd 2878378043,2878378043 -dd 2206763019,2206763019 -dd 3393603212,3393603212 -dd 703524551,703524551 -dd 3552098411,3552098411 -dd 1007948840,1007948840 -dd 2044649127,2044649127 -dd 3797835452,3797835452 -dd 487262998,487262998 -dd 1994120109,1994120109 -dd 1004593371,1004593371 -dd 1446130276,1446130276 -dd 1312438900,1312438900 -dd 503974420,503974420 -dd 3679013266,3679013266 -dd 168166924,168166924 -dd 1814307912,1814307912 -dd 3831258296,3831258296 -dd 1573044895,1573044895 -dd 1859376061,1859376061 -dd 4021070915,4021070915 -dd 2791465668,2791465668 -dd 2828112185,2828112185 -dd 2761266481,2761266481 -dd 937747667,937747667 -dd 2339994098,2339994098 -dd 854058965,854058965 -dd 1137232011,1137232011 -dd 1496790894,1496790894 -dd 3077402074,3077402074 -dd 2358086913,2358086913 -dd 1691735473,1691735473 -dd 3528347292,3528347292 -dd 3769215305,3769215305 -dd 3027004632,3027004632 -dd 4199962284,4199962284 -dd 133494003,133494003 -dd 636152527,636152527 -dd 2942657994,2942657994 -dd 2390391540,2390391540 -dd 3920539207,3920539207 -dd 403179536,403179536 -dd 3585784431,3585784431 -dd 2289596656,2289596656 -dd 1864705354,1864705354 -dd 1915629148,1915629148 -dd 605822008,605822008 -dd 4054230615,4054230615 -dd 3350508659,3350508659 -dd 1371981463,1371981463 -dd 602466507,602466507 -dd 2094914977,2094914977 -dd 2624877800,2624877800 -dd 555687742,555687742 -dd 3712699286,3712699286 -dd 3703422305,3703422305 -dd 2257292045,2257292045 -dd 2240449039,2240449039 -dd 2423288032,2423288032 -dd 1111375484,1111375484 -dd 3300242801,3300242801 -dd 2858837708,2858837708 -dd 3628615824,3628615824 -dd 84083462,84083462 -dd 32962295,32962295 -dd 302911004,302911004 -dd 2741068226,2741068226 -dd 1597322602,1597322602 -dd 4183250862,4183250862 -dd 3501832553,3501832553 -dd 2441512471,2441512471 -dd 1489093017,1489093017 -dd 656219450,656219450 -dd 3114180135,3114180135 -dd 954327513,954327513 -dd 335083755,335083755 -dd 3013122091,3013122091 -dd 856756514,856756514 -dd 3144247762,3144247762 -dd 1893325225,1893325225 -dd 2307821063,2307821063 -dd 2811532339,2811532339 -dd 3063651117,3063651117 -dd 572399164,572399164 -dd 2458355477,2458355477 -dd 552200649,552200649 -dd 1238290055,1238290055 -dd 4283782570,4283782570 -dd 2015897680,2015897680 -dd 2061492133,2061492133 -dd 2408352771,2408352771 -dd 4171342169,4171342169 -dd 2156497161,2156497161 -dd 386731290,386731290 -dd 3669999461,3669999461 -dd 837215959,837215959 -dd 3326231172,3326231172 -dd 3093850320,3093850320 -dd 3275833730,3275833730 -dd 2962856233,2962856233 -dd 1999449434,1999449434 -dd 286199582,286199582 -dd 3417354363,3417354363 -dd 4233385128,4233385128 -dd 3602627437,3602627437 -dd 974525996,974525996 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -dd 1,2,4,8 -dd 16,32,64,128 -dd 27,54,0,0 -dd 0,0,0,0 -global _AES_encrypt -align 16 -_AES_encrypt: -L$_AES_encrypt_begin: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [20+esp] - mov edi,DWORD [28+esp] - mov eax,esp - sub esp,36 - and esp,-64 - lea ebx,[edi-127] - sub ebx,esp - neg ebx - and ebx,960 - sub esp,ebx - add esp,4 - mov DWORD [28+esp],eax - call L$004pic_point -L$004pic_point: - pop ebp - lea eax,[_OPENSSL_ia32cap_P] - lea ebp,[(L$AES_Te-L$004pic_point)+ebp] - lea ebx,[764+esp] - sub ebx,ebp - and ebx,768 - lea ebp,[2176+ebx*1+ebp] - bt DWORD [eax],25 - jnc NEAR L$005x86 - movq mm0,[esi] - movq mm4,[8+esi] - call __sse_AES_encrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - movq [esi],mm0 - movq [8+esi],mm4 - emms - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -L$005x86: - mov DWORD [24+esp],ebp - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - call __x86_AES_encrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -__x86_AES_decrypt_compact: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov edi,DWORD [ebp-128] - mov esi,DWORD [ebp-96] - mov edi,DWORD [ebp-64] - mov esi,DWORD [ebp-32] - mov edi,DWORD [ebp] - mov esi,DWORD [32+ebp] - mov edi,DWORD [64+ebp] - mov esi,DWORD [96+ebp] -align 16 -L$006loop: - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ebx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ah - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ecx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx ecx,ch - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,8 - xor edx,ecx - mov ecx,esi - shr ebx,16 - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - shr eax,24 - movzx eax,BYTE [eax*1+ebp-128] - shl eax,24 - xor edx,eax - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea eax,[ecx*1+ecx] - sub esi,edi - and eax,4278124286 - and esi,454761243 - xor eax,esi - mov edi,2155905152 - and edi,eax - mov esi,edi - shr edi,7 - lea ebx,[eax*1+eax] - sub esi,edi - and ebx,4278124286 - and esi,454761243 - xor eax,ecx - xor ebx,esi - mov edi,2155905152 - and edi,ebx - mov esi,edi - shr edi,7 - lea ebp,[ebx*1+ebx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor ebx,ecx - rol ecx,8 - xor ebp,esi - xor ecx,eax - xor eax,ebp - xor ecx,ebx - xor ebx,ebp - rol eax,24 - xor ecx,ebp - rol ebx,16 - xor ecx,eax - rol ebp,8 - xor ecx,ebx - mov eax,DWORD [4+esp] - xor ecx,ebp - mov DWORD [12+esp],ecx - mov edi,2155905152 - and edi,edx - mov esi,edi - shr edi,7 - lea ebx,[edx*1+edx] - sub esi,edi - and ebx,4278124286 - and esi,454761243 - xor ebx,esi - mov edi,2155905152 - and edi,ebx - mov esi,edi - shr edi,7 - lea ecx,[ebx*1+ebx] - sub esi,edi - and ecx,4278124286 - and esi,454761243 - xor ebx,edx - xor ecx,esi - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea ebp,[ecx*1+ecx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor ecx,edx - rol edx,8 - xor ebp,esi - xor edx,ebx - xor ebx,ebp - xor edx,ecx - xor ecx,ebp - rol ebx,24 - xor edx,ebp - rol ecx,16 - xor edx,ebx - rol ebp,8 - xor edx,ecx - mov ebx,DWORD [8+esp] - xor edx,ebp - mov DWORD [16+esp],edx - mov edi,2155905152 - and edi,eax - mov esi,edi - shr edi,7 - lea ecx,[eax*1+eax] - sub esi,edi - and ecx,4278124286 - and esi,454761243 - xor ecx,esi - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea edx,[ecx*1+ecx] - sub esi,edi - and edx,4278124286 - and esi,454761243 - xor ecx,eax - xor edx,esi - mov edi,2155905152 - and edi,edx - mov esi,edi - shr edi,7 - lea ebp,[edx*1+edx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor edx,eax - rol eax,8 - xor ebp,esi - xor eax,ecx - xor ecx,ebp - xor eax,edx - xor edx,ebp - rol ecx,24 - xor eax,ebp - rol edx,16 - xor eax,ecx - rol ebp,8 - xor eax,edx - xor eax,ebp - mov edi,2155905152 - and edi,ebx - mov esi,edi - shr edi,7 - lea ecx,[ebx*1+ebx] - sub esi,edi - and ecx,4278124286 - and esi,454761243 - xor ecx,esi - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea edx,[ecx*1+ecx] - sub esi,edi - and edx,4278124286 - and esi,454761243 - xor ecx,ebx - xor edx,esi - mov edi,2155905152 - and edi,edx - mov esi,edi - shr edi,7 - lea ebp,[edx*1+edx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor edx,ebx - rol ebx,8 - xor ebp,esi - xor ebx,ecx - xor ecx,ebp - xor ebx,edx - xor edx,ebp - rol ecx,24 - xor ebx,ebp - rol edx,16 - xor ebx,ecx - rol ebp,8 - xor ebx,edx - mov ecx,DWORD [12+esp] - xor ebx,ebp - mov edx,DWORD [16+esp] - mov edi,DWORD [20+esp] - mov ebp,DWORD [28+esp] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$006loop - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ebx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ah - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ecx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx ecx,ch - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,8 - xor edx,ecx - mov ecx,esi - shr ebx,16 - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - shr eax,24 - movzx eax,BYTE [eax*1+ebp-128] - shl eax,24 - xor edx,eax - mov eax,DWORD [4+esp] - xor eax,DWORD [16+edi] - xor ebx,DWORD [20+edi] - xor ecx,DWORD [24+edi] - xor edx,DWORD [28+edi] - ret -align 16 -__sse_AES_decrypt_compact: - pxor mm0,[edi] - pxor mm4,[8+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov eax,454761243 - mov DWORD [8+esp],eax - mov DWORD [12+esp],eax - mov eax,DWORD [ebp-128] - mov ebx,DWORD [ebp-96] - mov ecx,DWORD [ebp-64] - mov edx,DWORD [ebp-32] - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov edx,DWORD [96+ebp] -align 16 -L$007loop: - pshufw mm1,mm0,12 - pshufw mm5,mm4,9 - movd eax,mm1 - movd ebx,mm5 - mov DWORD [20+esp],edi - movzx esi,al - movzx edx,ah - pshufw mm2,mm0,6 - movzx ecx,BYTE [esi*1+ebp-128] - movzx edi,bl - movzx edx,BYTE [edx*1+ebp-128] - shr eax,16 - shl edx,8 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,16 - pshufw mm6,mm4,3 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,ah - shl esi,24 - shr ebx,16 - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,24 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shl esi,8 - movd eax,mm2 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - shl esi,16 - movd ebx,mm6 - movd mm0,ecx - movzx ecx,BYTE [edi*1+ebp-128] - movzx edi,al - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,ah - shl esi,16 - shr eax,16 - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shr ebx,16 - shl esi,8 - movd mm1,edx - movzx edx,BYTE [edi*1+ebp-128] - movzx edi,bh - shl edx,24 - and ebx,255 - or edx,esi - punpckldq mm0,mm1 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shl esi,8 - movzx eax,ah - movzx ebx,BYTE [ebx*1+ebp-128] - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - or edx,ebx - shl esi,16 - movzx eax,BYTE [eax*1+ebp-128] - or edx,esi - shl eax,24 - or ecx,eax - mov edi,DWORD [20+esp] - movd mm4,edx - movd mm5,ecx - punpckldq mm4,mm5 - add edi,16 - cmp edi,DWORD [24+esp] - ja NEAR L$008out - movq mm3,mm0 - movq mm7,mm4 - pshufw mm2,mm0,228 - pshufw mm6,mm4,228 - movq mm1,mm0 - movq mm5,mm4 - pshufw mm0,mm0,177 - pshufw mm4,mm4,177 - pslld mm2,8 - pslld mm6,8 - psrld mm3,8 - psrld mm7,8 - pxor mm0,mm2 - pxor mm4,mm6 - pxor mm0,mm3 - pxor mm4,mm7 - pslld mm2,16 - pslld mm6,16 - psrld mm3,16 - psrld mm7,16 - pxor mm0,mm2 - pxor mm4,mm6 - pxor mm0,mm3 - pxor mm4,mm7 - movq mm3,[8+esp] - pxor mm2,mm2 - pxor mm6,mm6 - pcmpgtb mm2,mm1 - pcmpgtb mm6,mm5 - pand mm2,mm3 - pand mm6,mm3 - paddb mm1,mm1 - paddb mm5,mm5 - pxor mm1,mm2 - pxor mm5,mm6 - movq mm3,mm1 - movq mm7,mm5 - movq mm2,mm1 - movq mm6,mm5 - pxor mm0,mm1 - pxor mm4,mm5 - pslld mm3,24 - pslld mm7,24 - psrld mm2,8 - psrld mm6,8 - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm0,mm2 - pxor mm4,mm6 - movq mm2,[8+esp] - pxor mm3,mm3 - pxor mm7,mm7 - pcmpgtb mm3,mm1 - pcmpgtb mm7,mm5 - pand mm3,mm2 - pand mm7,mm2 - paddb mm1,mm1 - paddb mm5,mm5 - pxor mm1,mm3 - pxor mm5,mm7 - pshufw mm3,mm1,177 - pshufw mm7,mm5,177 - pxor mm0,mm1 - pxor mm4,mm5 - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm3,mm3 - pxor mm7,mm7 - pcmpgtb mm3,mm1 - pcmpgtb mm7,mm5 - pand mm3,mm2 - pand mm7,mm2 - paddb mm1,mm1 - paddb mm5,mm5 - pxor mm1,mm3 - pxor mm5,mm7 - pxor mm0,mm1 - pxor mm4,mm5 - movq mm3,mm1 - movq mm7,mm5 - pshufw mm2,mm1,177 - pshufw mm6,mm5,177 - pxor mm0,mm2 - pxor mm4,mm6 - pslld mm1,8 - pslld mm5,8 - psrld mm3,8 - psrld mm7,8 - movq mm2,[edi] - movq mm6,[8+edi] - pxor mm0,mm1 - pxor mm4,mm5 - pxor mm0,mm3 - pxor mm4,mm7 - mov eax,DWORD [ebp-128] - pslld mm1,16 - pslld mm5,16 - mov ebx,DWORD [ebp-64] - psrld mm3,16 - psrld mm7,16 - mov ecx,DWORD [ebp] - pxor mm0,mm1 - pxor mm4,mm5 - mov edx,DWORD [64+ebp] - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm0,mm2 - pxor mm4,mm6 - jmp NEAR L$007loop -align 16 -L$008out: - pxor mm0,[edi] - pxor mm4,[8+edi] - ret -align 16 -__x86_AES_decrypt: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi -align 16 -L$009loop: - mov esi,eax - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,dh - xor esi,DWORD [3+edi*8+ebp] - mov edi,ecx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,ebx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,ah - xor esi,DWORD [3+edi*8+ebp] - mov edi,edx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,ecx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,bh - xor esi,DWORD [3+edi*8+ebp] - mov edi,eax - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,edx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov edi,DWORD [20+esp] - and edx,255 - mov edx,DWORD [edx*8+ebp] - movzx ecx,ch - xor edx,DWORD [3+ecx*8+ebp] - mov ecx,esi - shr ebx,16 - and ebx,255 - xor edx,DWORD [2+ebx*8+ebp] - mov ebx,DWORD [8+esp] - shr eax,24 - xor edx,DWORD [1+eax*8+ebp] - mov eax,DWORD [4+esp] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$009loop - lea ebp,[2176+ebp] - mov edi,DWORD [ebp-128] - mov esi,DWORD [ebp-96] - mov edi,DWORD [ebp-64] - mov esi,DWORD [ebp-32] - mov edi,DWORD [ebp] - mov esi,DWORD [32+ebp] - mov edi,DWORD [64+ebp] - mov esi,DWORD [96+ebp] - lea ebp,[ebp-128] - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp] - shl edi,16 - xor esi,edi - mov edi,ebx - shr edi,24 - movzx edi,BYTE [edi*1+ebp] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - movzx esi,BYTE [esi*1+ebp] - movzx edi,ah - movzx edi,BYTE [edi*1+ebp] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp] - shl edi,16 - xor esi,edi - mov edi,ecx - shr edi,24 - movzx edi,BYTE [edi*1+ebp] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - movzx esi,BYTE [esi*1+ebp] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp] - shl edi,24 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - movzx edx,BYTE [edx*1+ebp] - movzx ecx,ch - movzx ecx,BYTE [ecx*1+ebp] - shl ecx,8 - xor edx,ecx - mov ecx,esi - shr ebx,16 - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - shr eax,24 - movzx eax,BYTE [eax*1+ebp] - shl eax,24 - xor edx,eax - mov eax,DWORD [4+esp] - lea ebp,[ebp-2048] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - ret -align 64 -L$AES_Td: -dd 1353184337,1353184337 -dd 1399144830,1399144830 -dd 3282310938,3282310938 -dd 2522752826,2522752826 -dd 3412831035,3412831035 -dd 4047871263,4047871263 -dd 2874735276,2874735276 -dd 2466505547,2466505547 -dd 1442459680,1442459680 -dd 4134368941,4134368941 -dd 2440481928,2440481928 -dd 625738485,625738485 -dd 4242007375,4242007375 -dd 3620416197,3620416197 -dd 2151953702,2151953702 -dd 2409849525,2409849525 -dd 1230680542,1230680542 -dd 1729870373,1729870373 -dd 2551114309,2551114309 -dd 3787521629,3787521629 -dd 41234371,41234371 -dd 317738113,317738113 -dd 2744600205,2744600205 -dd 3338261355,3338261355 -dd 3881799427,3881799427 -dd 2510066197,2510066197 -dd 3950669247,3950669247 -dd 3663286933,3663286933 -dd 763608788,763608788 -dd 3542185048,3542185048 -dd 694804553,694804553 -dd 1154009486,1154009486 -dd 1787413109,1787413109 -dd 2021232372,2021232372 -dd 1799248025,1799248025 -dd 3715217703,3715217703 -dd 3058688446,3058688446 -dd 397248752,397248752 -dd 1722556617,1722556617 -dd 3023752829,3023752829 -dd 407560035,407560035 -dd 2184256229,2184256229 -dd 1613975959,1613975959 -dd 1165972322,1165972322 -dd 3765920945,3765920945 -dd 2226023355,2226023355 -dd 480281086,480281086 -dd 2485848313,2485848313 -dd 1483229296,1483229296 -dd 436028815,436028815 -dd 2272059028,2272059028 -dd 3086515026,3086515026 -dd 601060267,601060267 -dd 3791801202,3791801202 -dd 1468997603,1468997603 -dd 715871590,715871590 -dd 120122290,120122290 -dd 63092015,63092015 -dd 2591802758,2591802758 -dd 2768779219,2768779219 -dd 4068943920,4068943920 -dd 2997206819,2997206819 -dd 3127509762,3127509762 -dd 1552029421,1552029421 -dd 723308426,723308426 -dd 2461301159,2461301159 -dd 4042393587,4042393587 -dd 2715969870,2715969870 -dd 3455375973,3455375973 -dd 3586000134,3586000134 -dd 526529745,526529745 -dd 2331944644,2331944644 -dd 2639474228,2639474228 -dd 2689987490,2689987490 -dd 853641733,853641733 -dd 1978398372,1978398372 -dd 971801355,971801355 -dd 2867814464,2867814464 -dd 111112542,111112542 -dd 1360031421,1360031421 -dd 4186579262,4186579262 -dd 1023860118,1023860118 -dd 2919579357,2919579357 -dd 1186850381,1186850381 -dd 3045938321,3045938321 -dd 90031217,90031217 -dd 1876166148,1876166148 -dd 4279586912,4279586912 -dd 620468249,620468249 -dd 2548678102,2548678102 -dd 3426959497,3426959497 -dd 2006899047,2006899047 -dd 3175278768,3175278768 -dd 2290845959,2290845959 -dd 945494503,945494503 -dd 3689859193,3689859193 -dd 1191869601,1191869601 -dd 3910091388,3910091388 -dd 3374220536,3374220536 -dd 0,0 -dd 2206629897,2206629897 -dd 1223502642,1223502642 -dd 2893025566,2893025566 -dd 1316117100,1316117100 -dd 4227796733,4227796733 -dd 1446544655,1446544655 -dd 517320253,517320253 -dd 658058550,658058550 -dd 1691946762,1691946762 -dd 564550760,564550760 -dd 3511966619,3511966619 -dd 976107044,976107044 -dd 2976320012,2976320012 -dd 266819475,266819475 -dd 3533106868,3533106868 -dd 2660342555,2660342555 -dd 1338359936,1338359936 -dd 2720062561,2720062561 -dd 1766553434,1766553434 -dd 370807324,370807324 -dd 179999714,179999714 -dd 3844776128,3844776128 -dd 1138762300,1138762300 -dd 488053522,488053522 -dd 185403662,185403662 -dd 2915535858,2915535858 -dd 3114841645,3114841645 -dd 3366526484,3366526484 -dd 2233069911,2233069911 -dd 1275557295,1275557295 -dd 3151862254,3151862254 -dd 4250959779,4250959779 -dd 2670068215,2670068215 -dd 3170202204,3170202204 -dd 3309004356,3309004356 -dd 880737115,880737115 -dd 1982415755,1982415755 -dd 3703972811,3703972811 -dd 1761406390,1761406390 -dd 1676797112,1676797112 -dd 3403428311,3403428311 -dd 277177154,277177154 -dd 1076008723,1076008723 -dd 538035844,538035844 -dd 2099530373,2099530373 -dd 4164795346,4164795346 -dd 288553390,288553390 -dd 1839278535,1839278535 -dd 1261411869,1261411869 -dd 4080055004,4080055004 -dd 3964831245,3964831245 -dd 3504587127,3504587127 -dd 1813426987,1813426987 -dd 2579067049,2579067049 -dd 4199060497,4199060497 -dd 577038663,577038663 -dd 3297574056,3297574056 -dd 440397984,440397984 -dd 3626794326,3626794326 -dd 4019204898,4019204898 -dd 3343796615,3343796615 -dd 3251714265,3251714265 -dd 4272081548,4272081548 -dd 906744984,906744984 -dd 3481400742,3481400742 -dd 685669029,685669029 -dd 646887386,646887386 -dd 2764025151,2764025151 -dd 3835509292,3835509292 -dd 227702864,227702864 -dd 2613862250,2613862250 -dd 1648787028,1648787028 -dd 3256061430,3256061430 -dd 3904428176,3904428176 -dd 1593260334,1593260334 -dd 4121936770,4121936770 -dd 3196083615,3196083615 -dd 2090061929,2090061929 -dd 2838353263,2838353263 -dd 3004310991,3004310991 -dd 999926984,999926984 -dd 2809993232,2809993232 -dd 1852021992,1852021992 -dd 2075868123,2075868123 -dd 158869197,158869197 -dd 4095236462,4095236462 -dd 28809964,28809964 -dd 2828685187,2828685187 -dd 1701746150,1701746150 -dd 2129067946,2129067946 -dd 147831841,147831841 -dd 3873969647,3873969647 -dd 3650873274,3650873274 -dd 3459673930,3459673930 -dd 3557400554,3557400554 -dd 3598495785,3598495785 -dd 2947720241,2947720241 -dd 824393514,824393514 -dd 815048134,815048134 -dd 3227951669,3227951669 -dd 935087732,935087732 -dd 2798289660,2798289660 -dd 2966458592,2966458592 -dd 366520115,366520115 -dd 1251476721,1251476721 -dd 4158319681,4158319681 -dd 240176511,240176511 -dd 804688151,804688151 -dd 2379631990,2379631990 -dd 1303441219,1303441219 -dd 1414376140,1414376140 -dd 3741619940,3741619940 -dd 3820343710,3820343710 -dd 461924940,461924940 -dd 3089050817,3089050817 -dd 2136040774,2136040774 -dd 82468509,82468509 -dd 1563790337,1563790337 -dd 1937016826,1937016826 -dd 776014843,776014843 -dd 1511876531,1511876531 -dd 1389550482,1389550482 -dd 861278441,861278441 -dd 323475053,323475053 -dd 2355222426,2355222426 -dd 2047648055,2047648055 -dd 2383738969,2383738969 -dd 2302415851,2302415851 -dd 3995576782,3995576782 -dd 902390199,902390199 -dd 3991215329,3991215329 -dd 1018251130,1018251130 -dd 1507840668,1507840668 -dd 1064563285,1064563285 -dd 2043548696,2043548696 -dd 3208103795,3208103795 -dd 3939366739,3939366739 -dd 1537932639,1537932639 -dd 342834655,342834655 -dd 2262516856,2262516856 -dd 2180231114,2180231114 -dd 1053059257,1053059257 -dd 741614648,741614648 -dd 1598071746,1598071746 -dd 1925389590,1925389590 -dd 203809468,203809468 -dd 2336832552,2336832552 -dd 1100287487,1100287487 -dd 1895934009,1895934009 -dd 3736275976,3736275976 -dd 2632234200,2632234200 -dd 2428589668,2428589668 -dd 1636092795,1636092795 -dd 1890988757,1890988757 -dd 1952214088,1952214088 -dd 1113045200,1113045200 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -global _AES_decrypt -align 16 -_AES_decrypt: -L$_AES_decrypt_begin: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [20+esp] - mov edi,DWORD [28+esp] - mov eax,esp - sub esp,36 - and esp,-64 - lea ebx,[edi-127] - sub ebx,esp - neg ebx - and ebx,960 - sub esp,ebx - add esp,4 - mov DWORD [28+esp],eax - call L$010pic_point -L$010pic_point: - pop ebp - lea eax,[_OPENSSL_ia32cap_P] - lea ebp,[(L$AES_Td-L$010pic_point)+ebp] - lea ebx,[764+esp] - sub ebx,ebp - and ebx,768 - lea ebp,[2176+ebx*1+ebp] - bt DWORD [eax],25 - jnc NEAR L$011x86 - movq mm0,[esi] - movq mm4,[8+esi] - call __sse_AES_decrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - movq [esi],mm0 - movq [8+esi],mm4 - emms - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -L$011x86: - mov DWORD [24+esp],ebp - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - call __x86_AES_decrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - pop edi - pop esi - pop ebx - pop ebp - ret -global _AES_cbc_encrypt -align 16 -_AES_cbc_encrypt: -L$_AES_cbc_encrypt_begin: - push ebp - push ebx - push esi - push edi - mov ecx,DWORD [28+esp] - cmp ecx,0 - je NEAR L$012drop_out - call L$013pic_point -L$013pic_point: - pop ebp - lea eax,[_OPENSSL_ia32cap_P] - cmp DWORD [40+esp],0 - lea ebp,[(L$AES_Te-L$013pic_point)+ebp] - jne NEAR L$014picked_te - lea ebp,[(L$AES_Td-L$AES_Te)+ebp] -L$014picked_te: - pushfd - cld - cmp ecx,512 - jb NEAR L$015slow_way - test ecx,15 - jnz NEAR L$015slow_way - bt DWORD [eax],28 - jc NEAR L$015slow_way - lea esi,[esp-324] - and esi,-64 - mov eax,ebp - lea ebx,[2304+ebp] - mov edx,esi - and eax,4095 - and ebx,4095 - and edx,4095 - cmp edx,ebx - jb NEAR L$016tbl_break_out - sub edx,ebx - sub esi,edx - jmp NEAR L$017tbl_ok -align 4 -L$016tbl_break_out: - sub edx,eax - and edx,4095 - add edx,384 - sub esi,edx -align 4 -L$017tbl_ok: - lea edx,[24+esp] - xchg esp,esi - add esp,4 - mov DWORD [24+esp],ebp - mov DWORD [28+esp],esi - mov eax,DWORD [edx] - mov ebx,DWORD [4+edx] - mov edi,DWORD [12+edx] - mov esi,DWORD [16+edx] - mov edx,DWORD [20+edx] - mov DWORD [32+esp],eax - mov DWORD [36+esp],ebx - mov DWORD [40+esp],ecx - mov DWORD [44+esp],edi - mov DWORD [48+esp],esi - mov DWORD [316+esp],0 - mov ebx,edi - mov ecx,61 - sub ebx,ebp - mov esi,edi - and ebx,4095 - lea edi,[76+esp] - cmp ebx,2304 - jb NEAR L$018do_copy - cmp ebx,3852 - jb NEAR L$019skip_copy -align 4 -L$018do_copy: - mov DWORD [44+esp],edi -dd 2784229001 -L$019skip_copy: - mov edi,16 -align 4 -L$020prefetch_tbl: - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov esi,DWORD [96+ebp] - lea ebp,[128+ebp] - sub edi,1 - jnz NEAR L$020prefetch_tbl - sub ebp,2048 - mov esi,DWORD [32+esp] - mov edi,DWORD [48+esp] - cmp edx,0 - je NEAR L$021fast_decrypt - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] -align 16 -L$022fast_enc_loop: - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - xor eax,DWORD [esi] - xor ebx,DWORD [4+esi] - xor ecx,DWORD [8+esi] - xor edx,DWORD [12+esi] - mov edi,DWORD [44+esp] - call __x86_AES_encrypt - mov esi,DWORD [32+esp] - mov edi,DWORD [36+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - lea esi,[16+esi] - mov ecx,DWORD [40+esp] - mov DWORD [32+esp],esi - lea edx,[16+edi] - mov DWORD [36+esp],edx - sub ecx,16 - mov DWORD [40+esp],ecx - jnz NEAR L$022fast_enc_loop - mov esi,DWORD [48+esp] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - cmp DWORD [316+esp],0 - mov edi,DWORD [44+esp] - je NEAR L$023skip_ezero - mov ecx,60 - xor eax,eax -align 4 -dd 2884892297 -L$023skip_ezero: - mov esp,DWORD [28+esp] - popfd -L$012drop_out: - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$021fast_decrypt: - cmp esi,DWORD [36+esp] - je NEAR L$024fast_dec_in_place - mov DWORD [52+esp],edi -align 4 -align 16 -L$025fast_dec_loop: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov edi,DWORD [44+esp] - call __x86_AES_decrypt - mov edi,DWORD [52+esp] - mov esi,DWORD [40+esp] - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov edi,DWORD [36+esp] - mov esi,DWORD [32+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [40+esp] - mov DWORD [52+esp],esi - lea esi,[16+esi] - mov DWORD [32+esp],esi - lea edi,[16+edi] - mov DWORD [36+esp],edi - sub ecx,16 - mov DWORD [40+esp],ecx - jnz NEAR L$025fast_dec_loop - mov edi,DWORD [52+esp] - mov esi,DWORD [48+esp] - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - jmp NEAR L$026fast_dec_out -align 16 -L$024fast_dec_in_place: -L$027fast_dec_in_place_loop: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - lea edi,[60+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov edi,DWORD [44+esp] - call __x86_AES_decrypt - mov edi,DWORD [48+esp] - mov esi,DWORD [36+esp] - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - lea esi,[16+esi] - mov DWORD [36+esp],esi - lea esi,[60+esp] - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov esi,DWORD [32+esp] - mov ecx,DWORD [40+esp] - lea esi,[16+esi] - mov DWORD [32+esp],esi - sub ecx,16 - mov DWORD [40+esp],ecx - jnz NEAR L$027fast_dec_in_place_loop -align 4 -L$026fast_dec_out: - cmp DWORD [316+esp],0 - mov edi,DWORD [44+esp] - je NEAR L$028skip_dzero - mov ecx,60 - xor eax,eax -align 4 -dd 2884892297 -L$028skip_dzero: - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$015slow_way: - mov eax,DWORD [eax] - mov edi,DWORD [36+esp] - lea esi,[esp-80] - and esi,-64 - lea ebx,[edi-143] - sub ebx,esi - neg ebx - and ebx,960 - sub esi,ebx - lea ebx,[768+esi] - sub ebx,ebp - and ebx,768 - lea ebp,[2176+ebx*1+ebp] - lea edx,[24+esp] - xchg esp,esi - add esp,4 - mov DWORD [24+esp],ebp - mov DWORD [28+esp],esi - mov DWORD [52+esp],eax - mov eax,DWORD [edx] - mov ebx,DWORD [4+edx] - mov esi,DWORD [16+edx] - mov edx,DWORD [20+edx] - mov DWORD [32+esp],eax - mov DWORD [36+esp],ebx - mov DWORD [40+esp],ecx - mov DWORD [44+esp],edi - mov DWORD [48+esp],esi - mov edi,esi - mov esi,eax - cmp edx,0 - je NEAR L$029slow_decrypt - cmp ecx,16 - mov edx,ebx - jb NEAR L$030slow_enc_tail - bt DWORD [52+esp],25 - jnc NEAR L$031slow_enc_x86 - movq mm0,[edi] - movq mm4,[8+edi] -align 16 -L$032slow_enc_loop_sse: - pxor mm0,[esi] - pxor mm4,[8+esi] - mov edi,DWORD [44+esp] - call __sse_AES_encrypt_compact - mov esi,DWORD [32+esp] - mov edi,DWORD [36+esp] - mov ecx,DWORD [40+esp] - movq [edi],mm0 - movq [8+edi],mm4 - lea esi,[16+esi] - mov DWORD [32+esp],esi - lea edx,[16+edi] - mov DWORD [36+esp],edx - sub ecx,16 - cmp ecx,16 - mov DWORD [40+esp],ecx - jae NEAR L$032slow_enc_loop_sse - test ecx,15 - jnz NEAR L$030slow_enc_tail - mov esi,DWORD [48+esp] - movq [esi],mm0 - movq [8+esi],mm4 - emms - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$031slow_enc_x86: - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] -align 4 -L$033slow_enc_loop_x86: - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - xor eax,DWORD [esi] - xor ebx,DWORD [4+esi] - xor ecx,DWORD [8+esi] - xor edx,DWORD [12+esi] - mov edi,DWORD [44+esp] - call __x86_AES_encrypt_compact - mov esi,DWORD [32+esp] - mov edi,DWORD [36+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [40+esp] - lea esi,[16+esi] - mov DWORD [32+esp],esi - lea edx,[16+edi] - mov DWORD [36+esp],edx - sub ecx,16 - cmp ecx,16 - mov DWORD [40+esp],ecx - jae NEAR L$033slow_enc_loop_x86 - test ecx,15 - jnz NEAR L$030slow_enc_tail - mov esi,DWORD [48+esp] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$030slow_enc_tail: - emms - mov edi,edx - mov ebx,16 - sub ebx,ecx - cmp edi,esi - je NEAR L$034enc_in_place -align 4 -dd 2767451785 - jmp NEAR L$035enc_skip_in_place -L$034enc_in_place: - lea edi,[ecx*1+edi] -L$035enc_skip_in_place: - mov ecx,ebx - xor eax,eax -align 4 -dd 2868115081 - mov edi,DWORD [48+esp] - mov esi,edx - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] - mov DWORD [40+esp],16 - jmp NEAR L$033slow_enc_loop_x86 -align 16 -L$029slow_decrypt: - bt DWORD [52+esp],25 - jnc NEAR L$036slow_dec_loop_x86 -align 4 -L$037slow_dec_loop_sse: - movq mm0,[esi] - movq mm4,[8+esi] - mov edi,DWORD [44+esp] - call __sse_AES_decrypt_compact - mov esi,DWORD [32+esp] - lea eax,[60+esp] - mov ebx,DWORD [36+esp] - mov ecx,DWORD [40+esp] - mov edi,DWORD [48+esp] - movq mm1,[esi] - movq mm5,[8+esi] - pxor mm0,[edi] - pxor mm4,[8+edi] - movq [edi],mm1 - movq [8+edi],mm5 - sub ecx,16 - jc NEAR L$038slow_dec_partial_sse - movq [ebx],mm0 - movq [8+ebx],mm4 - lea ebx,[16+ebx] - mov DWORD [36+esp],ebx - lea esi,[16+esi] - mov DWORD [32+esp],esi - mov DWORD [40+esp],ecx - jnz NEAR L$037slow_dec_loop_sse - emms - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$038slow_dec_partial_sse: - movq [eax],mm0 - movq [8+eax],mm4 - emms - add ecx,16 - mov edi,ebx - mov esi,eax -align 4 -dd 2767451785 - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$036slow_dec_loop_x86: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - lea edi,[60+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov edi,DWORD [44+esp] - call __x86_AES_decrypt_compact - mov edi,DWORD [48+esp] - mov esi,DWORD [40+esp] - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - sub esi,16 - jc NEAR L$039slow_dec_partial_x86 - mov DWORD [40+esp],esi - mov esi,DWORD [36+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - lea esi,[16+esi] - mov DWORD [36+esp],esi - lea esi,[60+esp] - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov esi,DWORD [32+esp] - lea esi,[16+esi] - mov DWORD [32+esp],esi - jnz NEAR L$036slow_dec_loop_x86 - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$039slow_dec_partial_x86: - lea esi,[60+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - mov esi,DWORD [32+esp] - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [40+esp] - mov edi,DWORD [36+esp] - lea esi,[60+esp] -align 4 -dd 2767451785 - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -__x86_AES_set_encrypt_key: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [24+esp] - mov edi,DWORD [32+esp] - test esi,-1 - jz NEAR L$040badpointer - test edi,-1 - jz NEAR L$040badpointer - call L$041pic_point -L$041pic_point: - pop ebp - lea ebp,[(L$AES_Te-L$041pic_point)+ebp] - lea ebp,[2176+ebp] - mov eax,DWORD [ebp-128] - mov ebx,DWORD [ebp-96] - mov ecx,DWORD [ebp-64] - mov edx,DWORD [ebp-32] - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov edx,DWORD [96+ebp] - mov ecx,DWORD [28+esp] - cmp ecx,128 - je NEAR L$04210rounds - cmp ecx,192 - je NEAR L$04312rounds - cmp ecx,256 - je NEAR L$04414rounds - mov eax,-2 - jmp NEAR L$045exit -L$04210rounds: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - xor ecx,ecx - jmp NEAR L$04610shortcut -align 4 -L$04710loop: - mov eax,DWORD [edi] - mov edx,DWORD [12+edi] -L$04610shortcut: - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,24 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,8 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,16 - xor eax,ebx - xor eax,DWORD [896+ecx*4+ebp] - mov DWORD [16+edi],eax - xor eax,DWORD [4+edi] - mov DWORD [20+edi],eax - xor eax,DWORD [8+edi] - mov DWORD [24+edi],eax - xor eax,DWORD [12+edi] - mov DWORD [28+edi],eax - inc ecx - add edi,16 - cmp ecx,10 - jl NEAR L$04710loop - mov DWORD [80+edi],10 - xor eax,eax - jmp NEAR L$045exit -L$04312rounds: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [16+esi] - mov edx,DWORD [20+esi] - mov DWORD [16+edi],ecx - mov DWORD [20+edi],edx - xor ecx,ecx - jmp NEAR L$04812shortcut -align 4 -L$04912loop: - mov eax,DWORD [edi] - mov edx,DWORD [20+edi] -L$04812shortcut: - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,24 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,8 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,16 - xor eax,ebx - xor eax,DWORD [896+ecx*4+ebp] - mov DWORD [24+edi],eax - xor eax,DWORD [4+edi] - mov DWORD [28+edi],eax - xor eax,DWORD [8+edi] - mov DWORD [32+edi],eax - xor eax,DWORD [12+edi] - mov DWORD [36+edi],eax - cmp ecx,7 - je NEAR L$05012break - inc ecx - xor eax,DWORD [16+edi] - mov DWORD [40+edi],eax - xor eax,DWORD [20+edi] - mov DWORD [44+edi],eax - add edi,24 - jmp NEAR L$04912loop -L$05012break: - mov DWORD [72+edi],12 - xor eax,eax - jmp NEAR L$045exit -L$04414rounds: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov eax,DWORD [16+esi] - mov ebx,DWORD [20+esi] - mov ecx,DWORD [24+esi] - mov edx,DWORD [28+esi] - mov DWORD [16+edi],eax - mov DWORD [20+edi],ebx - mov DWORD [24+edi],ecx - mov DWORD [28+edi],edx - xor ecx,ecx - jmp NEAR L$05114shortcut -align 4 -L$05214loop: - mov edx,DWORD [28+edi] -L$05114shortcut: - mov eax,DWORD [edi] - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,24 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,8 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,16 - xor eax,ebx - xor eax,DWORD [896+ecx*4+ebp] - mov DWORD [32+edi],eax - xor eax,DWORD [4+edi] - mov DWORD [36+edi],eax - xor eax,DWORD [8+edi] - mov DWORD [40+edi],eax - xor eax,DWORD [12+edi] - mov DWORD [44+edi],eax - cmp ecx,6 - je NEAR L$05314break - inc ecx - mov edx,eax - mov eax,DWORD [16+edi] - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - shl ebx,8 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,16 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,24 - xor eax,ebx - mov DWORD [48+edi],eax - xor eax,DWORD [20+edi] - mov DWORD [52+edi],eax - xor eax,DWORD [24+edi] - mov DWORD [56+edi],eax - xor eax,DWORD [28+edi] - mov DWORD [60+edi],eax - add edi,32 - jmp NEAR L$05214loop -L$05314break: - mov DWORD [48+edi],14 - xor eax,eax - jmp NEAR L$045exit -L$040badpointer: - mov eax,-1 -L$045exit: - pop edi - pop esi - pop ebx - pop ebp - ret -global _AES_set_encrypt_key -align 16 -_AES_set_encrypt_key: -L$_AES_set_encrypt_key_begin: - call __x86_AES_set_encrypt_key - ret -global _AES_set_decrypt_key -align 16 -_AES_set_decrypt_key: -L$_AES_set_decrypt_key_begin: - call __x86_AES_set_encrypt_key - cmp eax,0 - je NEAR L$054proceed - ret -L$054proceed: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [28+esp] - mov ecx,DWORD [240+esi] - lea ecx,[ecx*4] - lea edi,[ecx*4+esi] -align 4 -L$055invert: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [edi] - mov edx,DWORD [4+edi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [esi],ecx - mov DWORD [4+esi],edx - mov eax,DWORD [8+esi] - mov ebx,DWORD [12+esi] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [8+edi],eax - mov DWORD [12+edi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - add esi,16 - sub edi,16 - cmp esi,edi - jne NEAR L$055invert - mov edi,DWORD [28+esp] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [28+esp],esi - mov eax,DWORD [16+edi] -align 4 -L$056permute: - add edi,16 - mov ebp,2155905152 - and ebp,eax - lea ebx,[eax*1+eax] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ebx,4278124286 - and esi,454761243 - xor ebx,esi - mov ebp,2155905152 - and ebp,ebx - lea ecx,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ecx,4278124286 - and esi,454761243 - xor ebx,eax - xor ecx,esi - mov ebp,2155905152 - and ebp,ecx - lea edx,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - xor ecx,eax - sub esi,ebp - and edx,4278124286 - and esi,454761243 - rol eax,8 - xor edx,esi - mov ebp,DWORD [4+edi] - xor eax,ebx - xor ebx,edx - xor eax,ecx - rol ebx,24 - xor ecx,edx - xor eax,edx - rol ecx,16 - xor eax,ebx - rol edx,8 - xor eax,ecx - mov ebx,ebp - xor eax,edx - mov DWORD [edi],eax - mov ebp,2155905152 - and ebp,ebx - lea ecx,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ecx,4278124286 - and esi,454761243 - xor ecx,esi - mov ebp,2155905152 - and ebp,ecx - lea edx,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and edx,4278124286 - and esi,454761243 - xor ecx,ebx - xor edx,esi - mov ebp,2155905152 - and ebp,edx - lea eax,[edx*1+edx] - mov esi,ebp - shr ebp,7 - xor edx,ebx - sub esi,ebp - and eax,4278124286 - and esi,454761243 - rol ebx,8 - xor eax,esi - mov ebp,DWORD [8+edi] - xor ebx,ecx - xor ecx,eax - xor ebx,edx - rol ecx,24 - xor edx,eax - xor ebx,eax - rol edx,16 - xor ebx,ecx - rol eax,8 - xor ebx,edx - mov ecx,ebp - xor ebx,eax - mov DWORD [4+edi],ebx - mov ebp,2155905152 - and ebp,ecx - lea edx,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and edx,4278124286 - and esi,454761243 - xor edx,esi - mov ebp,2155905152 - and ebp,edx - lea eax,[edx*1+edx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and eax,4278124286 - and esi,454761243 - xor edx,ecx - xor eax,esi - mov ebp,2155905152 - and ebp,eax - lea ebx,[eax*1+eax] - mov esi,ebp - shr ebp,7 - xor eax,ecx - sub esi,ebp - and ebx,4278124286 - and esi,454761243 - rol ecx,8 - xor ebx,esi - mov ebp,DWORD [12+edi] - xor ecx,edx - xor edx,ebx - xor ecx,eax - rol edx,24 - xor eax,ebx - xor ecx,ebx - rol eax,16 - xor ecx,edx - rol ebx,8 - xor ecx,eax - mov edx,ebp - xor ecx,ebx - mov DWORD [8+edi],ecx - mov ebp,2155905152 - and ebp,edx - lea eax,[edx*1+edx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and eax,4278124286 - and esi,454761243 - xor eax,esi - mov ebp,2155905152 - and ebp,eax - lea ebx,[eax*1+eax] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ebx,4278124286 - and esi,454761243 - xor eax,edx - xor ebx,esi - mov ebp,2155905152 - and ebp,ebx - lea ecx,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - xor ebx,edx - sub esi,ebp - and ecx,4278124286 - and esi,454761243 - rol edx,8 - xor ecx,esi - mov ebp,DWORD [16+edi] - xor edx,eax - xor eax,ecx - xor edx,ebx - rol eax,24 - xor ebx,ecx - xor edx,ecx - rol ebx,16 - xor edx,eax - rol ecx,8 - xor edx,ebx - mov eax,ebp - xor edx,ecx - mov DWORD [12+edi],edx - cmp edi,DWORD [28+esp] - jb NEAR L$056permute - xor eax,eax - pop edi - pop esi - pop ebx - pop ebp - ret -db 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -db 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -db 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -segment .bss -common _OPENSSL_ia32cap_P 16 diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h index b0dfdc7a561045..a0e422963d254b 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Fri Sep 13 16:03:33 2019 UTC" +#define DATE "built on: Wed Mar 18 21:11:00 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm index 7383523877eec8..96071a300ead92 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm @@ -4386,19 +4386,15 @@ L$009pic: or eax,DWORD [4+edi] or eax,DWORD [8+edi] or eax,DWORD [12+edi] + mov ebx,DWORD [576+esp] + not ebx + or eax,ebx + mov ebx,DWORD [580+esp] + not ebx + or eax,ebx + or eax,DWORD [584+esp] db 62 jnz NEAR L$010add_proceed - mov eax,DWORD [576+esp] - and eax,DWORD [580+esp] - mov ebx,DWORD [584+esp] - jz NEAR L$010add_proceed - test ebx,ebx - jz NEAR L$011add_double - mov edi,DWORD [616+esp] - xor eax,eax - mov ecx,24 -db 252,243,171 - jmp NEAR L$012add_done align 16 L$011add_double: mov esi,DWORD [620+esp] diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h index ce324699ae1f17..2242cd2fc05d89 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h index c3b41df01e40a3..0c96ce73633dac 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_WIN32 # define DSO_EXTENSION ".dll" #endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h index e0b784dfe0539b..8fb667373af516 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi index 5028da71f3d37c..f15a17c0bebb0a 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi @@ -20,6 +20,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', @@ -28,9 +29,9 @@ ], 'openssl_cflags_VC-WIN32': [ '-Wa,--noexecstack', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', '/Gs0 /GF /Gy', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi index a718f985ec9427..4b319c319a5ef4 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi @@ -717,6 +717,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', @@ -725,9 +726,9 @@ ], 'openssl_cflags_VC-WIN32': [ '-Wa,--noexecstack', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', '/Gs0 /GF /Gy', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm index f0ae44934c40be..14713dbff02eeb 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm @@ -15,7 +15,7 @@ our %config = ( ARFLAGS => [ "/nologo" ], AS => "nasm", CC => "../config/fake_gcc.pl", - CFLAGS => [ "/W3 /wd4090 /nologo /O2 /WX" ], + CFLAGS => [ "/W3 /wd4090 /nologo /O2" ], CPP => "\$(CC) /EP /C", CPPDEFINES => [ ], CPPFLAGS => [ ], @@ -53,13 +53,13 @@ our %config = ( export_var_as_fn => "1", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -115,8 +115,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -125,14 +125,14 @@ our %target = ( AS => "nasm", ASFLAGS => "", CC => "cl", - CFLAGS => "/W3 /wd4090 /nologo /O2 /WX", + CFLAGS => "/W3 /wd4090 /nologo /O2", CPP => "\$(CC) /EP /C", HASHBANGPERL => "/usr/bin/env perl", LD => "link", LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x55a934dbe798)", + RANLIB => "CODE(0x56041fcde128)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s", @@ -257,6 +257,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -374,8 +375,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -643,14 +644,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -726,6 +719,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1523,6 +1524,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3254,7 +3261,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3262,6 +3268,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3755,14 +3762,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4203,6 +4202,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4912,49 +4919,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4964,7 +4963,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4982,13 +4980,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5002,613 +4998,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5622,7 +5516,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5632,188 +5525,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5843,25 +5705,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5871,31 +5729,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5905,31 +5758,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5947,284 +5795,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6234,295 +6035,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6530,7 +6282,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6538,7 +6289,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6546,7 +6296,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6554,7 +6303,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6562,7 +6310,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6570,163 +6317,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6744,235 +6464,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6980,21 +6661,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7002,13 +6680,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7016,81 +6692,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7098,334 +6761,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7435,79 +7036,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7526,7 +7114,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7536,361 +7123,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7912,265 +7439,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8180,31 +7663,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8214,13 +7692,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8246,19 +7722,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8284,13 +7757,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8316,727 +7787,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9087,6 +8437,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9331,7 +8689,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9657,7 +9014,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9703,7 +9059,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9769,7 +9124,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9794,7 +9148,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9892,7 +9245,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9942,18 +9294,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9964,6 +9313,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10027,10 +9380,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10059,6 +9408,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10323,6 +9676,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15256,7 +14610,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15264,6 +14617,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15491,6 +14845,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15593,10 +14955,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15625,6 +14983,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm deleted file mode 100644 index 7a17e847c64a73..00000000000000 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm +++ /dev/null @@ -1,3211 +0,0 @@ -%ifidn __OUTPUT_FORMAT__,obj -section code use32 class=code align=64 -%elifidn __OUTPUT_FORMAT__,win32 -$@feat.00 equ 1 -section .text code align=64 -%else -section .text code -%endif -align 16 -__x86_AES_encrypt_compact: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov edi,DWORD [ebp-128] - mov esi,DWORD [ebp-96] - mov edi,DWORD [ebp-64] - mov esi,DWORD [ebp-32] - mov edi,DWORD [ebp] - mov esi,DWORD [32+ebp] - mov edi,DWORD [64+ebp] - mov esi,DWORD [96+ebp] -align 16 -L$000loop: - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ch - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,eax - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx eax,ah - movzx eax,BYTE [eax*1+ebp-128] - shl eax,8 - xor edx,eax - mov eax,DWORD [4+esp] - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,24 - xor edx,ecx - mov ecx,esi - mov ebp,2155905152 - and ebp,ecx - lea edi,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,ecx - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,ecx - xor ecx,esi - ror edi,24 - xor esi,ebp - rol ecx,24 - xor esi,edi - mov ebp,2155905152 - xor ecx,esi - and ebp,edx - lea edi,[edx*1+edx] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,edx - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,edx - xor edx,esi - ror edi,24 - xor esi,ebp - rol edx,24 - xor esi,edi - mov ebp,2155905152 - xor edx,esi - and ebp,eax - lea edi,[eax*1+eax] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,eax - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,eax - xor eax,esi - ror edi,24 - xor esi,ebp - rol eax,24 - xor esi,edi - mov ebp,2155905152 - xor eax,esi - and ebp,ebx - lea edi,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - and edi,4278124286 - sub esi,ebp - mov ebp,ebx - and esi,454761243 - ror ebp,16 - xor esi,edi - mov edi,ebx - xor ebx,esi - ror edi,24 - xor esi,ebp - rol ebx,24 - xor esi,edi - xor ebx,esi - mov edi,DWORD [20+esp] - mov ebp,DWORD [28+esp] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$000loop - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ch - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,eax - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx eax,ah - movzx eax,BYTE [eax*1+ebp-128] - shl eax,8 - xor edx,eax - mov eax,DWORD [4+esp] - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,24 - xor edx,ecx - mov ecx,esi - xor eax,DWORD [16+edi] - xor ebx,DWORD [20+edi] - xor ecx,DWORD [24+edi] - xor edx,DWORD [28+edi] - ret -align 16 -__sse_AES_encrypt_compact: - pxor mm0,[edi] - pxor mm4,[8+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov eax,454761243 - mov DWORD [8+esp],eax - mov DWORD [12+esp],eax - mov eax,DWORD [ebp-128] - mov ebx,DWORD [ebp-96] - mov ecx,DWORD [ebp-64] - mov edx,DWORD [ebp-32] - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov edx,DWORD [96+ebp] -align 16 -L$001loop: - pshufw mm1,mm0,8 - pshufw mm5,mm4,13 - movd eax,mm1 - movd ebx,mm5 - mov DWORD [20+esp],edi - movzx esi,al - movzx edx,ah - pshufw mm2,mm0,13 - movzx ecx,BYTE [esi*1+ebp-128] - movzx edi,bl - movzx edx,BYTE [edx*1+ebp-128] - shr eax,16 - shl edx,8 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,16 - pshufw mm6,mm4,8 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,ah - shl esi,24 - shr ebx,16 - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,8 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shl esi,24 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - movd eax,mm2 - movd mm0,ecx - movzx ecx,BYTE [edi*1+ebp-128] - movzx edi,ah - shl ecx,16 - movd ebx,mm6 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,24 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - shl esi,8 - shr ebx,16 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shr eax,16 - movd mm1,ecx - movzx ecx,BYTE [edi*1+ebp-128] - movzx edi,ah - shl ecx,16 - and eax,255 - or ecx,esi - punpckldq mm0,mm1 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,24 - and ebx,255 - movzx eax,BYTE [eax*1+ebp-128] - or ecx,esi - shl eax,16 - movzx esi,BYTE [edi*1+ebp-128] - or edx,eax - shl esi,8 - movzx ebx,BYTE [ebx*1+ebp-128] - or ecx,esi - or edx,ebx - mov edi,DWORD [20+esp] - movd mm4,ecx - movd mm5,edx - punpckldq mm4,mm5 - add edi,16 - cmp edi,DWORD [24+esp] - ja NEAR L$002out - movq mm2,[8+esp] - pxor mm3,mm3 - pxor mm7,mm7 - movq mm1,mm0 - movq mm5,mm4 - pcmpgtb mm3,mm0 - pcmpgtb mm7,mm4 - pand mm3,mm2 - pand mm7,mm2 - pshufw mm2,mm0,177 - pshufw mm6,mm4,177 - paddb mm0,mm0 - paddb mm4,mm4 - pxor mm0,mm3 - pxor mm4,mm7 - pshufw mm3,mm2,177 - pshufw mm7,mm6,177 - pxor mm1,mm0 - pxor mm5,mm4 - pxor mm0,mm2 - pxor mm4,mm6 - movq mm2,mm3 - movq mm6,mm7 - pslld mm3,8 - pslld mm7,8 - psrld mm2,24 - psrld mm6,24 - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm0,mm2 - pxor mm4,mm6 - movq mm3,mm1 - movq mm7,mm5 - movq mm2,[edi] - movq mm6,[8+edi] - psrld mm1,8 - psrld mm5,8 - mov eax,DWORD [ebp-128] - pslld mm3,24 - pslld mm7,24 - mov ebx,DWORD [ebp-64] - pxor mm0,mm1 - pxor mm4,mm5 - mov ecx,DWORD [ebp] - pxor mm0,mm3 - pxor mm4,mm7 - mov edx,DWORD [64+ebp] - pxor mm0,mm2 - pxor mm4,mm6 - jmp NEAR L$001loop -align 16 -L$002out: - pxor mm0,[edi] - pxor mm4,[8+edi] - ret -align 16 -__x86_AES_encrypt: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi -align 16 -L$003loop: - mov esi,eax - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,bh - xor esi,DWORD [3+edi*8+ebp] - mov edi,ecx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,edx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - mov esi,DWORD [esi*8+ebp] - movzx edi,ch - xor esi,DWORD [3+edi*8+ebp] - mov edi,edx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,eax - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - mov esi,DWORD [esi*8+ebp] - movzx edi,dh - xor esi,DWORD [3+edi*8+ebp] - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - movzx edi,bh - xor esi,DWORD [1+edi*8+ebp] - mov edi,DWORD [20+esp] - mov edx,DWORD [edx*8+ebp] - movzx eax,ah - xor edx,DWORD [3+eax*8+ebp] - mov eax,DWORD [4+esp] - and ebx,255 - xor edx,DWORD [2+ebx*8+ebp] - mov ebx,DWORD [8+esp] - xor edx,DWORD [1+ecx*8+ebp] - mov ecx,esi - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$003loop - mov esi,eax - and esi,255 - mov esi,DWORD [2+esi*8+ebp] - and esi,255 - movzx edi,bh - mov edi,DWORD [edi*8+ebp] - and edi,65280 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - mov edi,DWORD [edi*8+ebp] - and edi,16711680 - xor esi,edi - mov edi,edx - shr edi,24 - mov edi,DWORD [2+edi*8+ebp] - and edi,4278190080 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - shr ebx,16 - mov esi,DWORD [2+esi*8+ebp] - and esi,255 - movzx edi,ch - mov edi,DWORD [edi*8+ebp] - and edi,65280 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - mov edi,DWORD [edi*8+ebp] - and edi,16711680 - xor esi,edi - mov edi,eax - shr edi,24 - mov edi,DWORD [2+edi*8+ebp] - and edi,4278190080 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - shr ecx,24 - mov esi,DWORD [2+esi*8+ebp] - and esi,255 - movzx edi,dh - mov edi,DWORD [edi*8+ebp] - and edi,65280 - xor esi,edi - mov edi,eax - shr edi,16 - and edx,255 - and edi,255 - mov edi,DWORD [edi*8+ebp] - and edi,16711680 - xor esi,edi - movzx edi,bh - mov edi,DWORD [2+edi*8+ebp] - and edi,4278190080 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - mov edx,DWORD [2+edx*8+ebp] - and edx,255 - movzx eax,ah - mov eax,DWORD [eax*8+ebp] - and eax,65280 - xor edx,eax - mov eax,DWORD [4+esp] - and ebx,255 - mov ebx,DWORD [ebx*8+ebp] - and ebx,16711680 - xor edx,ebx - mov ebx,DWORD [8+esp] - mov ecx,DWORD [2+ecx*8+ebp] - and ecx,4278190080 - xor edx,ecx - mov ecx,esi - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - ret -align 64 -L$AES_Te: -dd 2774754246,2774754246 -dd 2222750968,2222750968 -dd 2574743534,2574743534 -dd 2373680118,2373680118 -dd 234025727,234025727 -dd 3177933782,3177933782 -dd 2976870366,2976870366 -dd 1422247313,1422247313 -dd 1345335392,1345335392 -dd 50397442,50397442 -dd 2842126286,2842126286 -dd 2099981142,2099981142 -dd 436141799,436141799 -dd 1658312629,1658312629 -dd 3870010189,3870010189 -dd 2591454956,2591454956 -dd 1170918031,1170918031 -dd 2642575903,2642575903 -dd 1086966153,1086966153 -dd 2273148410,2273148410 -dd 368769775,368769775 -dd 3948501426,3948501426 -dd 3376891790,3376891790 -dd 200339707,200339707 -dd 3970805057,3970805057 -dd 1742001331,1742001331 -dd 4255294047,4255294047 -dd 3937382213,3937382213 -dd 3214711843,3214711843 -dd 4154762323,4154762323 -dd 2524082916,2524082916 -dd 1539358875,1539358875 -dd 3266819957,3266819957 -dd 486407649,486407649 -dd 2928907069,2928907069 -dd 1780885068,1780885068 -dd 1513502316,1513502316 -dd 1094664062,1094664062 -dd 49805301,49805301 -dd 1338821763,1338821763 -dd 1546925160,1546925160 -dd 4104496465,4104496465 -dd 887481809,887481809 -dd 150073849,150073849 -dd 2473685474,2473685474 -dd 1943591083,1943591083 -dd 1395732834,1395732834 -dd 1058346282,1058346282 -dd 201589768,201589768 -dd 1388824469,1388824469 -dd 1696801606,1696801606 -dd 1589887901,1589887901 -dd 672667696,672667696 -dd 2711000631,2711000631 -dd 251987210,251987210 -dd 3046808111,3046808111 -dd 151455502,151455502 -dd 907153956,907153956 -dd 2608889883,2608889883 -dd 1038279391,1038279391 -dd 652995533,652995533 -dd 1764173646,1764173646 -dd 3451040383,3451040383 -dd 2675275242,2675275242 -dd 453576978,453576978 -dd 2659418909,2659418909 -dd 1949051992,1949051992 -dd 773462580,773462580 -dd 756751158,756751158 -dd 2993581788,2993581788 -dd 3998898868,3998898868 -dd 4221608027,4221608027 -dd 4132590244,4132590244 -dd 1295727478,1295727478 -dd 1641469623,1641469623 -dd 3467883389,3467883389 -dd 2066295122,2066295122 -dd 1055122397,1055122397 -dd 1898917726,1898917726 -dd 2542044179,2542044179 -dd 4115878822,4115878822 -dd 1758581177,1758581177 -dd 0,0 -dd 753790401,753790401 -dd 1612718144,1612718144 -dd 536673507,536673507 -dd 3367088505,3367088505 -dd 3982187446,3982187446 -dd 3194645204,3194645204 -dd 1187761037,1187761037 -dd 3653156455,3653156455 -dd 1262041458,1262041458 -dd 3729410708,3729410708 -dd 3561770136,3561770136 -dd 3898103984,3898103984 -dd 1255133061,1255133061 -dd 1808847035,1808847035 -dd 720367557,720367557 -dd 3853167183,3853167183 -dd 385612781,385612781 -dd 3309519750,3309519750 -dd 3612167578,3612167578 -dd 1429418854,1429418854 -dd 2491778321,2491778321 -dd 3477423498,3477423498 -dd 284817897,284817897 -dd 100794884,100794884 -dd 2172616702,2172616702 -dd 4031795360,4031795360 -dd 1144798328,1144798328 -dd 3131023141,3131023141 -dd 3819481163,3819481163 -dd 4082192802,4082192802 -dd 4272137053,4272137053 -dd 3225436288,3225436288 -dd 2324664069,2324664069 -dd 2912064063,2912064063 -dd 3164445985,3164445985 -dd 1211644016,1211644016 -dd 83228145,83228145 -dd 3753688163,3753688163 -dd 3249976951,3249976951 -dd 1977277103,1977277103 -dd 1663115586,1663115586 -dd 806359072,806359072 -dd 452984805,452984805 -dd 250868733,250868733 -dd 1842533055,1842533055 -dd 1288555905,1288555905 -dd 336333848,336333848 -dd 890442534,890442534 -dd 804056259,804056259 -dd 3781124030,3781124030 -dd 2727843637,2727843637 -dd 3427026056,3427026056 -dd 957814574,957814574 -dd 1472513171,1472513171 -dd 4071073621,4071073621 -dd 2189328124,2189328124 -dd 1195195770,1195195770 -dd 2892260552,2892260552 -dd 3881655738,3881655738 -dd 723065138,723065138 -dd 2507371494,2507371494 -dd 2690670784,2690670784 -dd 2558624025,2558624025 -dd 3511635870,3511635870 -dd 2145180835,2145180835 -dd 1713513028,1713513028 -dd 2116692564,2116692564 -dd 2878378043,2878378043 -dd 2206763019,2206763019 -dd 3393603212,3393603212 -dd 703524551,703524551 -dd 3552098411,3552098411 -dd 1007948840,1007948840 -dd 2044649127,2044649127 -dd 3797835452,3797835452 -dd 487262998,487262998 -dd 1994120109,1994120109 -dd 1004593371,1004593371 -dd 1446130276,1446130276 -dd 1312438900,1312438900 -dd 503974420,503974420 -dd 3679013266,3679013266 -dd 168166924,168166924 -dd 1814307912,1814307912 -dd 3831258296,3831258296 -dd 1573044895,1573044895 -dd 1859376061,1859376061 -dd 4021070915,4021070915 -dd 2791465668,2791465668 -dd 2828112185,2828112185 -dd 2761266481,2761266481 -dd 937747667,937747667 -dd 2339994098,2339994098 -dd 854058965,854058965 -dd 1137232011,1137232011 -dd 1496790894,1496790894 -dd 3077402074,3077402074 -dd 2358086913,2358086913 -dd 1691735473,1691735473 -dd 3528347292,3528347292 -dd 3769215305,3769215305 -dd 3027004632,3027004632 -dd 4199962284,4199962284 -dd 133494003,133494003 -dd 636152527,636152527 -dd 2942657994,2942657994 -dd 2390391540,2390391540 -dd 3920539207,3920539207 -dd 403179536,403179536 -dd 3585784431,3585784431 -dd 2289596656,2289596656 -dd 1864705354,1864705354 -dd 1915629148,1915629148 -dd 605822008,605822008 -dd 4054230615,4054230615 -dd 3350508659,3350508659 -dd 1371981463,1371981463 -dd 602466507,602466507 -dd 2094914977,2094914977 -dd 2624877800,2624877800 -dd 555687742,555687742 -dd 3712699286,3712699286 -dd 3703422305,3703422305 -dd 2257292045,2257292045 -dd 2240449039,2240449039 -dd 2423288032,2423288032 -dd 1111375484,1111375484 -dd 3300242801,3300242801 -dd 2858837708,2858837708 -dd 3628615824,3628615824 -dd 84083462,84083462 -dd 32962295,32962295 -dd 302911004,302911004 -dd 2741068226,2741068226 -dd 1597322602,1597322602 -dd 4183250862,4183250862 -dd 3501832553,3501832553 -dd 2441512471,2441512471 -dd 1489093017,1489093017 -dd 656219450,656219450 -dd 3114180135,3114180135 -dd 954327513,954327513 -dd 335083755,335083755 -dd 3013122091,3013122091 -dd 856756514,856756514 -dd 3144247762,3144247762 -dd 1893325225,1893325225 -dd 2307821063,2307821063 -dd 2811532339,2811532339 -dd 3063651117,3063651117 -dd 572399164,572399164 -dd 2458355477,2458355477 -dd 552200649,552200649 -dd 1238290055,1238290055 -dd 4283782570,4283782570 -dd 2015897680,2015897680 -dd 2061492133,2061492133 -dd 2408352771,2408352771 -dd 4171342169,4171342169 -dd 2156497161,2156497161 -dd 386731290,386731290 -dd 3669999461,3669999461 -dd 837215959,837215959 -dd 3326231172,3326231172 -dd 3093850320,3093850320 -dd 3275833730,3275833730 -dd 2962856233,2962856233 -dd 1999449434,1999449434 -dd 286199582,286199582 -dd 3417354363,3417354363 -dd 4233385128,4233385128 -dd 3602627437,3602627437 -dd 974525996,974525996 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -db 99,124,119,123,242,107,111,197 -db 48,1,103,43,254,215,171,118 -db 202,130,201,125,250,89,71,240 -db 173,212,162,175,156,164,114,192 -db 183,253,147,38,54,63,247,204 -db 52,165,229,241,113,216,49,21 -db 4,199,35,195,24,150,5,154 -db 7,18,128,226,235,39,178,117 -db 9,131,44,26,27,110,90,160 -db 82,59,214,179,41,227,47,132 -db 83,209,0,237,32,252,177,91 -db 106,203,190,57,74,76,88,207 -db 208,239,170,251,67,77,51,133 -db 69,249,2,127,80,60,159,168 -db 81,163,64,143,146,157,56,245 -db 188,182,218,33,16,255,243,210 -db 205,12,19,236,95,151,68,23 -db 196,167,126,61,100,93,25,115 -db 96,129,79,220,34,42,144,136 -db 70,238,184,20,222,94,11,219 -db 224,50,58,10,73,6,36,92 -db 194,211,172,98,145,149,228,121 -db 231,200,55,109,141,213,78,169 -db 108,86,244,234,101,122,174,8 -db 186,120,37,46,28,166,180,198 -db 232,221,116,31,75,189,139,138 -db 112,62,181,102,72,3,246,14 -db 97,53,87,185,134,193,29,158 -db 225,248,152,17,105,217,142,148 -db 155,30,135,233,206,85,40,223 -db 140,161,137,13,191,230,66,104 -db 65,153,45,15,176,84,187,22 -dd 1,2,4,8 -dd 16,32,64,128 -dd 27,54,0,0 -dd 0,0,0,0 -global _AES_encrypt -align 16 -_AES_encrypt: -L$_AES_encrypt_begin: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [20+esp] - mov edi,DWORD [28+esp] - mov eax,esp - sub esp,36 - and esp,-64 - lea ebx,[edi-127] - sub ebx,esp - neg ebx - and ebx,960 - sub esp,ebx - add esp,4 - mov DWORD [28+esp],eax - call L$004pic_point -L$004pic_point: - pop ebp - lea eax,[_OPENSSL_ia32cap_P] - lea ebp,[(L$AES_Te-L$004pic_point)+ebp] - lea ebx,[764+esp] - sub ebx,ebp - and ebx,768 - lea ebp,[2176+ebx*1+ebp] - bt DWORD [eax],25 - jnc NEAR L$005x86 - movq mm0,[esi] - movq mm4,[8+esi] - call __sse_AES_encrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - movq [esi],mm0 - movq [8+esi],mm4 - emms - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -L$005x86: - mov DWORD [24+esp],ebp - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - call __x86_AES_encrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -__x86_AES_decrypt_compact: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov edi,DWORD [ebp-128] - mov esi,DWORD [ebp-96] - mov edi,DWORD [ebp-64] - mov esi,DWORD [ebp-32] - mov edi,DWORD [ebp] - mov esi,DWORD [32+ebp] - mov edi,DWORD [64+ebp] - mov esi,DWORD [96+ebp] -align 16 -L$006loop: - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ebx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ah - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ecx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx ecx,ch - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,8 - xor edx,ecx - mov ecx,esi - shr ebx,16 - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - shr eax,24 - movzx eax,BYTE [eax*1+ebp-128] - shl eax,24 - xor edx,eax - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea eax,[ecx*1+ecx] - sub esi,edi - and eax,4278124286 - and esi,454761243 - xor eax,esi - mov edi,2155905152 - and edi,eax - mov esi,edi - shr edi,7 - lea ebx,[eax*1+eax] - sub esi,edi - and ebx,4278124286 - and esi,454761243 - xor eax,ecx - xor ebx,esi - mov edi,2155905152 - and edi,ebx - mov esi,edi - shr edi,7 - lea ebp,[ebx*1+ebx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor ebx,ecx - rol ecx,8 - xor ebp,esi - xor ecx,eax - xor eax,ebp - xor ecx,ebx - xor ebx,ebp - rol eax,24 - xor ecx,ebp - rol ebx,16 - xor ecx,eax - rol ebp,8 - xor ecx,ebx - mov eax,DWORD [4+esp] - xor ecx,ebp - mov DWORD [12+esp],ecx - mov edi,2155905152 - and edi,edx - mov esi,edi - shr edi,7 - lea ebx,[edx*1+edx] - sub esi,edi - and ebx,4278124286 - and esi,454761243 - xor ebx,esi - mov edi,2155905152 - and edi,ebx - mov esi,edi - shr edi,7 - lea ecx,[ebx*1+ebx] - sub esi,edi - and ecx,4278124286 - and esi,454761243 - xor ebx,edx - xor ecx,esi - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea ebp,[ecx*1+ecx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor ecx,edx - rol edx,8 - xor ebp,esi - xor edx,ebx - xor ebx,ebp - xor edx,ecx - xor ecx,ebp - rol ebx,24 - xor edx,ebp - rol ecx,16 - xor edx,ebx - rol ebp,8 - xor edx,ecx - mov ebx,DWORD [8+esp] - xor edx,ebp - mov DWORD [16+esp],edx - mov edi,2155905152 - and edi,eax - mov esi,edi - shr edi,7 - lea ecx,[eax*1+eax] - sub esi,edi - and ecx,4278124286 - and esi,454761243 - xor ecx,esi - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea edx,[ecx*1+ecx] - sub esi,edi - and edx,4278124286 - and esi,454761243 - xor ecx,eax - xor edx,esi - mov edi,2155905152 - and edi,edx - mov esi,edi - shr edi,7 - lea ebp,[edx*1+edx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor edx,eax - rol eax,8 - xor ebp,esi - xor eax,ecx - xor ecx,ebp - xor eax,edx - xor edx,ebp - rol ecx,24 - xor eax,ebp - rol edx,16 - xor eax,ecx - rol ebp,8 - xor eax,edx - xor eax,ebp - mov edi,2155905152 - and edi,ebx - mov esi,edi - shr edi,7 - lea ecx,[ebx*1+ebx] - sub esi,edi - and ecx,4278124286 - and esi,454761243 - xor ecx,esi - mov edi,2155905152 - and edi,ecx - mov esi,edi - shr edi,7 - lea edx,[ecx*1+ecx] - sub esi,edi - and edx,4278124286 - and esi,454761243 - xor ecx,ebx - xor edx,esi - mov edi,2155905152 - and edi,edx - mov esi,edi - shr edi,7 - lea ebp,[edx*1+edx] - sub esi,edi - and ebp,4278124286 - and esi,454761243 - xor edx,ebx - rol ebx,8 - xor ebp,esi - xor ebx,ecx - xor ecx,ebp - xor ebx,edx - xor edx,ebp - rol ecx,24 - xor ebx,ebp - rol edx,16 - xor ebx,ecx - rol ebp,8 - xor ebx,edx - mov ecx,DWORD [12+esp] - xor ebx,ebp - mov edx,DWORD [16+esp] - mov edi,DWORD [20+esp] - mov ebp,DWORD [28+esp] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$006loop - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ebx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,ah - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,ecx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - movzx esi,BYTE [esi*1+ebp-128] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp-128] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp-128] - shl edi,24 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - movzx edx,BYTE [edx*1+ebp-128] - movzx ecx,ch - movzx ecx,BYTE [ecx*1+ebp-128] - shl ecx,8 - xor edx,ecx - mov ecx,esi - shr ebx,16 - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp-128] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - shr eax,24 - movzx eax,BYTE [eax*1+ebp-128] - shl eax,24 - xor edx,eax - mov eax,DWORD [4+esp] - xor eax,DWORD [16+edi] - xor ebx,DWORD [20+edi] - xor ecx,DWORD [24+edi] - xor edx,DWORD [28+edi] - ret -align 16 -__sse_AES_decrypt_compact: - pxor mm0,[edi] - pxor mm4,[8+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi - mov eax,454761243 - mov DWORD [8+esp],eax - mov DWORD [12+esp],eax - mov eax,DWORD [ebp-128] - mov ebx,DWORD [ebp-96] - mov ecx,DWORD [ebp-64] - mov edx,DWORD [ebp-32] - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov edx,DWORD [96+ebp] -align 16 -L$007loop: - pshufw mm1,mm0,12 - pshufw mm5,mm4,9 - movd eax,mm1 - movd ebx,mm5 - mov DWORD [20+esp],edi - movzx esi,al - movzx edx,ah - pshufw mm2,mm0,6 - movzx ecx,BYTE [esi*1+ebp-128] - movzx edi,bl - movzx edx,BYTE [edx*1+ebp-128] - shr eax,16 - shl edx,8 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,16 - pshufw mm6,mm4,3 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,ah - shl esi,24 - shr ebx,16 - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shl esi,24 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shl esi,8 - movd eax,mm2 - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - shl esi,16 - movd ebx,mm6 - movd mm0,ecx - movzx ecx,BYTE [edi*1+ebp-128] - movzx edi,al - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bl - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,ah - shl esi,16 - shr eax,16 - or edx,esi - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,bh - shr ebx,16 - shl esi,8 - movd mm1,edx - movzx edx,BYTE [edi*1+ebp-128] - movzx edi,bh - shl edx,24 - and ebx,255 - or edx,esi - punpckldq mm0,mm1 - movzx esi,BYTE [edi*1+ebp-128] - movzx edi,al - shl esi,8 - movzx eax,ah - movzx ebx,BYTE [ebx*1+ebp-128] - or ecx,esi - movzx esi,BYTE [edi*1+ebp-128] - or edx,ebx - shl esi,16 - movzx eax,BYTE [eax*1+ebp-128] - or edx,esi - shl eax,24 - or ecx,eax - mov edi,DWORD [20+esp] - movd mm4,edx - movd mm5,ecx - punpckldq mm4,mm5 - add edi,16 - cmp edi,DWORD [24+esp] - ja NEAR L$008out - movq mm3,mm0 - movq mm7,mm4 - pshufw mm2,mm0,228 - pshufw mm6,mm4,228 - movq mm1,mm0 - movq mm5,mm4 - pshufw mm0,mm0,177 - pshufw mm4,mm4,177 - pslld mm2,8 - pslld mm6,8 - psrld mm3,8 - psrld mm7,8 - pxor mm0,mm2 - pxor mm4,mm6 - pxor mm0,mm3 - pxor mm4,mm7 - pslld mm2,16 - pslld mm6,16 - psrld mm3,16 - psrld mm7,16 - pxor mm0,mm2 - pxor mm4,mm6 - pxor mm0,mm3 - pxor mm4,mm7 - movq mm3,[8+esp] - pxor mm2,mm2 - pxor mm6,mm6 - pcmpgtb mm2,mm1 - pcmpgtb mm6,mm5 - pand mm2,mm3 - pand mm6,mm3 - paddb mm1,mm1 - paddb mm5,mm5 - pxor mm1,mm2 - pxor mm5,mm6 - movq mm3,mm1 - movq mm7,mm5 - movq mm2,mm1 - movq mm6,mm5 - pxor mm0,mm1 - pxor mm4,mm5 - pslld mm3,24 - pslld mm7,24 - psrld mm2,8 - psrld mm6,8 - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm0,mm2 - pxor mm4,mm6 - movq mm2,[8+esp] - pxor mm3,mm3 - pxor mm7,mm7 - pcmpgtb mm3,mm1 - pcmpgtb mm7,mm5 - pand mm3,mm2 - pand mm7,mm2 - paddb mm1,mm1 - paddb mm5,mm5 - pxor mm1,mm3 - pxor mm5,mm7 - pshufw mm3,mm1,177 - pshufw mm7,mm5,177 - pxor mm0,mm1 - pxor mm4,mm5 - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm3,mm3 - pxor mm7,mm7 - pcmpgtb mm3,mm1 - pcmpgtb mm7,mm5 - pand mm3,mm2 - pand mm7,mm2 - paddb mm1,mm1 - paddb mm5,mm5 - pxor mm1,mm3 - pxor mm5,mm7 - pxor mm0,mm1 - pxor mm4,mm5 - movq mm3,mm1 - movq mm7,mm5 - pshufw mm2,mm1,177 - pshufw mm6,mm5,177 - pxor mm0,mm2 - pxor mm4,mm6 - pslld mm1,8 - pslld mm5,8 - psrld mm3,8 - psrld mm7,8 - movq mm2,[edi] - movq mm6,[8+edi] - pxor mm0,mm1 - pxor mm4,mm5 - pxor mm0,mm3 - pxor mm4,mm7 - mov eax,DWORD [ebp-128] - pslld mm1,16 - pslld mm5,16 - mov ebx,DWORD [ebp-64] - psrld mm3,16 - psrld mm7,16 - mov ecx,DWORD [ebp] - pxor mm0,mm1 - pxor mm4,mm5 - mov edx,DWORD [64+ebp] - pxor mm0,mm3 - pxor mm4,mm7 - pxor mm0,mm2 - pxor mm4,mm6 - jmp NEAR L$007loop -align 16 -L$008out: - pxor mm0,[edi] - pxor mm4,[8+edi] - ret -align 16 -__x86_AES_decrypt: - mov DWORD [20+esp],edi - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [24+esp],esi -align 16 -L$009loop: - mov esi,eax - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,dh - xor esi,DWORD [3+edi*8+ebp] - mov edi,ecx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,ebx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,ah - xor esi,DWORD [3+edi*8+ebp] - mov edi,edx - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,ecx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - mov esi,DWORD [esi*8+ebp] - movzx edi,bh - xor esi,DWORD [3+edi*8+ebp] - mov edi,eax - shr edi,16 - and edi,255 - xor esi,DWORD [2+edi*8+ebp] - mov edi,edx - shr edi,24 - xor esi,DWORD [1+edi*8+ebp] - mov edi,DWORD [20+esp] - and edx,255 - mov edx,DWORD [edx*8+ebp] - movzx ecx,ch - xor edx,DWORD [3+ecx*8+ebp] - mov ecx,esi - shr ebx,16 - and ebx,255 - xor edx,DWORD [2+ebx*8+ebp] - mov ebx,DWORD [8+esp] - shr eax,24 - xor edx,DWORD [1+eax*8+ebp] - mov eax,DWORD [4+esp] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - cmp edi,DWORD [24+esp] - mov DWORD [20+esp],edi - jb NEAR L$009loop - lea ebp,[2176+ebp] - mov edi,DWORD [ebp-128] - mov esi,DWORD [ebp-96] - mov edi,DWORD [ebp-64] - mov esi,DWORD [ebp-32] - mov edi,DWORD [ebp] - mov esi,DWORD [32+ebp] - mov edi,DWORD [64+ebp] - mov esi,DWORD [96+ebp] - lea ebp,[ebp-128] - mov esi,eax - and esi,255 - movzx esi,BYTE [esi*1+ebp] - movzx edi,dh - movzx edi,BYTE [edi*1+ebp] - shl edi,8 - xor esi,edi - mov edi,ecx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp] - shl edi,16 - xor esi,edi - mov edi,ebx - shr edi,24 - movzx edi,BYTE [edi*1+ebp] - shl edi,24 - xor esi,edi - mov DWORD [4+esp],esi - mov esi,ebx - and esi,255 - movzx esi,BYTE [esi*1+ebp] - movzx edi,ah - movzx edi,BYTE [edi*1+ebp] - shl edi,8 - xor esi,edi - mov edi,edx - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp] - shl edi,16 - xor esi,edi - mov edi,ecx - shr edi,24 - movzx edi,BYTE [edi*1+ebp] - shl edi,24 - xor esi,edi - mov DWORD [8+esp],esi - mov esi,ecx - and esi,255 - movzx esi,BYTE [esi*1+ebp] - movzx edi,bh - movzx edi,BYTE [edi*1+ebp] - shl edi,8 - xor esi,edi - mov edi,eax - shr edi,16 - and edi,255 - movzx edi,BYTE [edi*1+ebp] - shl edi,16 - xor esi,edi - mov edi,edx - shr edi,24 - movzx edi,BYTE [edi*1+ebp] - shl edi,24 - xor esi,edi - mov edi,DWORD [20+esp] - and edx,255 - movzx edx,BYTE [edx*1+ebp] - movzx ecx,ch - movzx ecx,BYTE [ecx*1+ebp] - shl ecx,8 - xor edx,ecx - mov ecx,esi - shr ebx,16 - and ebx,255 - movzx ebx,BYTE [ebx*1+ebp] - shl ebx,16 - xor edx,ebx - mov ebx,DWORD [8+esp] - shr eax,24 - movzx eax,BYTE [eax*1+ebp] - shl eax,24 - xor edx,eax - mov eax,DWORD [4+esp] - lea ebp,[ebp-2048] - add edi,16 - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - ret -align 64 -L$AES_Td: -dd 1353184337,1353184337 -dd 1399144830,1399144830 -dd 3282310938,3282310938 -dd 2522752826,2522752826 -dd 3412831035,3412831035 -dd 4047871263,4047871263 -dd 2874735276,2874735276 -dd 2466505547,2466505547 -dd 1442459680,1442459680 -dd 4134368941,4134368941 -dd 2440481928,2440481928 -dd 625738485,625738485 -dd 4242007375,4242007375 -dd 3620416197,3620416197 -dd 2151953702,2151953702 -dd 2409849525,2409849525 -dd 1230680542,1230680542 -dd 1729870373,1729870373 -dd 2551114309,2551114309 -dd 3787521629,3787521629 -dd 41234371,41234371 -dd 317738113,317738113 -dd 2744600205,2744600205 -dd 3338261355,3338261355 -dd 3881799427,3881799427 -dd 2510066197,2510066197 -dd 3950669247,3950669247 -dd 3663286933,3663286933 -dd 763608788,763608788 -dd 3542185048,3542185048 -dd 694804553,694804553 -dd 1154009486,1154009486 -dd 1787413109,1787413109 -dd 2021232372,2021232372 -dd 1799248025,1799248025 -dd 3715217703,3715217703 -dd 3058688446,3058688446 -dd 397248752,397248752 -dd 1722556617,1722556617 -dd 3023752829,3023752829 -dd 407560035,407560035 -dd 2184256229,2184256229 -dd 1613975959,1613975959 -dd 1165972322,1165972322 -dd 3765920945,3765920945 -dd 2226023355,2226023355 -dd 480281086,480281086 -dd 2485848313,2485848313 -dd 1483229296,1483229296 -dd 436028815,436028815 -dd 2272059028,2272059028 -dd 3086515026,3086515026 -dd 601060267,601060267 -dd 3791801202,3791801202 -dd 1468997603,1468997603 -dd 715871590,715871590 -dd 120122290,120122290 -dd 63092015,63092015 -dd 2591802758,2591802758 -dd 2768779219,2768779219 -dd 4068943920,4068943920 -dd 2997206819,2997206819 -dd 3127509762,3127509762 -dd 1552029421,1552029421 -dd 723308426,723308426 -dd 2461301159,2461301159 -dd 4042393587,4042393587 -dd 2715969870,2715969870 -dd 3455375973,3455375973 -dd 3586000134,3586000134 -dd 526529745,526529745 -dd 2331944644,2331944644 -dd 2639474228,2639474228 -dd 2689987490,2689987490 -dd 853641733,853641733 -dd 1978398372,1978398372 -dd 971801355,971801355 -dd 2867814464,2867814464 -dd 111112542,111112542 -dd 1360031421,1360031421 -dd 4186579262,4186579262 -dd 1023860118,1023860118 -dd 2919579357,2919579357 -dd 1186850381,1186850381 -dd 3045938321,3045938321 -dd 90031217,90031217 -dd 1876166148,1876166148 -dd 4279586912,4279586912 -dd 620468249,620468249 -dd 2548678102,2548678102 -dd 3426959497,3426959497 -dd 2006899047,2006899047 -dd 3175278768,3175278768 -dd 2290845959,2290845959 -dd 945494503,945494503 -dd 3689859193,3689859193 -dd 1191869601,1191869601 -dd 3910091388,3910091388 -dd 3374220536,3374220536 -dd 0,0 -dd 2206629897,2206629897 -dd 1223502642,1223502642 -dd 2893025566,2893025566 -dd 1316117100,1316117100 -dd 4227796733,4227796733 -dd 1446544655,1446544655 -dd 517320253,517320253 -dd 658058550,658058550 -dd 1691946762,1691946762 -dd 564550760,564550760 -dd 3511966619,3511966619 -dd 976107044,976107044 -dd 2976320012,2976320012 -dd 266819475,266819475 -dd 3533106868,3533106868 -dd 2660342555,2660342555 -dd 1338359936,1338359936 -dd 2720062561,2720062561 -dd 1766553434,1766553434 -dd 370807324,370807324 -dd 179999714,179999714 -dd 3844776128,3844776128 -dd 1138762300,1138762300 -dd 488053522,488053522 -dd 185403662,185403662 -dd 2915535858,2915535858 -dd 3114841645,3114841645 -dd 3366526484,3366526484 -dd 2233069911,2233069911 -dd 1275557295,1275557295 -dd 3151862254,3151862254 -dd 4250959779,4250959779 -dd 2670068215,2670068215 -dd 3170202204,3170202204 -dd 3309004356,3309004356 -dd 880737115,880737115 -dd 1982415755,1982415755 -dd 3703972811,3703972811 -dd 1761406390,1761406390 -dd 1676797112,1676797112 -dd 3403428311,3403428311 -dd 277177154,277177154 -dd 1076008723,1076008723 -dd 538035844,538035844 -dd 2099530373,2099530373 -dd 4164795346,4164795346 -dd 288553390,288553390 -dd 1839278535,1839278535 -dd 1261411869,1261411869 -dd 4080055004,4080055004 -dd 3964831245,3964831245 -dd 3504587127,3504587127 -dd 1813426987,1813426987 -dd 2579067049,2579067049 -dd 4199060497,4199060497 -dd 577038663,577038663 -dd 3297574056,3297574056 -dd 440397984,440397984 -dd 3626794326,3626794326 -dd 4019204898,4019204898 -dd 3343796615,3343796615 -dd 3251714265,3251714265 -dd 4272081548,4272081548 -dd 906744984,906744984 -dd 3481400742,3481400742 -dd 685669029,685669029 -dd 646887386,646887386 -dd 2764025151,2764025151 -dd 3835509292,3835509292 -dd 227702864,227702864 -dd 2613862250,2613862250 -dd 1648787028,1648787028 -dd 3256061430,3256061430 -dd 3904428176,3904428176 -dd 1593260334,1593260334 -dd 4121936770,4121936770 -dd 3196083615,3196083615 -dd 2090061929,2090061929 -dd 2838353263,2838353263 -dd 3004310991,3004310991 -dd 999926984,999926984 -dd 2809993232,2809993232 -dd 1852021992,1852021992 -dd 2075868123,2075868123 -dd 158869197,158869197 -dd 4095236462,4095236462 -dd 28809964,28809964 -dd 2828685187,2828685187 -dd 1701746150,1701746150 -dd 2129067946,2129067946 -dd 147831841,147831841 -dd 3873969647,3873969647 -dd 3650873274,3650873274 -dd 3459673930,3459673930 -dd 3557400554,3557400554 -dd 3598495785,3598495785 -dd 2947720241,2947720241 -dd 824393514,824393514 -dd 815048134,815048134 -dd 3227951669,3227951669 -dd 935087732,935087732 -dd 2798289660,2798289660 -dd 2966458592,2966458592 -dd 366520115,366520115 -dd 1251476721,1251476721 -dd 4158319681,4158319681 -dd 240176511,240176511 -dd 804688151,804688151 -dd 2379631990,2379631990 -dd 1303441219,1303441219 -dd 1414376140,1414376140 -dd 3741619940,3741619940 -dd 3820343710,3820343710 -dd 461924940,461924940 -dd 3089050817,3089050817 -dd 2136040774,2136040774 -dd 82468509,82468509 -dd 1563790337,1563790337 -dd 1937016826,1937016826 -dd 776014843,776014843 -dd 1511876531,1511876531 -dd 1389550482,1389550482 -dd 861278441,861278441 -dd 323475053,323475053 -dd 2355222426,2355222426 -dd 2047648055,2047648055 -dd 2383738969,2383738969 -dd 2302415851,2302415851 -dd 3995576782,3995576782 -dd 902390199,902390199 -dd 3991215329,3991215329 -dd 1018251130,1018251130 -dd 1507840668,1507840668 -dd 1064563285,1064563285 -dd 2043548696,2043548696 -dd 3208103795,3208103795 -dd 3939366739,3939366739 -dd 1537932639,1537932639 -dd 342834655,342834655 -dd 2262516856,2262516856 -dd 2180231114,2180231114 -dd 1053059257,1053059257 -dd 741614648,741614648 -dd 1598071746,1598071746 -dd 1925389590,1925389590 -dd 203809468,203809468 -dd 2336832552,2336832552 -dd 1100287487,1100287487 -dd 1895934009,1895934009 -dd 3736275976,3736275976 -dd 2632234200,2632234200 -dd 2428589668,2428589668 -dd 1636092795,1636092795 -dd 1890988757,1890988757 -dd 1952214088,1952214088 -dd 1113045200,1113045200 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -db 82,9,106,213,48,54,165,56 -db 191,64,163,158,129,243,215,251 -db 124,227,57,130,155,47,255,135 -db 52,142,67,68,196,222,233,203 -db 84,123,148,50,166,194,35,61 -db 238,76,149,11,66,250,195,78 -db 8,46,161,102,40,217,36,178 -db 118,91,162,73,109,139,209,37 -db 114,248,246,100,134,104,152,22 -db 212,164,92,204,93,101,182,146 -db 108,112,72,80,253,237,185,218 -db 94,21,70,87,167,141,157,132 -db 144,216,171,0,140,188,211,10 -db 247,228,88,5,184,179,69,6 -db 208,44,30,143,202,63,15,2 -db 193,175,189,3,1,19,138,107 -db 58,145,17,65,79,103,220,234 -db 151,242,207,206,240,180,230,115 -db 150,172,116,34,231,173,53,133 -db 226,249,55,232,28,117,223,110 -db 71,241,26,113,29,41,197,137 -db 111,183,98,14,170,24,190,27 -db 252,86,62,75,198,210,121,32 -db 154,219,192,254,120,205,90,244 -db 31,221,168,51,136,7,199,49 -db 177,18,16,89,39,128,236,95 -db 96,81,127,169,25,181,74,13 -db 45,229,122,159,147,201,156,239 -db 160,224,59,77,174,42,245,176 -db 200,235,187,60,131,83,153,97 -db 23,43,4,126,186,119,214,38 -db 225,105,20,99,85,33,12,125 -global _AES_decrypt -align 16 -_AES_decrypt: -L$_AES_decrypt_begin: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [20+esp] - mov edi,DWORD [28+esp] - mov eax,esp - sub esp,36 - and esp,-64 - lea ebx,[edi-127] - sub ebx,esp - neg ebx - and ebx,960 - sub esp,ebx - add esp,4 - mov DWORD [28+esp],eax - call L$010pic_point -L$010pic_point: - pop ebp - lea eax,[_OPENSSL_ia32cap_P] - lea ebp,[(L$AES_Td-L$010pic_point)+ebp] - lea ebx,[764+esp] - sub ebx,ebp - and ebx,768 - lea ebp,[2176+ebx*1+ebp] - bt DWORD [eax],25 - jnc NEAR L$011x86 - movq mm0,[esi] - movq mm4,[8+esi] - call __sse_AES_decrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - movq [esi],mm0 - movq [8+esi],mm4 - emms - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -L$011x86: - mov DWORD [24+esp],ebp - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - call __x86_AES_decrypt_compact - mov esp,DWORD [28+esp] - mov esi,DWORD [24+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - pop edi - pop esi - pop ebx - pop ebp - ret -global _AES_cbc_encrypt -align 16 -_AES_cbc_encrypt: -L$_AES_cbc_encrypt_begin: - push ebp - push ebx - push esi - push edi - mov ecx,DWORD [28+esp] - cmp ecx,0 - je NEAR L$012drop_out - call L$013pic_point -L$013pic_point: - pop ebp - lea eax,[_OPENSSL_ia32cap_P] - cmp DWORD [40+esp],0 - lea ebp,[(L$AES_Te-L$013pic_point)+ebp] - jne NEAR L$014picked_te - lea ebp,[(L$AES_Td-L$AES_Te)+ebp] -L$014picked_te: - pushfd - cld - cmp ecx,512 - jb NEAR L$015slow_way - test ecx,15 - jnz NEAR L$015slow_way - bt DWORD [eax],28 - jc NEAR L$015slow_way - lea esi,[esp-324] - and esi,-64 - mov eax,ebp - lea ebx,[2304+ebp] - mov edx,esi - and eax,4095 - and ebx,4095 - and edx,4095 - cmp edx,ebx - jb NEAR L$016tbl_break_out - sub edx,ebx - sub esi,edx - jmp NEAR L$017tbl_ok -align 4 -L$016tbl_break_out: - sub edx,eax - and edx,4095 - add edx,384 - sub esi,edx -align 4 -L$017tbl_ok: - lea edx,[24+esp] - xchg esp,esi - add esp,4 - mov DWORD [24+esp],ebp - mov DWORD [28+esp],esi - mov eax,DWORD [edx] - mov ebx,DWORD [4+edx] - mov edi,DWORD [12+edx] - mov esi,DWORD [16+edx] - mov edx,DWORD [20+edx] - mov DWORD [32+esp],eax - mov DWORD [36+esp],ebx - mov DWORD [40+esp],ecx - mov DWORD [44+esp],edi - mov DWORD [48+esp],esi - mov DWORD [316+esp],0 - mov ebx,edi - mov ecx,61 - sub ebx,ebp - mov esi,edi - and ebx,4095 - lea edi,[76+esp] - cmp ebx,2304 - jb NEAR L$018do_copy - cmp ebx,3852 - jb NEAR L$019skip_copy -align 4 -L$018do_copy: - mov DWORD [44+esp],edi -dd 2784229001 -L$019skip_copy: - mov edi,16 -align 4 -L$020prefetch_tbl: - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov esi,DWORD [96+ebp] - lea ebp,[128+ebp] - sub edi,1 - jnz NEAR L$020prefetch_tbl - sub ebp,2048 - mov esi,DWORD [32+esp] - mov edi,DWORD [48+esp] - cmp edx,0 - je NEAR L$021fast_decrypt - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] -align 16 -L$022fast_enc_loop: - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - xor eax,DWORD [esi] - xor ebx,DWORD [4+esi] - xor ecx,DWORD [8+esi] - xor edx,DWORD [12+esi] - mov edi,DWORD [44+esp] - call __x86_AES_encrypt - mov esi,DWORD [32+esp] - mov edi,DWORD [36+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - lea esi,[16+esi] - mov ecx,DWORD [40+esp] - mov DWORD [32+esp],esi - lea edx,[16+edi] - mov DWORD [36+esp],edx - sub ecx,16 - mov DWORD [40+esp],ecx - jnz NEAR L$022fast_enc_loop - mov esi,DWORD [48+esp] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - cmp DWORD [316+esp],0 - mov edi,DWORD [44+esp] - je NEAR L$023skip_ezero - mov ecx,60 - xor eax,eax -align 4 -dd 2884892297 -L$023skip_ezero: - mov esp,DWORD [28+esp] - popfd -L$012drop_out: - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$021fast_decrypt: - cmp esi,DWORD [36+esp] - je NEAR L$024fast_dec_in_place - mov DWORD [52+esp],edi -align 4 -align 16 -L$025fast_dec_loop: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov edi,DWORD [44+esp] - call __x86_AES_decrypt - mov edi,DWORD [52+esp] - mov esi,DWORD [40+esp] - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov edi,DWORD [36+esp] - mov esi,DWORD [32+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [40+esp] - mov DWORD [52+esp],esi - lea esi,[16+esi] - mov DWORD [32+esp],esi - lea edi,[16+edi] - mov DWORD [36+esp],edi - sub ecx,16 - mov DWORD [40+esp],ecx - jnz NEAR L$025fast_dec_loop - mov edi,DWORD [52+esp] - mov esi,DWORD [48+esp] - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - jmp NEAR L$026fast_dec_out -align 16 -L$024fast_dec_in_place: -L$027fast_dec_in_place_loop: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - lea edi,[60+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov edi,DWORD [44+esp] - call __x86_AES_decrypt - mov edi,DWORD [48+esp] - mov esi,DWORD [36+esp] - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - lea esi,[16+esi] - mov DWORD [36+esp],esi - lea esi,[60+esp] - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov esi,DWORD [32+esp] - mov ecx,DWORD [40+esp] - lea esi,[16+esi] - mov DWORD [32+esp],esi - sub ecx,16 - mov DWORD [40+esp],ecx - jnz NEAR L$027fast_dec_in_place_loop -align 4 -L$026fast_dec_out: - cmp DWORD [316+esp],0 - mov edi,DWORD [44+esp] - je NEAR L$028skip_dzero - mov ecx,60 - xor eax,eax -align 4 -dd 2884892297 -L$028skip_dzero: - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$015slow_way: - mov eax,DWORD [eax] - mov edi,DWORD [36+esp] - lea esi,[esp-80] - and esi,-64 - lea ebx,[edi-143] - sub ebx,esi - neg ebx - and ebx,960 - sub esi,ebx - lea ebx,[768+esi] - sub ebx,ebp - and ebx,768 - lea ebp,[2176+ebx*1+ebp] - lea edx,[24+esp] - xchg esp,esi - add esp,4 - mov DWORD [24+esp],ebp - mov DWORD [28+esp],esi - mov DWORD [52+esp],eax - mov eax,DWORD [edx] - mov ebx,DWORD [4+edx] - mov esi,DWORD [16+edx] - mov edx,DWORD [20+edx] - mov DWORD [32+esp],eax - mov DWORD [36+esp],ebx - mov DWORD [40+esp],ecx - mov DWORD [44+esp],edi - mov DWORD [48+esp],esi - mov edi,esi - mov esi,eax - cmp edx,0 - je NEAR L$029slow_decrypt - cmp ecx,16 - mov edx,ebx - jb NEAR L$030slow_enc_tail - bt DWORD [52+esp],25 - jnc NEAR L$031slow_enc_x86 - movq mm0,[edi] - movq mm4,[8+edi] -align 16 -L$032slow_enc_loop_sse: - pxor mm0,[esi] - pxor mm4,[8+esi] - mov edi,DWORD [44+esp] - call __sse_AES_encrypt_compact - mov esi,DWORD [32+esp] - mov edi,DWORD [36+esp] - mov ecx,DWORD [40+esp] - movq [edi],mm0 - movq [8+edi],mm4 - lea esi,[16+esi] - mov DWORD [32+esp],esi - lea edx,[16+edi] - mov DWORD [36+esp],edx - sub ecx,16 - cmp ecx,16 - mov DWORD [40+esp],ecx - jae NEAR L$032slow_enc_loop_sse - test ecx,15 - jnz NEAR L$030slow_enc_tail - mov esi,DWORD [48+esp] - movq [esi],mm0 - movq [8+esi],mm4 - emms - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$031slow_enc_x86: - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] -align 4 -L$033slow_enc_loop_x86: - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - xor eax,DWORD [esi] - xor ebx,DWORD [4+esi] - xor ecx,DWORD [8+esi] - xor edx,DWORD [12+esi] - mov edi,DWORD [44+esp] - call __x86_AES_encrypt_compact - mov esi,DWORD [32+esp] - mov edi,DWORD [36+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [40+esp] - lea esi,[16+esi] - mov DWORD [32+esp],esi - lea edx,[16+edi] - mov DWORD [36+esp],edx - sub ecx,16 - cmp ecx,16 - mov DWORD [40+esp],ecx - jae NEAR L$033slow_enc_loop_x86 - test ecx,15 - jnz NEAR L$030slow_enc_tail - mov esi,DWORD [48+esp] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$030slow_enc_tail: - emms - mov edi,edx - mov ebx,16 - sub ebx,ecx - cmp edi,esi - je NEAR L$034enc_in_place -align 4 -dd 2767451785 - jmp NEAR L$035enc_skip_in_place -L$034enc_in_place: - lea edi,[ecx*1+edi] -L$035enc_skip_in_place: - mov ecx,ebx - xor eax,eax -align 4 -dd 2868115081 - mov edi,DWORD [48+esp] - mov esi,edx - mov eax,DWORD [edi] - mov ebx,DWORD [4+edi] - mov DWORD [40+esp],16 - jmp NEAR L$033slow_enc_loop_x86 -align 16 -L$029slow_decrypt: - bt DWORD [52+esp],25 - jnc NEAR L$036slow_dec_loop_x86 -align 4 -L$037slow_dec_loop_sse: - movq mm0,[esi] - movq mm4,[8+esi] - mov edi,DWORD [44+esp] - call __sse_AES_decrypt_compact - mov esi,DWORD [32+esp] - lea eax,[60+esp] - mov ebx,DWORD [36+esp] - mov ecx,DWORD [40+esp] - mov edi,DWORD [48+esp] - movq mm1,[esi] - movq mm5,[8+esi] - pxor mm0,[edi] - pxor mm4,[8+edi] - movq [edi],mm1 - movq [8+edi],mm5 - sub ecx,16 - jc NEAR L$038slow_dec_partial_sse - movq [ebx],mm0 - movq [8+ebx],mm4 - lea ebx,[16+ebx] - mov DWORD [36+esp],ebx - lea esi,[16+esi] - mov DWORD [32+esp],esi - mov DWORD [40+esp],ecx - jnz NEAR L$037slow_dec_loop_sse - emms - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$038slow_dec_partial_sse: - movq [eax],mm0 - movq [8+eax],mm4 - emms - add ecx,16 - mov edi,ebx - mov esi,eax -align 4 -dd 2767451785 - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$036slow_dec_loop_x86: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - lea edi,[60+esp] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov edi,DWORD [44+esp] - call __x86_AES_decrypt_compact - mov edi,DWORD [48+esp] - mov esi,DWORD [40+esp] - xor eax,DWORD [edi] - xor ebx,DWORD [4+edi] - xor ecx,DWORD [8+edi] - xor edx,DWORD [12+edi] - sub esi,16 - jc NEAR L$039slow_dec_partial_x86 - mov DWORD [40+esp],esi - mov esi,DWORD [36+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - lea esi,[16+esi] - mov DWORD [36+esp],esi - lea esi,[60+esp] - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov esi,DWORD [32+esp] - lea esi,[16+esi] - mov DWORD [32+esp],esi - jnz NEAR L$036slow_dec_loop_x86 - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret - pushfd -align 16 -L$039slow_dec_partial_x86: - lea esi,[60+esp] - mov DWORD [esi],eax - mov DWORD [4+esi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - mov esi,DWORD [32+esp] - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [40+esp] - mov edi,DWORD [36+esp] - lea esi,[60+esp] -align 4 -dd 2767451785 - mov esp,DWORD [28+esp] - popfd - pop edi - pop esi - pop ebx - pop ebp - ret -align 16 -__x86_AES_set_encrypt_key: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [24+esp] - mov edi,DWORD [32+esp] - test esi,-1 - jz NEAR L$040badpointer - test edi,-1 - jz NEAR L$040badpointer - call L$041pic_point -L$041pic_point: - pop ebp - lea ebp,[(L$AES_Te-L$041pic_point)+ebp] - lea ebp,[2176+ebp] - mov eax,DWORD [ebp-128] - mov ebx,DWORD [ebp-96] - mov ecx,DWORD [ebp-64] - mov edx,DWORD [ebp-32] - mov eax,DWORD [ebp] - mov ebx,DWORD [32+ebp] - mov ecx,DWORD [64+ebp] - mov edx,DWORD [96+ebp] - mov ecx,DWORD [28+esp] - cmp ecx,128 - je NEAR L$04210rounds - cmp ecx,192 - je NEAR L$04312rounds - cmp ecx,256 - je NEAR L$04414rounds - mov eax,-2 - jmp NEAR L$045exit -L$04210rounds: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - xor ecx,ecx - jmp NEAR L$04610shortcut -align 4 -L$04710loop: - mov eax,DWORD [edi] - mov edx,DWORD [12+edi] -L$04610shortcut: - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,24 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,8 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,16 - xor eax,ebx - xor eax,DWORD [896+ecx*4+ebp] - mov DWORD [16+edi],eax - xor eax,DWORD [4+edi] - mov DWORD [20+edi],eax - xor eax,DWORD [8+edi] - mov DWORD [24+edi],eax - xor eax,DWORD [12+edi] - mov DWORD [28+edi],eax - inc ecx - add edi,16 - cmp ecx,10 - jl NEAR L$04710loop - mov DWORD [80+edi],10 - xor eax,eax - jmp NEAR L$045exit -L$04312rounds: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov ecx,DWORD [16+esi] - mov edx,DWORD [20+esi] - mov DWORD [16+edi],ecx - mov DWORD [20+edi],edx - xor ecx,ecx - jmp NEAR L$04812shortcut -align 4 -L$04912loop: - mov eax,DWORD [edi] - mov edx,DWORD [20+edi] -L$04812shortcut: - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,24 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,8 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,16 - xor eax,ebx - xor eax,DWORD [896+ecx*4+ebp] - mov DWORD [24+edi],eax - xor eax,DWORD [4+edi] - mov DWORD [28+edi],eax - xor eax,DWORD [8+edi] - mov DWORD [32+edi],eax - xor eax,DWORD [12+edi] - mov DWORD [36+edi],eax - cmp ecx,7 - je NEAR L$05012break - inc ecx - xor eax,DWORD [16+edi] - mov DWORD [40+edi],eax - xor eax,DWORD [20+edi] - mov DWORD [44+edi],eax - add edi,24 - jmp NEAR L$04912loop -L$05012break: - mov DWORD [72+edi],12 - xor eax,eax - jmp NEAR L$045exit -L$04414rounds: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [8+esi] - mov edx,DWORD [12+esi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [8+edi],ecx - mov DWORD [12+edi],edx - mov eax,DWORD [16+esi] - mov ebx,DWORD [20+esi] - mov ecx,DWORD [24+esi] - mov edx,DWORD [28+esi] - mov DWORD [16+edi],eax - mov DWORD [20+edi],ebx - mov DWORD [24+edi],ecx - mov DWORD [28+edi],edx - xor ecx,ecx - jmp NEAR L$05114shortcut -align 4 -L$05214loop: - mov edx,DWORD [28+edi] -L$05114shortcut: - mov eax,DWORD [edi] - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,24 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,8 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,16 - xor eax,ebx - xor eax,DWORD [896+ecx*4+ebp] - mov DWORD [32+edi],eax - xor eax,DWORD [4+edi] - mov DWORD [36+edi],eax - xor eax,DWORD [8+edi] - mov DWORD [40+edi],eax - xor eax,DWORD [12+edi] - mov DWORD [44+edi],eax - cmp ecx,6 - je NEAR L$05314break - inc ecx - mov edx,eax - mov eax,DWORD [16+edi] - movzx esi,dl - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shr edx,16 - shl ebx,8 - movzx esi,dl - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - movzx esi,dh - shl ebx,16 - xor eax,ebx - movzx ebx,BYTE [esi*1+ebp-128] - shl ebx,24 - xor eax,ebx - mov DWORD [48+edi],eax - xor eax,DWORD [20+edi] - mov DWORD [52+edi],eax - xor eax,DWORD [24+edi] - mov DWORD [56+edi],eax - xor eax,DWORD [28+edi] - mov DWORD [60+edi],eax - add edi,32 - jmp NEAR L$05214loop -L$05314break: - mov DWORD [48+edi],14 - xor eax,eax - jmp NEAR L$045exit -L$040badpointer: - mov eax,-1 -L$045exit: - pop edi - pop esi - pop ebx - pop ebp - ret -global _AES_set_encrypt_key -align 16 -_AES_set_encrypt_key: -L$_AES_set_encrypt_key_begin: - call __x86_AES_set_encrypt_key - ret -global _AES_set_decrypt_key -align 16 -_AES_set_decrypt_key: -L$_AES_set_decrypt_key_begin: - call __x86_AES_set_encrypt_key - cmp eax,0 - je NEAR L$054proceed - ret -L$054proceed: - push ebp - push ebx - push esi - push edi - mov esi,DWORD [28+esp] - mov ecx,DWORD [240+esi] - lea ecx,[ecx*4] - lea edi,[ecx*4+esi] -align 4 -L$055invert: - mov eax,DWORD [esi] - mov ebx,DWORD [4+esi] - mov ecx,DWORD [edi] - mov edx,DWORD [4+edi] - mov DWORD [edi],eax - mov DWORD [4+edi],ebx - mov DWORD [esi],ecx - mov DWORD [4+esi],edx - mov eax,DWORD [8+esi] - mov ebx,DWORD [12+esi] - mov ecx,DWORD [8+edi] - mov edx,DWORD [12+edi] - mov DWORD [8+edi],eax - mov DWORD [12+edi],ebx - mov DWORD [8+esi],ecx - mov DWORD [12+esi],edx - add esi,16 - sub edi,16 - cmp esi,edi - jne NEAR L$055invert - mov edi,DWORD [28+esp] - mov esi,DWORD [240+edi] - lea esi,[esi*1+esi-2] - lea esi,[esi*8+edi] - mov DWORD [28+esp],esi - mov eax,DWORD [16+edi] -align 4 -L$056permute: - add edi,16 - mov ebp,2155905152 - and ebp,eax - lea ebx,[eax*1+eax] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ebx,4278124286 - and esi,454761243 - xor ebx,esi - mov ebp,2155905152 - and ebp,ebx - lea ecx,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ecx,4278124286 - and esi,454761243 - xor ebx,eax - xor ecx,esi - mov ebp,2155905152 - and ebp,ecx - lea edx,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - xor ecx,eax - sub esi,ebp - and edx,4278124286 - and esi,454761243 - rol eax,8 - xor edx,esi - mov ebp,DWORD [4+edi] - xor eax,ebx - xor ebx,edx - xor eax,ecx - rol ebx,24 - xor ecx,edx - xor eax,edx - rol ecx,16 - xor eax,ebx - rol edx,8 - xor eax,ecx - mov ebx,ebp - xor eax,edx - mov DWORD [edi],eax - mov ebp,2155905152 - and ebp,ebx - lea ecx,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ecx,4278124286 - and esi,454761243 - xor ecx,esi - mov ebp,2155905152 - and ebp,ecx - lea edx,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and edx,4278124286 - and esi,454761243 - xor ecx,ebx - xor edx,esi - mov ebp,2155905152 - and ebp,edx - lea eax,[edx*1+edx] - mov esi,ebp - shr ebp,7 - xor edx,ebx - sub esi,ebp - and eax,4278124286 - and esi,454761243 - rol ebx,8 - xor eax,esi - mov ebp,DWORD [8+edi] - xor ebx,ecx - xor ecx,eax - xor ebx,edx - rol ecx,24 - xor edx,eax - xor ebx,eax - rol edx,16 - xor ebx,ecx - rol eax,8 - xor ebx,edx - mov ecx,ebp - xor ebx,eax - mov DWORD [4+edi],ebx - mov ebp,2155905152 - and ebp,ecx - lea edx,[ecx*1+ecx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and edx,4278124286 - and esi,454761243 - xor edx,esi - mov ebp,2155905152 - and ebp,edx - lea eax,[edx*1+edx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and eax,4278124286 - and esi,454761243 - xor edx,ecx - xor eax,esi - mov ebp,2155905152 - and ebp,eax - lea ebx,[eax*1+eax] - mov esi,ebp - shr ebp,7 - xor eax,ecx - sub esi,ebp - and ebx,4278124286 - and esi,454761243 - rol ecx,8 - xor ebx,esi - mov ebp,DWORD [12+edi] - xor ecx,edx - xor edx,ebx - xor ecx,eax - rol edx,24 - xor eax,ebx - xor ecx,ebx - rol eax,16 - xor ecx,edx - rol ebx,8 - xor ecx,eax - mov edx,ebp - xor ecx,ebx - mov DWORD [8+edi],ecx - mov ebp,2155905152 - and ebp,edx - lea eax,[edx*1+edx] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and eax,4278124286 - and esi,454761243 - xor eax,esi - mov ebp,2155905152 - and ebp,eax - lea ebx,[eax*1+eax] - mov esi,ebp - shr ebp,7 - sub esi,ebp - and ebx,4278124286 - and esi,454761243 - xor eax,edx - xor ebx,esi - mov ebp,2155905152 - and ebp,ebx - lea ecx,[ebx*1+ebx] - mov esi,ebp - shr ebp,7 - xor ebx,edx - sub esi,ebp - and ecx,4278124286 - and esi,454761243 - rol edx,8 - xor ecx,esi - mov ebp,DWORD [16+edi] - xor edx,eax - xor eax,ecx - xor edx,ebx - rol eax,24 - xor ebx,ecx - xor edx,ecx - rol ebx,16 - xor edx,eax - rol ecx,8 - xor edx,ebx - mov eax,ebp - xor edx,ecx - mov DWORD [12+edi],edx - cmp edi,DWORD [28+esp] - jb NEAR L$056permute - xor eax,eax - pop edi - pop esi - pop ebx - pop ebp - ret -db 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -db 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -db 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -segment .bss -common _OPENSSL_ia32cap_P 16 diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h index 6aeb27ba400834..77f65c3b5445e2 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Fri Sep 13 16:03:39 2019 UTC" +#define DATE "built on: Wed Mar 18 21:11:06 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm index 7383523877eec8..96071a300ead92 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm @@ -4386,19 +4386,15 @@ L$009pic: or eax,DWORD [4+edi] or eax,DWORD [8+edi] or eax,DWORD [12+edi] + mov ebx,DWORD [576+esp] + not ebx + or eax,ebx + mov ebx,DWORD [580+esp] + not ebx + or eax,ebx + or eax,DWORD [584+esp] db 62 jnz NEAR L$010add_proceed - mov eax,DWORD [576+esp] - and eax,DWORD [580+esp] - mov ebx,DWORD [584+esp] - jz NEAR L$010add_proceed - test ebx,ebx - jz NEAR L$011add_double - mov edi,DWORD [616+esp] - xor eax,eax - mov ecx,24 -db 252,243,171 - jmp NEAR L$012add_done align 16 L$011add_double: mov esi,DWORD [620+esp] diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h index ce324699ae1f17..2242cd2fc05d89 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h index c3b41df01e40a3..0c96ce73633dac 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_WIN32 # define DSO_EXTENSION ".dll" #endif diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h index e0b784dfe0539b..8fb667373af516 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi index 5028da71f3d37c..f15a17c0bebb0a 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi @@ -20,6 +20,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', @@ -28,9 +29,9 @@ ], 'openssl_cflags_VC-WIN32': [ '-Wa,--noexecstack', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', '/Gs0 /GF /Gy', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi index a5bb5f58ee45b3..0c3ab72e0a2f35 100644 --- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi @@ -717,6 +717,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', @@ -725,9 +726,9 @@ ], 'openssl_cflags_VC-WIN32': [ '-Wa,--noexecstack', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', '/Gs0 /GF /Gy', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm index 16ff6d982004a3..e2e28d75311dd3 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm @@ -15,7 +15,7 @@ our %config = ( ARFLAGS => [ "/nologo" ], AS => "nasm", CC => "cl", - CFLAGS => [ "/W3 /wd4090 /nologo /O2 /WX" ], + CFLAGS => [ "/W3 /wd4090 /nologo /O2" ], CPP => "\$(CC) /EP /C", CPPDEFINES => [ ], CPPFLAGS => [ ], @@ -58,7 +58,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -114,8 +114,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN32", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -124,14 +124,14 @@ our %target = ( AS => "nasm", ASFLAGS => "", CC => "cl", - CFLAGS => "/W3 /wd4090 /nologo /O2 /WX", + CFLAGS => "/W3 /wd4090 /nologo /O2", CPP => "\$(CC) /EP /C", HASHBANGPERL => "/usr/bin/env perl", LD => "link", LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x55ddfff979c8)", + RANLIB => "CODE(0x55e705f67598)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c", @@ -254,6 +254,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -372,8 +373,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -641,14 +642,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -724,6 +717,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1521,6 +1522,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3239,7 +3246,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3247,6 +3253,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3740,14 +3747,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4188,6 +4187,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4897,49 +4904,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4961,7 +4960,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4975,613 +4973,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5599,188 +5495,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5810,13 +5675,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5826,43 +5689,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5872,31 +5728,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5914,278 +5765,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6195,301 +6000,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6497,7 +6252,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6505,7 +6259,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6513,7 +6266,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6521,7 +6273,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6529,7 +6280,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6537,163 +6287,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6711,223 +6434,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6935,21 +6621,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6957,13 +6640,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6971,81 +6652,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7053,328 +6721,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7384,85 +6991,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7485,361 +7078,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7861,259 +7394,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8123,31 +7613,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8157,7 +7642,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8183,13 +7667,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8215,7 +7697,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8241,709 +7722,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8994,6 +8357,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9238,7 +8609,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9564,7 +8934,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9610,7 +8979,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9676,7 +9044,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9701,7 +9068,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9799,7 +9165,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9849,18 +9214,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9871,6 +9233,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9934,10 +9300,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9966,6 +9328,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10230,6 +9596,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15098,7 +14465,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15106,6 +14472,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15333,6 +14700,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15435,10 +14810,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15467,6 +14838,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h index 916cdacd502875..71f5a9d1a106e9 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Fri Sep 13 16:03:44 2019 UTC" +#define DATE "built on: Wed Mar 18 21:11:12 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h index ce324699ae1f17..2242cd2fc05d89 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h index c3b41df01e40a3..0c96ce73633dac 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_WIN32 # define DSO_EXTENSION ".dll" #endif diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h index 48cd14288af59b..24a8c49752807b 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h @@ -102,9 +102,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi index e4ddabd2bb66e8..474ccf785b4e19 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi @@ -11,9 +11,9 @@ 'OPENSSL_PIC', ], 'openssl_cflags_VC-WIN32': [ - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', '/Gs0 /GF /Gy', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi index 2c843d99020ec1..9776407687b5e2 100644 --- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi @@ -695,9 +695,9 @@ 'OPENSSL_PIC', ], 'openssl_cflags_VC-WIN32': [ - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', '/Gs0 /GF /Gy', - '/W3 /wd4090 /nologo /O2 /WX', + '/W3 /wd4090 /nologo /O2', ], 'openssl_ex_libs_VC-WIN32': [ 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib', diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm index 1d006b56d6bc9e..949959ff1074ad 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm @@ -57,7 +57,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -113,8 +113,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN64-ARM", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -128,7 +128,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x55cd56acf3f8)", + RANLIB => "CODE(0x55748984a208)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/50-win-onecore.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c", @@ -248,6 +248,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -366,8 +367,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -635,14 +636,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -718,6 +711,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1515,6 +1516,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3233,7 +3240,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3241,6 +3247,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3734,14 +3741,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4182,6 +4181,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4891,49 +4898,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4955,7 +4954,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4969,613 +4967,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5593,188 +5489,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5804,13 +5669,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5820,43 +5683,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5866,31 +5722,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5908,278 +5759,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6189,301 +5994,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6491,7 +6246,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,7 +6260,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6515,7 +6267,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6523,7 +6274,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6531,163 +6281,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6705,223 +6428,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6929,21 +6615,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6951,13 +6634,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6965,81 +6646,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7047,328 +6715,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7378,85 +6985,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7479,361 +7072,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7855,259 +7388,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8117,31 +7607,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8151,7 +7636,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8177,13 +7661,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8209,7 +7691,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8235,709 +7716,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8988,6 +8351,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9232,7 +8603,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9558,7 +8928,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9604,7 +8973,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9670,7 +9038,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9695,7 +9062,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9793,7 +9159,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9843,18 +9208,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9865,6 +9227,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9928,10 +9294,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9960,6 +9322,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10224,6 +9590,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15092,7 +14459,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15100,6 +14466,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15327,6 +14694,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15429,10 +14804,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15461,6 +14832,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h index 3e790eb5d64363..95181bd2e5e4f9 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: VC-WIN64-ARM" -#define DATE "built on: Fri Sep 13 16:03:47 2019 UTC" +#define DATE "built on: Wed Mar 18 21:11:15 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h index d803b518584f2e..dab67d1b37ae72 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h index c3b41df01e40a3..0c96ce73633dac 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_WIN32 # define DSO_EXTENSION ".dll" #endif diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h index 8e89c3c5016be6..edc97abafd776f 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm index fd72727b52092d..84a7982debc195 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm @@ -54,13 +54,13 @@ our %config = ( export_var_as_fn => "1", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_WIN64A" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -116,8 +116,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN64A", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -133,7 +133,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x560295a39668)", + RANLIB => "CODE(0x556e5b07ddf8)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s", @@ -259,6 +259,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -376,8 +377,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -645,14 +646,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -728,6 +721,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1525,6 +1526,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3266,7 +3273,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3274,6 +3280,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3767,14 +3774,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4215,6 +4214,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4924,49 +4931,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4976,25 +4975,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -5012,13 +5007,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5032,613 +5025,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5656,188 +5547,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5847,19 +5707,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5885,31 +5742,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5919,37 +5771,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5959,31 +5805,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -6001,278 +5842,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6282,301 +6077,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6584,7 +6329,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6592,7 +6336,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6600,7 +6343,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6608,7 +6350,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6616,7 +6357,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6624,163 +6364,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6798,241 +6511,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7040,21 +6713,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7062,13 +6732,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7076,81 +6744,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7158,328 +6813,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7489,91 +7083,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7592,7 +7171,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7602,361 +7180,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7978,265 +7496,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8246,31 +7720,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8280,7 +7749,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8294,7 +7762,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8312,19 +7779,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8338,7 +7802,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8356,13 +7819,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8388,727 +7849,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9159,6 +8499,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9403,7 +8751,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9729,7 +9076,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9775,7 +9121,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9841,7 +9186,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9866,7 +9210,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9964,7 +9307,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -10014,18 +9356,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10036,6 +9375,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10099,10 +9442,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10131,6 +9470,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10395,6 +9738,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15378,7 +14722,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15386,6 +14729,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15613,6 +14957,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15715,10 +15067,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15747,6 +15095,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aes-x86_64.asm deleted file mode 100644 index c01e41b30164db..00000000000000 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aes-x86_64.asm +++ /dev/null @@ -1,2960 +0,0 @@ -default rel -%define XMMWORD -%define YMMWORD -%define ZMMWORD -section .text code align=64 - - -ALIGN 16 -_x86_64_AES_encrypt: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - - mov r13d,DWORD[240+r15] - sub r13d,1 - jmp NEAR $L$enc_loop -ALIGN 16 -$L$enc_loop: - - movzx esi,al - movzx edi,bl - movzx ebp,cl - mov r10d,DWORD[rsi*8+r14] - mov r11d,DWORD[rdi*8+r14] - mov r12d,DWORD[rbp*8+r14] - - movzx esi,bh - movzx edi,ch - movzx ebp,dl - xor r10d,DWORD[3+rsi*8+r14] - xor r11d,DWORD[3+rdi*8+r14] - mov r8d,DWORD[rbp*8+r14] - - movzx esi,dh - shr ecx,16 - movzx ebp,ah - xor r12d,DWORD[3+rsi*8+r14] - shr edx,16 - xor r8d,DWORD[3+rbp*8+r14] - - shr ebx,16 - lea r15,[16+r15] - shr eax,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - xor r10d,DWORD[2+rsi*8+r14] - xor r11d,DWORD[2+rdi*8+r14] - xor r12d,DWORD[2+rbp*8+r14] - - movzx esi,dh - movzx edi,ah - movzx ebp,bl - xor r10d,DWORD[1+rsi*8+r14] - xor r11d,DWORD[1+rdi*8+r14] - xor r8d,DWORD[2+rbp*8+r14] - - mov edx,DWORD[12+r15] - movzx edi,bh - movzx ebp,ch - mov eax,DWORD[r15] - xor r12d,DWORD[1+rdi*8+r14] - xor r8d,DWORD[1+rbp*8+r14] - - mov ebx,DWORD[4+r15] - mov ecx,DWORD[8+r15] - xor eax,r10d - xor ebx,r11d - xor ecx,r12d - xor edx,r8d - sub r13d,1 - jnz NEAR $L$enc_loop - movzx esi,al - movzx edi,bl - movzx ebp,cl - movzx r10d,BYTE[2+rsi*8+r14] - movzx r11d,BYTE[2+rdi*8+r14] - movzx r12d,BYTE[2+rbp*8+r14] - - movzx esi,dl - movzx edi,bh - movzx ebp,ch - movzx r8d,BYTE[2+rsi*8+r14] - mov edi,DWORD[rdi*8+r14] - mov ebp,DWORD[rbp*8+r14] - - and edi,0x0000ff00 - and ebp,0x0000ff00 - - xor r10d,edi - xor r11d,ebp - shr ecx,16 - - movzx esi,dh - movzx edi,ah - shr edx,16 - mov esi,DWORD[rsi*8+r14] - mov edi,DWORD[rdi*8+r14] - - and esi,0x0000ff00 - and edi,0x0000ff00 - shr ebx,16 - xor r12d,esi - xor r8d,edi - shr eax,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - mov esi,DWORD[rsi*8+r14] - mov edi,DWORD[rdi*8+r14] - mov ebp,DWORD[rbp*8+r14] - - and esi,0x00ff0000 - and edi,0x00ff0000 - and ebp,0x00ff0000 - - xor r10d,esi - xor r11d,edi - xor r12d,ebp - - movzx esi,bl - movzx edi,dh - movzx ebp,ah - mov esi,DWORD[rsi*8+r14] - mov edi,DWORD[2+rdi*8+r14] - mov ebp,DWORD[2+rbp*8+r14] - - and esi,0x00ff0000 - and edi,0xff000000 - and ebp,0xff000000 - - xor r8d,esi - xor r10d,edi - xor r11d,ebp - - movzx esi,bh - movzx edi,ch - mov edx,DWORD[((16+12))+r15] - mov esi,DWORD[2+rsi*8+r14] - mov edi,DWORD[2+rdi*8+r14] - mov eax,DWORD[((16+0))+r15] - - and esi,0xff000000 - and edi,0xff000000 - - xor r12d,esi - xor r8d,edi - - mov ebx,DWORD[((16+4))+r15] - mov ecx,DWORD[((16+8))+r15] - xor eax,r10d - xor ebx,r11d - xor ecx,r12d - xor edx,r8d -DB 0xf3,0xc3 - - -ALIGN 16 -_x86_64_AES_encrypt_compact: - - lea r8,[128+r14] - mov edi,DWORD[((0-128))+r8] - mov ebp,DWORD[((32-128))+r8] - mov r10d,DWORD[((64-128))+r8] - mov r11d,DWORD[((96-128))+r8] - mov edi,DWORD[((128-128))+r8] - mov ebp,DWORD[((160-128))+r8] - mov r10d,DWORD[((192-128))+r8] - mov r11d,DWORD[((224-128))+r8] - jmp NEAR $L$enc_loop_compact -ALIGN 16 -$L$enc_loop_compact: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - lea r15,[16+r15] - movzx r10d,al - movzx r11d,bl - movzx r12d,cl - movzx r8d,dl - movzx esi,bh - movzx edi,ch - shr ecx,16 - movzx ebp,dh - movzx r10d,BYTE[r10*1+r14] - movzx r11d,BYTE[r11*1+r14] - movzx r12d,BYTE[r12*1+r14] - movzx r8d,BYTE[r8*1+r14] - - movzx r9d,BYTE[rsi*1+r14] - movzx esi,ah - movzx r13d,BYTE[rdi*1+r14] - movzx edi,cl - movzx ebp,BYTE[rbp*1+r14] - movzx esi,BYTE[rsi*1+r14] - - shl r9d,8 - shr edx,16 - shl r13d,8 - xor r10d,r9d - shr eax,16 - movzx r9d,dl - shr ebx,16 - xor r11d,r13d - shl ebp,8 - movzx r13d,al - movzx edi,BYTE[rdi*1+r14] - xor r12d,ebp - - shl esi,8 - movzx ebp,bl - shl edi,16 - xor r8d,esi - movzx r9d,BYTE[r9*1+r14] - movzx esi,dh - movzx r13d,BYTE[r13*1+r14] - xor r10d,edi - - shr ecx,8 - movzx edi,ah - shl r9d,16 - shr ebx,8 - shl r13d,16 - xor r11d,r9d - movzx ebp,BYTE[rbp*1+r14] - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx edx,BYTE[rcx*1+r14] - movzx ecx,BYTE[rbx*1+r14] - - shl ebp,16 - xor r12d,r13d - shl esi,24 - xor r8d,ebp - shl edi,24 - xor r10d,esi - shl edx,24 - xor r11d,edi - shl ecx,24 - mov eax,r10d - mov ebx,r11d - xor ecx,r12d - xor edx,r8d - cmp r15,QWORD[16+rsp] - je NEAR $L$enc_compact_done - mov r10d,0x80808080 - mov r11d,0x80808080 - and r10d,eax - and r11d,ebx - mov esi,r10d - mov edi,r11d - shr r10d,7 - lea r8d,[rax*1+rax] - shr r11d,7 - lea r9d,[rbx*1+rbx] - sub esi,r10d - sub edi,r11d - and r8d,0xfefefefe - and r9d,0xfefefefe - and esi,0x1b1b1b1b - and edi,0x1b1b1b1b - mov r10d,eax - mov r11d,ebx - xor r8d,esi - xor r9d,edi - - xor eax,r8d - xor ebx,r9d - mov r12d,0x80808080 - rol eax,24 - mov ebp,0x80808080 - rol ebx,24 - and r12d,ecx - and ebp,edx - xor eax,r8d - xor ebx,r9d - mov esi,r12d - ror r10d,16 - mov edi,ebp - ror r11d,16 - lea r8d,[rcx*1+rcx] - shr r12d,7 - xor eax,r10d - shr ebp,7 - xor ebx,r11d - ror r10d,8 - lea r9d,[rdx*1+rdx] - ror r11d,8 - sub esi,r12d - sub edi,ebp - xor eax,r10d - xor ebx,r11d - - and r8d,0xfefefefe - and r9d,0xfefefefe - and esi,0x1b1b1b1b - and edi,0x1b1b1b1b - mov r12d,ecx - mov ebp,edx - xor r8d,esi - xor r9d,edi - - ror r12d,16 - xor ecx,r8d - ror ebp,16 - xor edx,r9d - rol ecx,24 - mov esi,DWORD[r14] - rol edx,24 - xor ecx,r8d - mov edi,DWORD[64+r14] - xor edx,r9d - mov r8d,DWORD[128+r14] - xor ecx,r12d - ror r12d,8 - xor edx,ebp - ror ebp,8 - xor ecx,r12d - mov r9d,DWORD[192+r14] - xor edx,ebp - jmp NEAR $L$enc_loop_compact -ALIGN 16 -$L$enc_compact_done: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] -DB 0xf3,0xc3 - - -global AES_encrypt - -ALIGN 16 -global asm_AES_encrypt - -asm_AES_encrypt: -AES_encrypt: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_encrypt: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - mov rax,rsp - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - - - lea rcx,[((-63))+rdx] - and rsp,-64 - sub rcx,rsp - neg rcx - and rcx,0x3c0 - sub rsp,rcx - sub rsp,32 - - mov QWORD[16+rsp],rsi - mov QWORD[24+rsp],rax - -$L$enc_prologue: - - mov r15,rdx - mov r13d,DWORD[240+r15] - - mov eax,DWORD[rdi] - mov ebx,DWORD[4+rdi] - mov ecx,DWORD[8+rdi] - mov edx,DWORD[12+rdi] - - shl r13d,4 - lea rbp,[r13*1+r15] - mov QWORD[rsp],r15 - mov QWORD[8+rsp],rbp - - - lea r14,[(($L$AES_Te+2048))] - lea rbp,[768+rsp] - sub rbp,r14 - and rbp,0x300 - lea r14,[rbp*1+r14] - - call _x86_64_AES_encrypt_compact - - mov r9,QWORD[16+rsp] - mov rsi,QWORD[24+rsp] - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - mov r15,QWORD[((-48))+rsi] - - mov r14,QWORD[((-40))+rsi] - - mov r13,QWORD[((-32))+rsi] - - mov r12,QWORD[((-24))+rsi] - - mov rbp,QWORD[((-16))+rsi] - - mov rbx,QWORD[((-8))+rsi] - - lea rsp,[rsi] - -$L$enc_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_encrypt: - -ALIGN 16 -_x86_64_AES_decrypt: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - - mov r13d,DWORD[240+r15] - sub r13d,1 - jmp NEAR $L$dec_loop -ALIGN 16 -$L$dec_loop: - - movzx esi,al - movzx edi,bl - movzx ebp,cl - mov r10d,DWORD[rsi*8+r14] - mov r11d,DWORD[rdi*8+r14] - mov r12d,DWORD[rbp*8+r14] - - movzx esi,dh - movzx edi,ah - movzx ebp,dl - xor r10d,DWORD[3+rsi*8+r14] - xor r11d,DWORD[3+rdi*8+r14] - mov r8d,DWORD[rbp*8+r14] - - movzx esi,bh - shr eax,16 - movzx ebp,ch - xor r12d,DWORD[3+rsi*8+r14] - shr edx,16 - xor r8d,DWORD[3+rbp*8+r14] - - shr ebx,16 - lea r15,[16+r15] - shr ecx,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - xor r10d,DWORD[2+rsi*8+r14] - xor r11d,DWORD[2+rdi*8+r14] - xor r12d,DWORD[2+rbp*8+r14] - - movzx esi,bh - movzx edi,ch - movzx ebp,bl - xor r10d,DWORD[1+rsi*8+r14] - xor r11d,DWORD[1+rdi*8+r14] - xor r8d,DWORD[2+rbp*8+r14] - - movzx esi,dh - mov edx,DWORD[12+r15] - movzx ebp,ah - xor r12d,DWORD[1+rsi*8+r14] - mov eax,DWORD[r15] - xor r8d,DWORD[1+rbp*8+r14] - - xor eax,r10d - mov ebx,DWORD[4+r15] - mov ecx,DWORD[8+r15] - xor ecx,r12d - xor ebx,r11d - xor edx,r8d - sub r13d,1 - jnz NEAR $L$dec_loop - lea r14,[2048+r14] - movzx esi,al - movzx edi,bl - movzx ebp,cl - movzx r10d,BYTE[rsi*1+r14] - movzx r11d,BYTE[rdi*1+r14] - movzx r12d,BYTE[rbp*1+r14] - - movzx esi,dl - movzx edi,dh - movzx ebp,ah - movzx r8d,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - - shl edi,8 - shl ebp,8 - - xor r10d,edi - xor r11d,ebp - shr edx,16 - - movzx esi,bh - movzx edi,ch - shr eax,16 - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - - shl esi,8 - shl edi,8 - shr ebx,16 - xor r12d,esi - xor r8d,edi - shr ecx,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - - shl esi,16 - shl edi,16 - shl ebp,16 - - xor r10d,esi - xor r11d,edi - xor r12d,ebp - - movzx esi,bl - movzx edi,bh - movzx ebp,ch - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - - shl esi,16 - shl edi,24 - shl ebp,24 - - xor r8d,esi - xor r10d,edi - xor r11d,ebp - - movzx esi,dh - movzx edi,ah - mov edx,DWORD[((16+12))+r15] - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - mov eax,DWORD[((16+0))+r15] - - shl esi,24 - shl edi,24 - - xor r12d,esi - xor r8d,edi - - mov ebx,DWORD[((16+4))+r15] - mov ecx,DWORD[((16+8))+r15] - lea r14,[((-2048))+r14] - xor eax,r10d - xor ebx,r11d - xor ecx,r12d - xor edx,r8d -DB 0xf3,0xc3 - - -ALIGN 16 -_x86_64_AES_decrypt_compact: - - lea r8,[128+r14] - mov edi,DWORD[((0-128))+r8] - mov ebp,DWORD[((32-128))+r8] - mov r10d,DWORD[((64-128))+r8] - mov r11d,DWORD[((96-128))+r8] - mov edi,DWORD[((128-128))+r8] - mov ebp,DWORD[((160-128))+r8] - mov r10d,DWORD[((192-128))+r8] - mov r11d,DWORD[((224-128))+r8] - jmp NEAR $L$dec_loop_compact - -ALIGN 16 -$L$dec_loop_compact: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - lea r15,[16+r15] - movzx r10d,al - movzx r11d,bl - movzx r12d,cl - movzx r8d,dl - movzx esi,dh - movzx edi,ah - shr edx,16 - movzx ebp,bh - movzx r10d,BYTE[r10*1+r14] - movzx r11d,BYTE[r11*1+r14] - movzx r12d,BYTE[r12*1+r14] - movzx r8d,BYTE[r8*1+r14] - - movzx r9d,BYTE[rsi*1+r14] - movzx esi,ch - movzx r13d,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - movzx esi,BYTE[rsi*1+r14] - - shr ecx,16 - shl r13d,8 - shl r9d,8 - movzx edi,cl - shr eax,16 - xor r10d,r9d - shr ebx,16 - movzx r9d,dl - - shl ebp,8 - xor r11d,r13d - shl esi,8 - movzx r13d,al - movzx edi,BYTE[rdi*1+r14] - xor r12d,ebp - movzx ebp,bl - - shl edi,16 - xor r8d,esi - movzx r9d,BYTE[r9*1+r14] - movzx esi,bh - movzx ebp,BYTE[rbp*1+r14] - xor r10d,edi - movzx r13d,BYTE[r13*1+r14] - movzx edi,ch - - shl ebp,16 - shl r9d,16 - shl r13d,16 - xor r8d,ebp - movzx ebp,dh - xor r11d,r9d - shr eax,8 - xor r12d,r13d - - movzx esi,BYTE[rsi*1+r14] - movzx ebx,BYTE[rdi*1+r14] - movzx ecx,BYTE[rbp*1+r14] - movzx edx,BYTE[rax*1+r14] - - mov eax,r10d - shl esi,24 - shl ebx,24 - shl ecx,24 - xor eax,esi - shl edx,24 - xor ebx,r11d - xor ecx,r12d - xor edx,r8d - cmp r15,QWORD[16+rsp] - je NEAR $L$dec_compact_done - - mov rsi,QWORD[((256+0))+r14] - shl rbx,32 - shl rdx,32 - mov rdi,QWORD[((256+8))+r14] - or rax,rbx - or rcx,rdx - mov rbp,QWORD[((256+16))+r14] - mov r9,rsi - mov r12,rsi - and r9,rax - and r12,rcx - mov rbx,r9 - mov rdx,r12 - shr r9,7 - lea r8,[rax*1+rax] - shr r12,7 - lea r11,[rcx*1+rcx] - sub rbx,r9 - sub rdx,r12 - and r8,rdi - and r11,rdi - and rbx,rbp - and rdx,rbp - xor r8,rbx - xor r11,rdx - mov r10,rsi - mov r13,rsi - - and r10,r8 - and r13,r11 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - lea r9,[r8*1+r8] - shr r13,7 - lea r12,[r11*1+r11] - sub rbx,r10 - sub rdx,r13 - and r9,rdi - and r12,rdi - and rbx,rbp - and rdx,rbp - xor r9,rbx - xor r12,rdx - mov r10,rsi - mov r13,rsi - - and r10,r9 - and r13,r12 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - xor r8,rax - shr r13,7 - xor r11,rcx - sub rbx,r10 - sub rdx,r13 - lea r10,[r9*1+r9] - lea r13,[r12*1+r12] - xor r9,rax - xor r12,rcx - and r10,rdi - and r13,rdi - and rbx,rbp - and rdx,rbp - xor r10,rbx - xor r13,rdx - - xor rax,r10 - xor rcx,r13 - xor r8,r10 - xor r11,r13 - mov rbx,rax - mov rdx,rcx - xor r9,r10 - shr rbx,32 - xor r12,r13 - shr rdx,32 - xor r10,r8 - rol eax,8 - xor r13,r11 - rol ecx,8 - xor r10,r9 - rol ebx,8 - xor r13,r12 - - rol edx,8 - xor eax,r10d - shr r10,32 - xor ecx,r13d - shr r13,32 - xor ebx,r10d - xor edx,r13d - - mov r10,r8 - rol r8d,24 - mov r13,r11 - rol r11d,24 - shr r10,32 - xor eax,r8d - shr r13,32 - xor ecx,r11d - rol r10d,24 - mov r8,r9 - rol r13d,24 - mov r11,r12 - shr r8,32 - xor ebx,r10d - shr r11,32 - xor edx,r13d - - mov rsi,QWORD[r14] - rol r9d,16 - mov rdi,QWORD[64+r14] - rol r12d,16 - mov rbp,QWORD[128+r14] - rol r8d,16 - mov r10,QWORD[192+r14] - xor eax,r9d - rol r11d,16 - xor ecx,r12d - mov r13,QWORD[256+r14] - xor ebx,r8d - xor edx,r11d - jmp NEAR $L$dec_loop_compact -ALIGN 16 -$L$dec_compact_done: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] -DB 0xf3,0xc3 - - -global AES_decrypt - -ALIGN 16 -global asm_AES_decrypt - -asm_AES_decrypt: -AES_decrypt: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_decrypt: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - mov rax,rsp - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - - - lea rcx,[((-63))+rdx] - and rsp,-64 - sub rcx,rsp - neg rcx - and rcx,0x3c0 - sub rsp,rcx - sub rsp,32 - - mov QWORD[16+rsp],rsi - mov QWORD[24+rsp],rax - -$L$dec_prologue: - - mov r15,rdx - mov r13d,DWORD[240+r15] - - mov eax,DWORD[rdi] - mov ebx,DWORD[4+rdi] - mov ecx,DWORD[8+rdi] - mov edx,DWORD[12+rdi] - - shl r13d,4 - lea rbp,[r13*1+r15] - mov QWORD[rsp],r15 - mov QWORD[8+rsp],rbp - - - lea r14,[(($L$AES_Td+2048))] - lea rbp,[768+rsp] - sub rbp,r14 - and rbp,0x300 - lea r14,[rbp*1+r14] - shr rbp,3 - add r14,rbp - - call _x86_64_AES_decrypt_compact - - mov r9,QWORD[16+rsp] - mov rsi,QWORD[24+rsp] - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - mov r15,QWORD[((-48))+rsi] - - mov r14,QWORD[((-40))+rsi] - - mov r13,QWORD[((-32))+rsi] - - mov r12,QWORD[((-24))+rsi] - - mov rbp,QWORD[((-16))+rsi] - - mov rbx,QWORD[((-8))+rsi] - - lea rsp,[rsi] - -$L$dec_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_decrypt: -global AES_set_encrypt_key - -ALIGN 16 -AES_set_encrypt_key: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_set_encrypt_key: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - sub rsp,8 - -$L$enc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - mov rbp,QWORD[40+rsp] - - mov rbx,QWORD[48+rsp] - - add rsp,56 - -$L$enc_key_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_set_encrypt_key: - - -ALIGN 16 -_x86_64_AES_set_encrypt_key: - - mov ecx,esi - mov rsi,rdi - mov rdi,rdx - - test rsi,-1 - jz NEAR $L$badpointer - test rdi,-1 - jz NEAR $L$badpointer - - lea rbp,[$L$AES_Te] - lea rbp,[((2048+128))+rbp] - - - mov eax,DWORD[((0-128))+rbp] - mov ebx,DWORD[((32-128))+rbp] - mov r8d,DWORD[((64-128))+rbp] - mov edx,DWORD[((96-128))+rbp] - mov eax,DWORD[((128-128))+rbp] - mov ebx,DWORD[((160-128))+rbp] - mov r8d,DWORD[((192-128))+rbp] - mov edx,DWORD[((224-128))+rbp] - - cmp ecx,128 - je NEAR $L$10rounds - cmp ecx,192 - je NEAR $L$12rounds - cmp ecx,256 - je NEAR $L$14rounds - mov rax,-2 - jmp NEAR $L$exit - -$L$10rounds: - mov rax,QWORD[rsi] - mov rdx,QWORD[8+rsi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rdx - - shr rdx,32 - xor ecx,ecx - jmp NEAR $L$10shortcut -ALIGN 4 -$L$10loop: - mov eax,DWORD[rdi] - mov edx,DWORD[12+rdi] -$L$10shortcut: - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,24 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,8 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,16 - xor eax,ebx - - xor eax,DWORD[((1024-128))+rcx*4+rbp] - mov DWORD[16+rdi],eax - xor eax,DWORD[4+rdi] - mov DWORD[20+rdi],eax - xor eax,DWORD[8+rdi] - mov DWORD[24+rdi],eax - xor eax,DWORD[12+rdi] - mov DWORD[28+rdi],eax - add ecx,1 - lea rdi,[16+rdi] - cmp ecx,10 - jl NEAR $L$10loop - - mov DWORD[80+rdi],10 - xor rax,rax - jmp NEAR $L$exit - -$L$12rounds: - mov rax,QWORD[rsi] - mov rbx,QWORD[8+rsi] - mov rdx,QWORD[16+rsi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rbx - mov QWORD[16+rdi],rdx - - shr rdx,32 - xor ecx,ecx - jmp NEAR $L$12shortcut -ALIGN 4 -$L$12loop: - mov eax,DWORD[rdi] - mov edx,DWORD[20+rdi] -$L$12shortcut: - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,24 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,8 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,16 - xor eax,ebx - - xor eax,DWORD[((1024-128))+rcx*4+rbp] - mov DWORD[24+rdi],eax - xor eax,DWORD[4+rdi] - mov DWORD[28+rdi],eax - xor eax,DWORD[8+rdi] - mov DWORD[32+rdi],eax - xor eax,DWORD[12+rdi] - mov DWORD[36+rdi],eax - - cmp ecx,7 - je NEAR $L$12break - add ecx,1 - - xor eax,DWORD[16+rdi] - mov DWORD[40+rdi],eax - xor eax,DWORD[20+rdi] - mov DWORD[44+rdi],eax - - lea rdi,[24+rdi] - jmp NEAR $L$12loop -$L$12break: - mov DWORD[72+rdi],12 - xor rax,rax - jmp NEAR $L$exit - -$L$14rounds: - mov rax,QWORD[rsi] - mov rbx,QWORD[8+rsi] - mov rcx,QWORD[16+rsi] - mov rdx,QWORD[24+rsi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rbx - mov QWORD[16+rdi],rcx - mov QWORD[24+rdi],rdx - - shr rdx,32 - xor ecx,ecx - jmp NEAR $L$14shortcut -ALIGN 4 -$L$14loop: - mov eax,DWORD[rdi] - mov edx,DWORD[28+rdi] -$L$14shortcut: - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,24 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,8 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,16 - xor eax,ebx - - xor eax,DWORD[((1024-128))+rcx*4+rbp] - mov DWORD[32+rdi],eax - xor eax,DWORD[4+rdi] - mov DWORD[36+rdi],eax - xor eax,DWORD[8+rdi] - mov DWORD[40+rdi],eax - xor eax,DWORD[12+rdi] - mov DWORD[44+rdi],eax - - cmp ecx,6 - je NEAR $L$14break - add ecx,1 - - mov edx,eax - mov eax,DWORD[16+rdi] - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - shl ebx,8 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,16 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,24 - xor eax,ebx - - mov DWORD[48+rdi],eax - xor eax,DWORD[20+rdi] - mov DWORD[52+rdi],eax - xor eax,DWORD[24+rdi] - mov DWORD[56+rdi],eax - xor eax,DWORD[28+rdi] - mov DWORD[60+rdi],eax - - lea rdi,[32+rdi] - jmp NEAR $L$14loop -$L$14break: - mov DWORD[48+rdi],14 - xor rax,rax - jmp NEAR $L$exit - -$L$badpointer: - mov rax,-1 -$L$exit: -DB 0xf3,0xc3 - - -global AES_set_decrypt_key - -ALIGN 16 -AES_set_decrypt_key: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_set_decrypt_key: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - push rdx - -$L$dec_key_prologue: - - call _x86_64_AES_set_encrypt_key - mov r8,QWORD[rsp] - cmp eax,0 - jne NEAR $L$abort - - mov r14d,DWORD[240+r8] - xor rdi,rdi - lea rcx,[r14*4+rdi] - mov rsi,r8 - lea rdi,[rcx*4+r8] -ALIGN 4 -$L$invert: - mov rax,QWORD[rsi] - mov rbx,QWORD[8+rsi] - mov rcx,QWORD[rdi] - mov rdx,QWORD[8+rdi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rbx - mov QWORD[rsi],rcx - mov QWORD[8+rsi],rdx - lea rsi,[16+rsi] - lea rdi,[((-16))+rdi] - cmp rdi,rsi - jne NEAR $L$invert - - lea rax,[(($L$AES_Te+2048+1024))] - - mov rsi,QWORD[40+rax] - mov rdi,QWORD[48+rax] - mov rbp,QWORD[56+rax] - - mov r15,r8 - sub r14d,1 -ALIGN 4 -$L$permute: - lea r15,[16+r15] - mov rax,QWORD[r15] - mov rcx,QWORD[8+r15] - mov r9,rsi - mov r12,rsi - and r9,rax - and r12,rcx - mov rbx,r9 - mov rdx,r12 - shr r9,7 - lea r8,[rax*1+rax] - shr r12,7 - lea r11,[rcx*1+rcx] - sub rbx,r9 - sub rdx,r12 - and r8,rdi - and r11,rdi - and rbx,rbp - and rdx,rbp - xor r8,rbx - xor r11,rdx - mov r10,rsi - mov r13,rsi - - and r10,r8 - and r13,r11 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - lea r9,[r8*1+r8] - shr r13,7 - lea r12,[r11*1+r11] - sub rbx,r10 - sub rdx,r13 - and r9,rdi - and r12,rdi - and rbx,rbp - and rdx,rbp - xor r9,rbx - xor r12,rdx - mov r10,rsi - mov r13,rsi - - and r10,r9 - and r13,r12 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - xor r8,rax - shr r13,7 - xor r11,rcx - sub rbx,r10 - sub rdx,r13 - lea r10,[r9*1+r9] - lea r13,[r12*1+r12] - xor r9,rax - xor r12,rcx - and r10,rdi - and r13,rdi - and rbx,rbp - and rdx,rbp - xor r10,rbx - xor r13,rdx - - xor rax,r10 - xor rcx,r13 - xor r8,r10 - xor r11,r13 - mov rbx,rax - mov rdx,rcx - xor r9,r10 - shr rbx,32 - xor r12,r13 - shr rdx,32 - xor r10,r8 - rol eax,8 - xor r13,r11 - rol ecx,8 - xor r10,r9 - rol ebx,8 - xor r13,r12 - - rol edx,8 - xor eax,r10d - shr r10,32 - xor ecx,r13d - shr r13,32 - xor ebx,r10d - xor edx,r13d - - mov r10,r8 - rol r8d,24 - mov r13,r11 - rol r11d,24 - shr r10,32 - xor eax,r8d - shr r13,32 - xor ecx,r11d - rol r10d,24 - mov r8,r9 - rol r13d,24 - mov r11,r12 - shr r8,32 - xor ebx,r10d - shr r11,32 - xor edx,r13d - - - rol r9d,16 - - rol r12d,16 - - rol r8d,16 - - xor eax,r9d - rol r11d,16 - xor ecx,r12d - - xor ebx,r8d - xor edx,r11d - mov DWORD[r15],eax - mov DWORD[4+r15],ebx - mov DWORD[8+r15],ecx - mov DWORD[12+r15],edx - sub r14d,1 - jnz NEAR $L$permute - - xor rax,rax -$L$abort: - mov r15,QWORD[8+rsp] - - mov r14,QWORD[16+rsp] - - mov r13,QWORD[24+rsp] - - mov r12,QWORD[32+rsp] - - mov rbp,QWORD[40+rsp] - - mov rbx,QWORD[48+rsp] - - add rsp,56 - -$L$dec_key_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_set_decrypt_key: -global AES_cbc_encrypt - -ALIGN 16 -EXTERN OPENSSL_ia32cap_P -global asm_AES_cbc_encrypt - -asm_AES_cbc_encrypt: -AES_cbc_encrypt: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_cbc_encrypt: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - mov rcx,r9 - mov r8,QWORD[40+rsp] - mov r9,QWORD[48+rsp] - - - - cmp rdx,0 - je NEAR $L$cbc_epilogue - pushfq - - - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - -$L$cbc_prologue: - - cld - mov r9d,r9d - - lea r14,[$L$AES_Te] - lea r10,[$L$AES_Td] - cmp r9,0 - cmove r14,r10 - - - mov r10d,DWORD[OPENSSL_ia32cap_P] - cmp rdx,512 - jb NEAR $L$cbc_slow_prologue - test rdx,15 - jnz NEAR $L$cbc_slow_prologue - bt r10d,28 - jc NEAR $L$cbc_slow_prologue - - - lea r15,[((-88-248))+rsp] - and r15,-64 - - - mov r10,r14 - lea r11,[2304+r14] - mov r12,r15 - and r10,0xFFF - and r11,0xFFF - and r12,0xFFF - - cmp r12,r11 - jb NEAR $L$cbc_te_break_out - sub r12,r11 - sub r15,r12 - jmp NEAR $L$cbc_te_ok -$L$cbc_te_break_out: - sub r12,r10 - and r12,0xFFF - add r12,320 - sub r15,r12 -ALIGN 4 -$L$cbc_te_ok: - - xchg r15,rsp - - - mov QWORD[16+rsp],r15 - -$L$cbc_fast_body: - mov QWORD[24+rsp],rdi - mov QWORD[32+rsp],rsi - mov QWORD[40+rsp],rdx - mov QWORD[48+rsp],rcx - mov QWORD[56+rsp],r8 - mov DWORD[((80+240))+rsp],0 - mov rbp,r8 - mov rbx,r9 - mov r9,rsi - mov r8,rdi - mov r15,rcx - - mov eax,DWORD[240+r15] - - mov r10,r15 - sub r10,r14 - and r10,0xfff - cmp r10,2304 - jb NEAR $L$cbc_do_ecopy - cmp r10,4096-248 - jb NEAR $L$cbc_skip_ecopy -ALIGN 4 -$L$cbc_do_ecopy: - mov rsi,r15 - lea rdi,[80+rsp] - lea r15,[80+rsp] - mov ecx,240/8 - DD 0x90A548F3 - mov DWORD[rdi],eax -$L$cbc_skip_ecopy: - mov QWORD[rsp],r15 - - mov ecx,18 -ALIGN 4 -$L$cbc_prefetch_te: - mov r10,QWORD[r14] - mov r11,QWORD[32+r14] - mov r12,QWORD[64+r14] - mov r13,QWORD[96+r14] - lea r14,[128+r14] - sub ecx,1 - jnz NEAR $L$cbc_prefetch_te - lea r14,[((-2304))+r14] - - cmp rbx,0 - je NEAR $L$FAST_DECRYPT - - - mov eax,DWORD[rbp] - mov ebx,DWORD[4+rbp] - mov ecx,DWORD[8+rbp] - mov edx,DWORD[12+rbp] - -ALIGN 4 -$L$cbc_fast_enc_loop: - xor eax,DWORD[r8] - xor ebx,DWORD[4+r8] - xor ecx,DWORD[8+r8] - xor edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - - call _x86_64_AES_encrypt - - mov r8,QWORD[24+rsp] - mov r10,QWORD[40+rsp] - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - sub r10,16 - test r10,-16 - mov QWORD[40+rsp],r10 - jnz NEAR $L$cbc_fast_enc_loop - mov rbp,QWORD[56+rsp] - mov DWORD[rbp],eax - mov DWORD[4+rbp],ebx - mov DWORD[8+rbp],ecx - mov DWORD[12+rbp],edx - - jmp NEAR $L$cbc_fast_cleanup - - -ALIGN 16 -$L$FAST_DECRYPT: - cmp r9,r8 - je NEAR $L$cbc_fast_dec_in_place - - mov QWORD[64+rsp],rbp -ALIGN 4 -$L$cbc_fast_dec_loop: - mov eax,DWORD[r8] - mov ebx,DWORD[4+r8] - mov ecx,DWORD[8+r8] - mov edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - - call _x86_64_AES_decrypt - - mov rbp,QWORD[64+rsp] - mov r8,QWORD[24+rsp] - mov r10,QWORD[40+rsp] - xor eax,DWORD[rbp] - xor ebx,DWORD[4+rbp] - xor ecx,DWORD[8+rbp] - xor edx,DWORD[12+rbp] - mov rbp,r8 - - sub r10,16 - mov QWORD[40+rsp],r10 - mov QWORD[64+rsp],rbp - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - jnz NEAR $L$cbc_fast_dec_loop - mov r12,QWORD[56+rsp] - mov r10,QWORD[rbp] - mov r11,QWORD[8+rbp] - mov QWORD[r12],r10 - mov QWORD[8+r12],r11 - jmp NEAR $L$cbc_fast_cleanup - -ALIGN 16 -$L$cbc_fast_dec_in_place: - mov r10,QWORD[rbp] - mov r11,QWORD[8+rbp] - mov QWORD[((0+64))+rsp],r10 - mov QWORD[((8+64))+rsp],r11 -ALIGN 4 -$L$cbc_fast_dec_in_place_loop: - mov eax,DWORD[r8] - mov ebx,DWORD[4+r8] - mov ecx,DWORD[8+r8] - mov edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - - call _x86_64_AES_decrypt - - mov r8,QWORD[24+rsp] - mov r10,QWORD[40+rsp] - xor eax,DWORD[((0+64))+rsp] - xor ebx,DWORD[((4+64))+rsp] - xor ecx,DWORD[((8+64))+rsp] - xor edx,DWORD[((12+64))+rsp] - - mov r11,QWORD[r8] - mov r12,QWORD[8+r8] - sub r10,16 - jz NEAR $L$cbc_fast_dec_in_place_done - - mov QWORD[((0+64))+rsp],r11 - mov QWORD[((8+64))+rsp],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - mov QWORD[40+rsp],r10 - jmp NEAR $L$cbc_fast_dec_in_place_loop -$L$cbc_fast_dec_in_place_done: - mov rdi,QWORD[56+rsp] - mov QWORD[rdi],r11 - mov QWORD[8+rdi],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - -ALIGN 4 -$L$cbc_fast_cleanup: - cmp DWORD[((80+240))+rsp],0 - lea rdi,[80+rsp] - je NEAR $L$cbc_exit - mov ecx,240/8 - xor rax,rax - DD 0x90AB48F3 - - jmp NEAR $L$cbc_exit - - -ALIGN 16 -$L$cbc_slow_prologue: - - - lea rbp,[((-88))+rsp] - and rbp,-64 - - lea r10,[((-88-63))+rcx] - sub r10,rbp - neg r10 - and r10,0x3c0 - sub rbp,r10 - - xchg rbp,rsp - - - mov QWORD[16+rsp],rbp - -$L$cbc_slow_body: - - - - - mov QWORD[56+rsp],r8 - mov rbp,r8 - mov rbx,r9 - mov r9,rsi - mov r8,rdi - mov r15,rcx - mov r10,rdx - - mov eax,DWORD[240+r15] - mov QWORD[rsp],r15 - shl eax,4 - lea rax,[rax*1+r15] - mov QWORD[8+rsp],rax - - - lea r14,[2048+r14] - lea rax,[((768-8))+rsp] - sub rax,r14 - and rax,0x300 - lea r14,[rax*1+r14] - - cmp rbx,0 - je NEAR $L$SLOW_DECRYPT - - - test r10,-16 - mov eax,DWORD[rbp] - mov ebx,DWORD[4+rbp] - mov ecx,DWORD[8+rbp] - mov edx,DWORD[12+rbp] - jz NEAR $L$cbc_slow_enc_tail - -ALIGN 4 -$L$cbc_slow_enc_loop: - xor eax,DWORD[r8] - xor ebx,DWORD[4+r8] - xor ecx,DWORD[8+r8] - xor edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - mov QWORD[32+rsp],r9 - mov QWORD[40+rsp],r10 - - call _x86_64_AES_encrypt_compact - - mov r8,QWORD[24+rsp] - mov r9,QWORD[32+rsp] - mov r10,QWORD[40+rsp] - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - sub r10,16 - test r10,-16 - jnz NEAR $L$cbc_slow_enc_loop - test r10,15 - jnz NEAR $L$cbc_slow_enc_tail - mov rbp,QWORD[56+rsp] - mov DWORD[rbp],eax - mov DWORD[4+rbp],ebx - mov DWORD[8+rbp],ecx - mov DWORD[12+rbp],edx - - jmp NEAR $L$cbc_exit - -ALIGN 4 -$L$cbc_slow_enc_tail: - mov r11,rax - mov r12,rcx - mov rcx,r10 - mov rsi,r8 - mov rdi,r9 - DD 0x9066A4F3 - mov rcx,16 - sub rcx,r10 - xor rax,rax - DD 0x9066AAF3 - mov r8,r9 - mov r10,16 - mov rax,r11 - mov rcx,r12 - jmp NEAR $L$cbc_slow_enc_loop - -ALIGN 16 -$L$SLOW_DECRYPT: - shr rax,3 - add r14,rax - - mov r11,QWORD[rbp] - mov r12,QWORD[8+rbp] - mov QWORD[((0+64))+rsp],r11 - mov QWORD[((8+64))+rsp],r12 - -ALIGN 4 -$L$cbc_slow_dec_loop: - mov eax,DWORD[r8] - mov ebx,DWORD[4+r8] - mov ecx,DWORD[8+r8] - mov edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - mov QWORD[32+rsp],r9 - mov QWORD[40+rsp],r10 - - call _x86_64_AES_decrypt_compact - - mov r8,QWORD[24+rsp] - mov r9,QWORD[32+rsp] - mov r10,QWORD[40+rsp] - xor eax,DWORD[((0+64))+rsp] - xor ebx,DWORD[((4+64))+rsp] - xor ecx,DWORD[((8+64))+rsp] - xor edx,DWORD[((12+64))+rsp] - - mov r11,QWORD[r8] - mov r12,QWORD[8+r8] - sub r10,16 - jc NEAR $L$cbc_slow_dec_partial - jz NEAR $L$cbc_slow_dec_done - - mov QWORD[((0+64))+rsp],r11 - mov QWORD[((8+64))+rsp],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - jmp NEAR $L$cbc_slow_dec_loop -$L$cbc_slow_dec_done: - mov rdi,QWORD[56+rsp] - mov QWORD[rdi],r11 - mov QWORD[8+rdi],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - jmp NEAR $L$cbc_exit - -ALIGN 4 -$L$cbc_slow_dec_partial: - mov rdi,QWORD[56+rsp] - mov QWORD[rdi],r11 - mov QWORD[8+rdi],r12 - - mov DWORD[((0+64))+rsp],eax - mov DWORD[((4+64))+rsp],ebx - mov DWORD[((8+64))+rsp],ecx - mov DWORD[((12+64))+rsp],edx - - mov rdi,r9 - lea rsi,[64+rsp] - lea rcx,[16+r10] - DD 0x9066A4F3 - jmp NEAR $L$cbc_exit - -ALIGN 16 -$L$cbc_exit: - mov rsi,QWORD[16+rsp] - - mov r15,QWORD[rsi] - - mov r14,QWORD[8+rsi] - - mov r13,QWORD[16+rsi] - - mov r12,QWORD[24+rsi] - - mov rbp,QWORD[32+rsi] - - mov rbx,QWORD[40+rsi] - - lea rsp,[48+rsi] - -$L$cbc_popfq: - popfq - - - -$L$cbc_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_cbc_encrypt: -ALIGN 64 -$L$AES_Te: - DD 0xa56363c6,0xa56363c6 - DD 0x847c7cf8,0x847c7cf8 - DD 0x997777ee,0x997777ee - DD 0x8d7b7bf6,0x8d7b7bf6 - DD 0x0df2f2ff,0x0df2f2ff - DD 0xbd6b6bd6,0xbd6b6bd6 - DD 0xb16f6fde,0xb16f6fde - DD 0x54c5c591,0x54c5c591 - DD 0x50303060,0x50303060 - DD 0x03010102,0x03010102 - DD 0xa96767ce,0xa96767ce - DD 0x7d2b2b56,0x7d2b2b56 - DD 0x19fefee7,0x19fefee7 - DD 0x62d7d7b5,0x62d7d7b5 - DD 0xe6abab4d,0xe6abab4d - DD 0x9a7676ec,0x9a7676ec - DD 0x45caca8f,0x45caca8f - DD 0x9d82821f,0x9d82821f - DD 0x40c9c989,0x40c9c989 - DD 0x877d7dfa,0x877d7dfa - DD 0x15fafaef,0x15fafaef - DD 0xeb5959b2,0xeb5959b2 - DD 0xc947478e,0xc947478e - DD 0x0bf0f0fb,0x0bf0f0fb - DD 0xecadad41,0xecadad41 - DD 0x67d4d4b3,0x67d4d4b3 - DD 0xfda2a25f,0xfda2a25f - DD 0xeaafaf45,0xeaafaf45 - DD 0xbf9c9c23,0xbf9c9c23 - DD 0xf7a4a453,0xf7a4a453 - DD 0x967272e4,0x967272e4 - DD 0x5bc0c09b,0x5bc0c09b - DD 0xc2b7b775,0xc2b7b775 - DD 0x1cfdfde1,0x1cfdfde1 - DD 0xae93933d,0xae93933d - DD 0x6a26264c,0x6a26264c - DD 0x5a36366c,0x5a36366c - DD 0x413f3f7e,0x413f3f7e - DD 0x02f7f7f5,0x02f7f7f5 - DD 0x4fcccc83,0x4fcccc83 - DD 0x5c343468,0x5c343468 - DD 0xf4a5a551,0xf4a5a551 - DD 0x34e5e5d1,0x34e5e5d1 - DD 0x08f1f1f9,0x08f1f1f9 - DD 0x937171e2,0x937171e2 - DD 0x73d8d8ab,0x73d8d8ab - DD 0x53313162,0x53313162 - DD 0x3f15152a,0x3f15152a - DD 0x0c040408,0x0c040408 - DD 0x52c7c795,0x52c7c795 - DD 0x65232346,0x65232346 - DD 0x5ec3c39d,0x5ec3c39d - DD 0x28181830,0x28181830 - DD 0xa1969637,0xa1969637 - DD 0x0f05050a,0x0f05050a - DD 0xb59a9a2f,0xb59a9a2f - DD 0x0907070e,0x0907070e - DD 0x36121224,0x36121224 - DD 0x9b80801b,0x9b80801b - DD 0x3de2e2df,0x3de2e2df - DD 0x26ebebcd,0x26ebebcd - DD 0x6927274e,0x6927274e - DD 0xcdb2b27f,0xcdb2b27f - DD 0x9f7575ea,0x9f7575ea - DD 0x1b090912,0x1b090912 - DD 0x9e83831d,0x9e83831d - DD 0x742c2c58,0x742c2c58 - DD 0x2e1a1a34,0x2e1a1a34 - DD 0x2d1b1b36,0x2d1b1b36 - DD 0xb26e6edc,0xb26e6edc - DD 0xee5a5ab4,0xee5a5ab4 - DD 0xfba0a05b,0xfba0a05b - DD 0xf65252a4,0xf65252a4 - DD 0x4d3b3b76,0x4d3b3b76 - DD 0x61d6d6b7,0x61d6d6b7 - DD 0xceb3b37d,0xceb3b37d - DD 0x7b292952,0x7b292952 - DD 0x3ee3e3dd,0x3ee3e3dd - DD 0x712f2f5e,0x712f2f5e - DD 0x97848413,0x97848413 - DD 0xf55353a6,0xf55353a6 - DD 0x68d1d1b9,0x68d1d1b9 - DD 0x00000000,0x00000000 - DD 0x2cededc1,0x2cededc1 - DD 0x60202040,0x60202040 - DD 0x1ffcfce3,0x1ffcfce3 - DD 0xc8b1b179,0xc8b1b179 - DD 0xed5b5bb6,0xed5b5bb6 - DD 0xbe6a6ad4,0xbe6a6ad4 - DD 0x46cbcb8d,0x46cbcb8d - DD 0xd9bebe67,0xd9bebe67 - DD 0x4b393972,0x4b393972 - DD 0xde4a4a94,0xde4a4a94 - DD 0xd44c4c98,0xd44c4c98 - DD 0xe85858b0,0xe85858b0 - DD 0x4acfcf85,0x4acfcf85 - DD 0x6bd0d0bb,0x6bd0d0bb - DD 0x2aefefc5,0x2aefefc5 - DD 0xe5aaaa4f,0xe5aaaa4f - DD 0x16fbfbed,0x16fbfbed - DD 0xc5434386,0xc5434386 - DD 0xd74d4d9a,0xd74d4d9a - DD 0x55333366,0x55333366 - DD 0x94858511,0x94858511 - DD 0xcf45458a,0xcf45458a - DD 0x10f9f9e9,0x10f9f9e9 - DD 0x06020204,0x06020204 - DD 0x817f7ffe,0x817f7ffe - DD 0xf05050a0,0xf05050a0 - DD 0x443c3c78,0x443c3c78 - DD 0xba9f9f25,0xba9f9f25 - DD 0xe3a8a84b,0xe3a8a84b - DD 0xf35151a2,0xf35151a2 - DD 0xfea3a35d,0xfea3a35d - DD 0xc0404080,0xc0404080 - DD 0x8a8f8f05,0x8a8f8f05 - DD 0xad92923f,0xad92923f - DD 0xbc9d9d21,0xbc9d9d21 - DD 0x48383870,0x48383870 - DD 0x04f5f5f1,0x04f5f5f1 - DD 0xdfbcbc63,0xdfbcbc63 - DD 0xc1b6b677,0xc1b6b677 - DD 0x75dadaaf,0x75dadaaf - DD 0x63212142,0x63212142 - DD 0x30101020,0x30101020 - DD 0x1affffe5,0x1affffe5 - DD 0x0ef3f3fd,0x0ef3f3fd - DD 0x6dd2d2bf,0x6dd2d2bf - DD 0x4ccdcd81,0x4ccdcd81 - DD 0x140c0c18,0x140c0c18 - DD 0x35131326,0x35131326 - DD 0x2fececc3,0x2fececc3 - DD 0xe15f5fbe,0xe15f5fbe - DD 0xa2979735,0xa2979735 - DD 0xcc444488,0xcc444488 - DD 0x3917172e,0x3917172e - DD 0x57c4c493,0x57c4c493 - DD 0xf2a7a755,0xf2a7a755 - DD 0x827e7efc,0x827e7efc - DD 0x473d3d7a,0x473d3d7a - DD 0xac6464c8,0xac6464c8 - DD 0xe75d5dba,0xe75d5dba - DD 0x2b191932,0x2b191932 - DD 0x957373e6,0x957373e6 - DD 0xa06060c0,0xa06060c0 - DD 0x98818119,0x98818119 - DD 0xd14f4f9e,0xd14f4f9e - DD 0x7fdcdca3,0x7fdcdca3 - DD 0x66222244,0x66222244 - DD 0x7e2a2a54,0x7e2a2a54 - DD 0xab90903b,0xab90903b - DD 0x8388880b,0x8388880b - DD 0xca46468c,0xca46468c - DD 0x29eeeec7,0x29eeeec7 - DD 0xd3b8b86b,0xd3b8b86b - DD 0x3c141428,0x3c141428 - DD 0x79dedea7,0x79dedea7 - DD 0xe25e5ebc,0xe25e5ebc - DD 0x1d0b0b16,0x1d0b0b16 - DD 0x76dbdbad,0x76dbdbad - DD 0x3be0e0db,0x3be0e0db - DD 0x56323264,0x56323264 - DD 0x4e3a3a74,0x4e3a3a74 - DD 0x1e0a0a14,0x1e0a0a14 - DD 0xdb494992,0xdb494992 - DD 0x0a06060c,0x0a06060c - DD 0x6c242448,0x6c242448 - DD 0xe45c5cb8,0xe45c5cb8 - DD 0x5dc2c29f,0x5dc2c29f - DD 0x6ed3d3bd,0x6ed3d3bd - DD 0xefacac43,0xefacac43 - DD 0xa66262c4,0xa66262c4 - DD 0xa8919139,0xa8919139 - DD 0xa4959531,0xa4959531 - DD 0x37e4e4d3,0x37e4e4d3 - DD 0x8b7979f2,0x8b7979f2 - DD 0x32e7e7d5,0x32e7e7d5 - DD 0x43c8c88b,0x43c8c88b - DD 0x5937376e,0x5937376e - DD 0xb76d6dda,0xb76d6dda - DD 0x8c8d8d01,0x8c8d8d01 - DD 0x64d5d5b1,0x64d5d5b1 - DD 0xd24e4e9c,0xd24e4e9c - DD 0xe0a9a949,0xe0a9a949 - DD 0xb46c6cd8,0xb46c6cd8 - DD 0xfa5656ac,0xfa5656ac - DD 0x07f4f4f3,0x07f4f4f3 - DD 0x25eaeacf,0x25eaeacf - DD 0xaf6565ca,0xaf6565ca - DD 0x8e7a7af4,0x8e7a7af4 - DD 0xe9aeae47,0xe9aeae47 - DD 0x18080810,0x18080810 - DD 0xd5baba6f,0xd5baba6f - DD 0x887878f0,0x887878f0 - DD 0x6f25254a,0x6f25254a - DD 0x722e2e5c,0x722e2e5c - DD 0x241c1c38,0x241c1c38 - DD 0xf1a6a657,0xf1a6a657 - DD 0xc7b4b473,0xc7b4b473 - DD 0x51c6c697,0x51c6c697 - DD 0x23e8e8cb,0x23e8e8cb - DD 0x7cdddda1,0x7cdddda1 - DD 0x9c7474e8,0x9c7474e8 - DD 0x211f1f3e,0x211f1f3e - DD 0xdd4b4b96,0xdd4b4b96 - DD 0xdcbdbd61,0xdcbdbd61 - DD 0x868b8b0d,0x868b8b0d - DD 0x858a8a0f,0x858a8a0f - DD 0x907070e0,0x907070e0 - DD 0x423e3e7c,0x423e3e7c - DD 0xc4b5b571,0xc4b5b571 - DD 0xaa6666cc,0xaa6666cc - DD 0xd8484890,0xd8484890 - DD 0x05030306,0x05030306 - DD 0x01f6f6f7,0x01f6f6f7 - DD 0x120e0e1c,0x120e0e1c - DD 0xa36161c2,0xa36161c2 - DD 0x5f35356a,0x5f35356a - DD 0xf95757ae,0xf95757ae - DD 0xd0b9b969,0xd0b9b969 - DD 0x91868617,0x91868617 - DD 0x58c1c199,0x58c1c199 - DD 0x271d1d3a,0x271d1d3a - DD 0xb99e9e27,0xb99e9e27 - DD 0x38e1e1d9,0x38e1e1d9 - DD 0x13f8f8eb,0x13f8f8eb - DD 0xb398982b,0xb398982b - DD 0x33111122,0x33111122 - DD 0xbb6969d2,0xbb6969d2 - DD 0x70d9d9a9,0x70d9d9a9 - DD 0x898e8e07,0x898e8e07 - DD 0xa7949433,0xa7949433 - DD 0xb69b9b2d,0xb69b9b2d - DD 0x221e1e3c,0x221e1e3c - DD 0x92878715,0x92878715 - DD 0x20e9e9c9,0x20e9e9c9 - DD 0x49cece87,0x49cece87 - DD 0xff5555aa,0xff5555aa - DD 0x78282850,0x78282850 - DD 0x7adfdfa5,0x7adfdfa5 - DD 0x8f8c8c03,0x8f8c8c03 - DD 0xf8a1a159,0xf8a1a159 - DD 0x80898909,0x80898909 - DD 0x170d0d1a,0x170d0d1a - DD 0xdabfbf65,0xdabfbf65 - DD 0x31e6e6d7,0x31e6e6d7 - DD 0xc6424284,0xc6424284 - DD 0xb86868d0,0xb86868d0 - DD 0xc3414182,0xc3414182 - DD 0xb0999929,0xb0999929 - DD 0x772d2d5a,0x772d2d5a - DD 0x110f0f1e,0x110f0f1e - DD 0xcbb0b07b,0xcbb0b07b - DD 0xfc5454a8,0xfc5454a8 - DD 0xd6bbbb6d,0xd6bbbb6d - DD 0x3a16162c,0x3a16162c -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 - DD 0x00000001,0x00000002,0x00000004,0x00000008 - DD 0x00000010,0x00000020,0x00000040,0x00000080 - DD 0x0000001b,0x00000036,0x80808080,0x80808080 - DD 0xfefefefe,0xfefefefe,0x1b1b1b1b,0x1b1b1b1b -ALIGN 64 -$L$AES_Td: - DD 0x50a7f451,0x50a7f451 - DD 0x5365417e,0x5365417e - DD 0xc3a4171a,0xc3a4171a - DD 0x965e273a,0x965e273a - DD 0xcb6bab3b,0xcb6bab3b - DD 0xf1459d1f,0xf1459d1f - DD 0xab58faac,0xab58faac - DD 0x9303e34b,0x9303e34b - DD 0x55fa3020,0x55fa3020 - DD 0xf66d76ad,0xf66d76ad - DD 0x9176cc88,0x9176cc88 - DD 0x254c02f5,0x254c02f5 - DD 0xfcd7e54f,0xfcd7e54f - DD 0xd7cb2ac5,0xd7cb2ac5 - DD 0x80443526,0x80443526 - DD 0x8fa362b5,0x8fa362b5 - DD 0x495ab1de,0x495ab1de - DD 0x671bba25,0x671bba25 - DD 0x980eea45,0x980eea45 - DD 0xe1c0fe5d,0xe1c0fe5d - DD 0x02752fc3,0x02752fc3 - DD 0x12f04c81,0x12f04c81 - DD 0xa397468d,0xa397468d - DD 0xc6f9d36b,0xc6f9d36b - DD 0xe75f8f03,0xe75f8f03 - DD 0x959c9215,0x959c9215 - DD 0xeb7a6dbf,0xeb7a6dbf - DD 0xda595295,0xda595295 - DD 0x2d83bed4,0x2d83bed4 - DD 0xd3217458,0xd3217458 - DD 0x2969e049,0x2969e049 - DD 0x44c8c98e,0x44c8c98e - DD 0x6a89c275,0x6a89c275 - DD 0x78798ef4,0x78798ef4 - DD 0x6b3e5899,0x6b3e5899 - DD 0xdd71b927,0xdd71b927 - DD 0xb64fe1be,0xb64fe1be - DD 0x17ad88f0,0x17ad88f0 - DD 0x66ac20c9,0x66ac20c9 - DD 0xb43ace7d,0xb43ace7d - DD 0x184adf63,0x184adf63 - DD 0x82311ae5,0x82311ae5 - DD 0x60335197,0x60335197 - DD 0x457f5362,0x457f5362 - DD 0xe07764b1,0xe07764b1 - DD 0x84ae6bbb,0x84ae6bbb - DD 0x1ca081fe,0x1ca081fe - DD 0x942b08f9,0x942b08f9 - DD 0x58684870,0x58684870 - DD 0x19fd458f,0x19fd458f - DD 0x876cde94,0x876cde94 - DD 0xb7f87b52,0xb7f87b52 - DD 0x23d373ab,0x23d373ab - DD 0xe2024b72,0xe2024b72 - DD 0x578f1fe3,0x578f1fe3 - DD 0x2aab5566,0x2aab5566 - DD 0x0728ebb2,0x0728ebb2 - DD 0x03c2b52f,0x03c2b52f - DD 0x9a7bc586,0x9a7bc586 - DD 0xa50837d3,0xa50837d3 - DD 0xf2872830,0xf2872830 - DD 0xb2a5bf23,0xb2a5bf23 - DD 0xba6a0302,0xba6a0302 - DD 0x5c8216ed,0x5c8216ed - DD 0x2b1ccf8a,0x2b1ccf8a - DD 0x92b479a7,0x92b479a7 - DD 0xf0f207f3,0xf0f207f3 - DD 0xa1e2694e,0xa1e2694e - DD 0xcdf4da65,0xcdf4da65 - DD 0xd5be0506,0xd5be0506 - DD 0x1f6234d1,0x1f6234d1 - DD 0x8afea6c4,0x8afea6c4 - DD 0x9d532e34,0x9d532e34 - DD 0xa055f3a2,0xa055f3a2 - DD 0x32e18a05,0x32e18a05 - DD 0x75ebf6a4,0x75ebf6a4 - DD 0x39ec830b,0x39ec830b - DD 0xaaef6040,0xaaef6040 - DD 0x069f715e,0x069f715e - DD 0x51106ebd,0x51106ebd - DD 0xf98a213e,0xf98a213e - DD 0x3d06dd96,0x3d06dd96 - DD 0xae053edd,0xae053edd - DD 0x46bde64d,0x46bde64d - DD 0xb58d5491,0xb58d5491 - DD 0x055dc471,0x055dc471 - DD 0x6fd40604,0x6fd40604 - DD 0xff155060,0xff155060 - DD 0x24fb9819,0x24fb9819 - DD 0x97e9bdd6,0x97e9bdd6 - DD 0xcc434089,0xcc434089 - DD 0x779ed967,0x779ed967 - DD 0xbd42e8b0,0xbd42e8b0 - DD 0x888b8907,0x888b8907 - DD 0x385b19e7,0x385b19e7 - DD 0xdbeec879,0xdbeec879 - DD 0x470a7ca1,0x470a7ca1 - DD 0xe90f427c,0xe90f427c - DD 0xc91e84f8,0xc91e84f8 - DD 0x00000000,0x00000000 - DD 0x83868009,0x83868009 - DD 0x48ed2b32,0x48ed2b32 - DD 0xac70111e,0xac70111e - DD 0x4e725a6c,0x4e725a6c - DD 0xfbff0efd,0xfbff0efd - DD 0x5638850f,0x5638850f - DD 0x1ed5ae3d,0x1ed5ae3d - DD 0x27392d36,0x27392d36 - DD 0x64d90f0a,0x64d90f0a - DD 0x21a65c68,0x21a65c68 - DD 0xd1545b9b,0xd1545b9b - DD 0x3a2e3624,0x3a2e3624 - DD 0xb1670a0c,0xb1670a0c - DD 0x0fe75793,0x0fe75793 - DD 0xd296eeb4,0xd296eeb4 - DD 0x9e919b1b,0x9e919b1b - DD 0x4fc5c080,0x4fc5c080 - DD 0xa220dc61,0xa220dc61 - DD 0x694b775a,0x694b775a - DD 0x161a121c,0x161a121c - DD 0x0aba93e2,0x0aba93e2 - DD 0xe52aa0c0,0xe52aa0c0 - DD 0x43e0223c,0x43e0223c - DD 0x1d171b12,0x1d171b12 - DD 0x0b0d090e,0x0b0d090e - DD 0xadc78bf2,0xadc78bf2 - DD 0xb9a8b62d,0xb9a8b62d - DD 0xc8a91e14,0xc8a91e14 - DD 0x8519f157,0x8519f157 - DD 0x4c0775af,0x4c0775af - DD 0xbbdd99ee,0xbbdd99ee - DD 0xfd607fa3,0xfd607fa3 - DD 0x9f2601f7,0x9f2601f7 - DD 0xbcf5725c,0xbcf5725c - DD 0xc53b6644,0xc53b6644 - DD 0x347efb5b,0x347efb5b - DD 0x7629438b,0x7629438b - DD 0xdcc623cb,0xdcc623cb - DD 0x68fcedb6,0x68fcedb6 - DD 0x63f1e4b8,0x63f1e4b8 - DD 0xcadc31d7,0xcadc31d7 - DD 0x10856342,0x10856342 - DD 0x40229713,0x40229713 - DD 0x2011c684,0x2011c684 - DD 0x7d244a85,0x7d244a85 - DD 0xf83dbbd2,0xf83dbbd2 - DD 0x1132f9ae,0x1132f9ae - DD 0x6da129c7,0x6da129c7 - DD 0x4b2f9e1d,0x4b2f9e1d - DD 0xf330b2dc,0xf330b2dc - DD 0xec52860d,0xec52860d - DD 0xd0e3c177,0xd0e3c177 - DD 0x6c16b32b,0x6c16b32b - DD 0x99b970a9,0x99b970a9 - DD 0xfa489411,0xfa489411 - DD 0x2264e947,0x2264e947 - DD 0xc48cfca8,0xc48cfca8 - DD 0x1a3ff0a0,0x1a3ff0a0 - DD 0xd82c7d56,0xd82c7d56 - DD 0xef903322,0xef903322 - DD 0xc74e4987,0xc74e4987 - DD 0xc1d138d9,0xc1d138d9 - DD 0xfea2ca8c,0xfea2ca8c - DD 0x360bd498,0x360bd498 - DD 0xcf81f5a6,0xcf81f5a6 - DD 0x28de7aa5,0x28de7aa5 - DD 0x268eb7da,0x268eb7da - DD 0xa4bfad3f,0xa4bfad3f - DD 0xe49d3a2c,0xe49d3a2c - DD 0x0d927850,0x0d927850 - DD 0x9bcc5f6a,0x9bcc5f6a - DD 0x62467e54,0x62467e54 - DD 0xc2138df6,0xc2138df6 - DD 0xe8b8d890,0xe8b8d890 - DD 0x5ef7392e,0x5ef7392e - DD 0xf5afc382,0xf5afc382 - DD 0xbe805d9f,0xbe805d9f - DD 0x7c93d069,0x7c93d069 - DD 0xa92dd56f,0xa92dd56f - DD 0xb31225cf,0xb31225cf - DD 0x3b99acc8,0x3b99acc8 - DD 0xa77d1810,0xa77d1810 - DD 0x6e639ce8,0x6e639ce8 - DD 0x7bbb3bdb,0x7bbb3bdb - DD 0x097826cd,0x097826cd - DD 0xf418596e,0xf418596e - DD 0x01b79aec,0x01b79aec - DD 0xa89a4f83,0xa89a4f83 - DD 0x656e95e6,0x656e95e6 - DD 0x7ee6ffaa,0x7ee6ffaa - DD 0x08cfbc21,0x08cfbc21 - DD 0xe6e815ef,0xe6e815ef - DD 0xd99be7ba,0xd99be7ba - DD 0xce366f4a,0xce366f4a - DD 0xd4099fea,0xd4099fea - DD 0xd67cb029,0xd67cb029 - DD 0xafb2a431,0xafb2a431 - DD 0x31233f2a,0x31233f2a - DD 0x3094a5c6,0x3094a5c6 - DD 0xc066a235,0xc066a235 - DD 0x37bc4e74,0x37bc4e74 - DD 0xa6ca82fc,0xa6ca82fc - DD 0xb0d090e0,0xb0d090e0 - DD 0x15d8a733,0x15d8a733 - DD 0x4a9804f1,0x4a9804f1 - DD 0xf7daec41,0xf7daec41 - DD 0x0e50cd7f,0x0e50cd7f - DD 0x2ff69117,0x2ff69117 - DD 0x8dd64d76,0x8dd64d76 - DD 0x4db0ef43,0x4db0ef43 - DD 0x544daacc,0x544daacc - DD 0xdf0496e4,0xdf0496e4 - DD 0xe3b5d19e,0xe3b5d19e - DD 0x1b886a4c,0x1b886a4c - DD 0xb81f2cc1,0xb81f2cc1 - DD 0x7f516546,0x7f516546 - DD 0x04ea5e9d,0x04ea5e9d - DD 0x5d358c01,0x5d358c01 - DD 0x737487fa,0x737487fa - DD 0x2e410bfb,0x2e410bfb - DD 0x5a1d67b3,0x5a1d67b3 - DD 0x52d2db92,0x52d2db92 - DD 0x335610e9,0x335610e9 - DD 0x1347d66d,0x1347d66d - DD 0x8c61d79a,0x8c61d79a - DD 0x7a0ca137,0x7a0ca137 - DD 0x8e14f859,0x8e14f859 - DD 0x893c13eb,0x893c13eb - DD 0xee27a9ce,0xee27a9ce - DD 0x35c961b7,0x35c961b7 - DD 0xede51ce1,0xede51ce1 - DD 0x3cb1477a,0x3cb1477a - DD 0x59dfd29c,0x59dfd29c - DD 0x3f73f255,0x3f73f255 - DD 0x79ce1418,0x79ce1418 - DD 0xbf37c773,0xbf37c773 - DD 0xeacdf753,0xeacdf753 - DD 0x5baafd5f,0x5baafd5f - DD 0x146f3ddf,0x146f3ddf - DD 0x86db4478,0x86db4478 - DD 0x81f3afca,0x81f3afca - DD 0x3ec468b9,0x3ec468b9 - DD 0x2c342438,0x2c342438 - DD 0x5f40a3c2,0x5f40a3c2 - DD 0x72c31d16,0x72c31d16 - DD 0x0c25e2bc,0x0c25e2bc - DD 0x8b493c28,0x8b493c28 - DD 0x41950dff,0x41950dff - DD 0x7101a839,0x7101a839 - DD 0xdeb30c08,0xdeb30c08 - DD 0x9ce4b4d8,0x9ce4b4d8 - DD 0x90c15664,0x90c15664 - DD 0x6184cb7b,0x6184cb7b - DD 0x70b632d5,0x70b632d5 - DD 0x745c6c48,0x745c6c48 - DD 0x4257b8d0,0x4257b8d0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32 -DB 67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97 -DB 112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103 -DB 62,0 -ALIGN 64 -EXTERN __imp_RtlVirtualUnwind - -ALIGN 16 -block_se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - mov rsi,QWORD[8+r9] - mov r11,QWORD[56+r9] - - mov r10d,DWORD[r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jb NEAR $L$in_block_prologue - - mov rax,QWORD[152+r8] - - mov r10d,DWORD[4+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_block_prologue - - mov rax,QWORD[24+rax] - - mov rbx,QWORD[((-8))+rax] - mov rbp,QWORD[((-16))+rax] - mov r12,QWORD[((-24))+rax] - mov r13,QWORD[((-32))+rax] - mov r14,QWORD[((-40))+rax] - mov r15,QWORD[((-48))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_block_prologue: - mov rdi,QWORD[8+rax] - mov rsi,QWORD[16+rax] - mov QWORD[152+r8],rax - mov QWORD[168+r8],rsi - mov QWORD[176+r8],rdi - - jmp NEAR $L$common_seh_exit - - - -ALIGN 16 -key_se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - mov rsi,QWORD[8+r9] - mov r11,QWORD[56+r9] - - mov r10d,DWORD[r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jb NEAR $L$in_key_prologue - - mov rax,QWORD[152+r8] - - mov r10d,DWORD[4+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_key_prologue - - lea rax,[56+rax] - - mov rbx,QWORD[((-8))+rax] - mov rbp,QWORD[((-16))+rax] - mov r12,QWORD[((-24))+rax] - mov r13,QWORD[((-32))+rax] - mov r14,QWORD[((-40))+rax] - mov r15,QWORD[((-48))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_key_prologue: - mov rdi,QWORD[8+rax] - mov rsi,QWORD[16+rax] - mov QWORD[152+r8],rax - mov QWORD[168+r8],rsi - mov QWORD[176+r8],rdi - - jmp NEAR $L$common_seh_exit - - - -ALIGN 16 -cbc_se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - lea r10,[$L$cbc_prologue] - cmp rbx,r10 - jb NEAR $L$in_cbc_prologue - - lea r10,[$L$cbc_fast_body] - cmp rbx,r10 - jb NEAR $L$in_cbc_frame_setup - - lea r10,[$L$cbc_slow_prologue] - cmp rbx,r10 - jb NEAR $L$in_cbc_body - - lea r10,[$L$cbc_slow_body] - cmp rbx,r10 - jb NEAR $L$in_cbc_frame_setup - -$L$in_cbc_body: - mov rax,QWORD[152+r8] - - lea r10,[$L$cbc_epilogue] - cmp rbx,r10 - jae NEAR $L$in_cbc_prologue - - lea rax,[8+rax] - - lea r10,[$L$cbc_popfq] - cmp rbx,r10 - jae NEAR $L$in_cbc_prologue - - mov rax,QWORD[8+rax] - lea rax,[56+rax] - -$L$in_cbc_frame_setup: - mov rbx,QWORD[((-16))+rax] - mov rbp,QWORD[((-24))+rax] - mov r12,QWORD[((-32))+rax] - mov r13,QWORD[((-40))+rax] - mov r14,QWORD[((-48))+rax] - mov r15,QWORD[((-56))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_cbc_prologue: - mov rdi,QWORD[8+rax] - mov rsi,QWORD[16+rax] - mov QWORD[152+r8],rax - mov QWORD[168+r8],rsi - mov QWORD[176+r8],rdi - -$L$common_seh_exit: - - mov rdi,QWORD[40+r9] - mov rsi,r8 - mov ecx,154 - DD 0xa548f3fc - - mov rsi,r9 - xor rcx,rcx - mov rdx,QWORD[8+rsi] - mov r8,QWORD[rsi] - mov r9,QWORD[16+rsi] - mov r10,QWORD[40+rsi] - lea r11,[56+rsi] - lea r12,[24+rsi] - mov QWORD[32+rsp],r10 - mov QWORD[40+rsp],r11 - mov QWORD[48+rsp],r12 - mov QWORD[56+rsp],rcx - call QWORD[__imp_RtlVirtualUnwind] - - mov eax,1 - add rsp,64 - popfq - pop r15 - pop r14 - pop r13 - pop r12 - pop rbp - pop rbx - pop rdi - pop rsi - DB 0F3h,0C3h ;repret - - -section .pdata rdata align=4 -ALIGN 4 - DD $L$SEH_begin_AES_encrypt wrt ..imagebase - DD $L$SEH_end_AES_encrypt wrt ..imagebase - DD $L$SEH_info_AES_encrypt wrt ..imagebase - - DD $L$SEH_begin_AES_decrypt wrt ..imagebase - DD $L$SEH_end_AES_decrypt wrt ..imagebase - DD $L$SEH_info_AES_decrypt wrt ..imagebase - - DD $L$SEH_begin_AES_set_encrypt_key wrt ..imagebase - DD $L$SEH_end_AES_set_encrypt_key wrt ..imagebase - DD $L$SEH_info_AES_set_encrypt_key wrt ..imagebase - - DD $L$SEH_begin_AES_set_decrypt_key wrt ..imagebase - DD $L$SEH_end_AES_set_decrypt_key wrt ..imagebase - DD $L$SEH_info_AES_set_decrypt_key wrt ..imagebase - - DD $L$SEH_begin_AES_cbc_encrypt wrt ..imagebase - DD $L$SEH_end_AES_cbc_encrypt wrt ..imagebase - DD $L$SEH_info_AES_cbc_encrypt wrt ..imagebase - -section .xdata rdata align=8 -ALIGN 8 -$L$SEH_info_AES_encrypt: -DB 9,0,0,0 - DD block_se_handler wrt ..imagebase - DD $L$enc_prologue wrt ..imagebase,$L$enc_epilogue wrt ..imagebase -$L$SEH_info_AES_decrypt: -DB 9,0,0,0 - DD block_se_handler wrt ..imagebase - DD $L$dec_prologue wrt ..imagebase,$L$dec_epilogue wrt ..imagebase -$L$SEH_info_AES_set_encrypt_key: -DB 9,0,0,0 - DD key_se_handler wrt ..imagebase - DD $L$enc_key_prologue wrt ..imagebase,$L$enc_key_epilogue wrt ..imagebase -$L$SEH_info_AES_set_decrypt_key: -DB 9,0,0,0 - DD key_se_handler wrt ..imagebase - DD $L$dec_key_prologue wrt ..imagebase,$L$dec_key_epilogue wrt ..imagebase -$L$SEH_info_AES_cbc_encrypt: -DB 9,0,0,0 - DD cbc_se_handler wrt ..imagebase diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm index 925d1be94a94c9..ac71215c45e2dc 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm @@ -11,6 +11,7 @@ global aesni_cbc_sha1_enc ALIGN 32 aesni_cbc_sha1_enc: + mov r10d,DWORD[((OPENSSL_ia32cap_P+0))] mov r11,QWORD[((OPENSSL_ia32cap_P+4))] bt r11,61 @@ -24,6 +25,7 @@ aesni_cbc_sha1_enc: DB 0F3h,0C3h ;repret + ALIGN 32 aesni_cbc_sha1_enc_ssse3: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -2809,6 +2811,7 @@ $L$SEH_begin_aesni_cbc_sha1_enc_shaext: mov r9,QWORD[48+rsp] + mov r10,QWORD[56+rsp] lea rsp,[((-168))+rsp] movaps XMMWORD[(-8-160)+rax],xmm6 @@ -3133,6 +3136,7 @@ $L$epilogue_shaext: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_cbc_sha1_enc_shaext: EXTERN __imp_RtlVirtualUnwind diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm index b5d50c74dbaaee..17e571d38b1846 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm @@ -10,6 +10,7 @@ global aesni_cbc_sha256_enc ALIGN 16 aesni_cbc_sha256_enc: + lea r11,[OPENSSL_ia32cap_P] mov eax,1 cmp rcx,0 @@ -37,6 +38,7 @@ $L$probe: DB 0F3h,0C3h ;repret + ALIGN 64 K256: @@ -4128,23 +4130,25 @@ $L$ower_avx2: jbe NEAR $L$oop_avx2 lea rbp,[rsp] + + + $L$done_avx2: - lea rsp,[rbp] - mov r8,QWORD[((64+32))+rsp] - mov rsi,QWORD[120+rsp] + mov r8,QWORD[((64+32))+rbp] + mov rsi,QWORD[((64+56))+rbp] vmovdqu XMMWORD[r8],xmm8 vzeroall - movaps xmm6,XMMWORD[128+rsp] - movaps xmm7,XMMWORD[144+rsp] - movaps xmm8,XMMWORD[160+rsp] - movaps xmm9,XMMWORD[176+rsp] - movaps xmm10,XMMWORD[192+rsp] - movaps xmm11,XMMWORD[208+rsp] - movaps xmm12,XMMWORD[224+rsp] - movaps xmm13,XMMWORD[240+rsp] - movaps xmm14,XMMWORD[256+rsp] - movaps xmm15,XMMWORD[272+rsp] + movaps xmm6,XMMWORD[128+rbp] + movaps xmm7,XMMWORD[144+rbp] + movaps xmm8,XMMWORD[160+rbp] + movaps xmm9,XMMWORD[176+rbp] + movaps xmm10,XMMWORD[192+rbp] + movaps xmm11,XMMWORD[208+rbp] + movaps xmm12,XMMWORD[224+rbp] + movaps xmm13,XMMWORD[240+rbp] + movaps xmm14,XMMWORD[256+rbp] + movaps xmm15,XMMWORD[272+rbp] mov r15,QWORD[((-48))+rsi] mov r14,QWORD[((-40))+rsi] @@ -4180,6 +4184,7 @@ $L$SEH_begin_aesni_cbc_sha256_enc_shaext: mov r9,QWORD[48+rsp] + mov r10,QWORD[56+rsp] lea rsp,[((-168))+rsp] movaps XMMWORD[(-8-160)+rax],xmm6 @@ -4555,6 +4560,7 @@ $L$epilogue_shaext: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_cbc_sha256_enc_shaext: EXTERN __imp_RtlVirtualUnwind diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm index 823ba771d0a3af..f6027245a377a7 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm @@ -907,6 +907,7 @@ $L$SEH_begin_aesni_ccm64_encrypt_blocks: mov r9,QWORD[48+rsp] + lea rsp,[((-88))+rsp] movaps XMMWORD[rsp],xmm6 movaps XMMWORD[16+rsp],xmm7 @@ -983,6 +984,7 @@ $L$ccm64_enc_ret: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_ccm64_encrypt_blocks: global aesni_ccm64_decrypt_blocks @@ -1000,6 +1002,7 @@ $L$SEH_begin_aesni_ccm64_decrypt_blocks: mov r9,QWORD[48+rsp] + lea rsp,[((-88))+rsp] movaps XMMWORD[rsp],xmm6 movaps XMMWORD[16+rsp],xmm7 @@ -1110,6 +1113,7 @@ $L$ccm64_dec_ret: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_ccm64_decrypt_blocks: global aesni_ctr32_encrypt_blocks @@ -3019,6 +3023,7 @@ $L$SEH_end_aesni_ocb_encrypt: ALIGN 32 __ocb_encrypt6: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3119,8 +3124,10 @@ DB 102,65,15,56,221,255 + ALIGN 32 __ocb_encrypt4: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3188,8 +3195,10 @@ DB 102,65,15,56,221,237 + ALIGN 32 __ocb_encrypt1: + pxor xmm7,xmm15 pxor xmm7,xmm9 pxor xmm8,xmm2 @@ -3222,6 +3231,7 @@ DB 102,15,56,221,215 DB 0F3h,0C3h ;repret + global aesni_ocb_decrypt ALIGN 32 @@ -3493,6 +3503,7 @@ $L$SEH_end_aesni_ocb_decrypt: ALIGN 32 __ocb_decrypt6: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3587,8 +3598,10 @@ DB 102,65,15,56,223,255 + ALIGN 32 __ocb_decrypt4: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3652,8 +3665,10 @@ DB 102,65,15,56,223,237 + ALIGN 32 __ocb_decrypt1: + pxor xmm7,xmm15 pxor xmm7,xmm9 pxor xmm2,xmm7 @@ -3684,6 +3699,7 @@ DB 102,15,56,222,209 DB 102,15,56,223,215 DB 0F3h,0C3h ;repret + global aesni_cbc_encrypt ALIGN 16 @@ -4662,7 +4678,6 @@ $L$enc_key_ret: add rsp,8 DB 0F3h,0C3h ;repret - $L$SEH_end_set_encrypt_key: ALIGN 16 @@ -4735,6 +4750,7 @@ $L$key_expansion_256b: DB 0F3h,0C3h ;repret + ALIGN 64 $L$bswap_mask: DB 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/bsaes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/bsaes-x86_64.asm deleted file mode 100644 index 7cccb6a46983c4..00000000000000 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/bsaes-x86_64.asm +++ /dev/null @@ -1,2821 +0,0 @@ -default rel -%define XMMWORD -%define YMMWORD -%define ZMMWORD -section .text code align=64 - - -EXTERN asm_AES_encrypt -EXTERN asm_AES_decrypt - - -ALIGN 64 -_bsaes_encrypt8: - - lea r11,[$L$BS0] - - movdqa xmm8,XMMWORD[rax] - lea rax,[16+rax] - movdqa xmm7,XMMWORD[80+r11] - pxor xmm15,xmm8 - pxor xmm0,xmm8 - pxor xmm1,xmm8 - pxor xmm2,xmm8 -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,xmm8 - pxor xmm4,xmm8 -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,xmm8 - pxor xmm6,xmm8 -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm5 - psrlq xmm5,1 - movdqa xmm10,xmm3 - psrlq xmm3,1 - pxor xmm5,xmm6 - pxor xmm3,xmm4 - pand xmm5,xmm7 - pand xmm3,xmm7 - pxor xmm6,xmm5 - psllq xmm5,1 - pxor xmm4,xmm3 - psllq xmm3,1 - pxor xmm5,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm1 - psrlq xmm1,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm1,xmm2 - pxor xmm15,xmm0 - pand xmm1,xmm7 - pand xmm15,xmm7 - pxor xmm2,xmm1 - psllq xmm1,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm1,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm4 - psrlq xmm4,2 - movdqa xmm10,xmm3 - psrlq xmm3,2 - pxor xmm4,xmm6 - pxor xmm3,xmm5 - pand xmm4,xmm8 - pand xmm3,xmm8 - pxor xmm6,xmm4 - psllq xmm4,2 - pxor xmm5,xmm3 - psllq xmm3,2 - pxor xmm4,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm2 - pxor xmm15,xmm1 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm2,xmm0 - psllq xmm0,2 - pxor xmm1,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm2 - psrlq xmm2,4 - movdqa xmm10,xmm1 - psrlq xmm1,4 - pxor xmm2,xmm6 - pxor xmm1,xmm5 - pand xmm2,xmm7 - pand xmm1,xmm7 - pxor xmm6,xmm2 - psllq xmm2,4 - pxor xmm5,xmm1 - psllq xmm1,4 - pxor xmm2,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm4 - pxor xmm15,xmm3 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm4,xmm0 - psllq xmm0,4 - pxor xmm3,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - dec r10d - jmp NEAR $L$enc_sbox -ALIGN 16 -$L$enc_loop: - pxor xmm15,XMMWORD[rax] - pxor xmm0,XMMWORD[16+rax] - pxor xmm1,XMMWORD[32+rax] - pxor xmm2,XMMWORD[48+rax] -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,XMMWORD[64+rax] - pxor xmm4,XMMWORD[80+rax] -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,XMMWORD[96+rax] - pxor xmm6,XMMWORD[112+rax] -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - lea rax,[128+rax] -$L$enc_sbox: - pxor xmm4,xmm5 - pxor xmm1,xmm0 - pxor xmm2,xmm15 - pxor xmm5,xmm1 - pxor xmm4,xmm15 - - pxor xmm5,xmm2 - pxor xmm2,xmm6 - pxor xmm6,xmm4 - pxor xmm2,xmm3 - pxor xmm3,xmm4 - pxor xmm2,xmm0 - - pxor xmm1,xmm6 - pxor xmm0,xmm4 - movdqa xmm10,xmm6 - movdqa xmm9,xmm0 - movdqa xmm8,xmm4 - movdqa xmm12,xmm1 - movdqa xmm11,xmm5 - - pxor xmm10,xmm3 - pxor xmm9,xmm1 - pxor xmm8,xmm2 - movdqa xmm13,xmm10 - pxor xmm12,xmm3 - movdqa xmm7,xmm9 - pxor xmm11,xmm15 - movdqa xmm14,xmm10 - - por xmm9,xmm8 - por xmm10,xmm11 - pxor xmm14,xmm7 - pand xmm13,xmm11 - pxor xmm11,xmm8 - pand xmm7,xmm8 - pand xmm14,xmm11 - movdqa xmm11,xmm2 - pxor xmm11,xmm15 - pand xmm12,xmm11 - pxor xmm10,xmm12 - pxor xmm9,xmm12 - movdqa xmm12,xmm6 - movdqa xmm11,xmm4 - pxor xmm12,xmm0 - pxor xmm11,xmm5 - movdqa xmm8,xmm12 - pand xmm12,xmm11 - por xmm8,xmm11 - pxor xmm7,xmm12 - pxor xmm10,xmm14 - pxor xmm9,xmm13 - pxor xmm8,xmm14 - movdqa xmm11,xmm1 - pxor xmm7,xmm13 - movdqa xmm12,xmm3 - pxor xmm8,xmm13 - movdqa xmm13,xmm0 - pand xmm11,xmm2 - movdqa xmm14,xmm6 - pand xmm12,xmm15 - pand xmm13,xmm4 - por xmm14,xmm5 - pxor xmm10,xmm11 - pxor xmm9,xmm12 - pxor xmm8,xmm13 - pxor xmm7,xmm14 - - - - - - movdqa xmm11,xmm10 - pand xmm10,xmm8 - pxor xmm11,xmm9 - - movdqa xmm13,xmm7 - movdqa xmm14,xmm11 - pxor xmm13,xmm10 - pand xmm14,xmm13 - - movdqa xmm12,xmm8 - pxor xmm14,xmm9 - pxor xmm12,xmm7 - - pxor xmm10,xmm9 - - pand xmm12,xmm10 - - movdqa xmm9,xmm13 - pxor xmm12,xmm7 - - pxor xmm9,xmm12 - pxor xmm8,xmm12 - - pand xmm9,xmm7 - - pxor xmm13,xmm9 - pxor xmm8,xmm9 - - pand xmm13,xmm14 - - pxor xmm13,xmm11 - movdqa xmm11,xmm5 - movdqa xmm7,xmm4 - movdqa xmm9,xmm14 - pxor xmm9,xmm13 - pand xmm9,xmm5 - pxor xmm5,xmm4 - pand xmm4,xmm14 - pand xmm5,xmm13 - pxor xmm5,xmm4 - pxor xmm4,xmm9 - pxor xmm11,xmm15 - pxor xmm7,xmm2 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm15 - pxor xmm11,xmm7 - pxor xmm15,xmm2 - pand xmm7,xmm14 - pand xmm2,xmm12 - pand xmm11,xmm13 - pand xmm15,xmm8 - pxor xmm7,xmm11 - pxor xmm15,xmm2 - pxor xmm11,xmm10 - pxor xmm2,xmm9 - pxor xmm5,xmm11 - pxor xmm15,xmm11 - pxor xmm4,xmm7 - pxor xmm2,xmm7 - - movdqa xmm11,xmm6 - movdqa xmm7,xmm0 - pxor xmm11,xmm3 - pxor xmm7,xmm1 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm3 - pxor xmm11,xmm7 - pxor xmm3,xmm1 - pand xmm7,xmm14 - pand xmm1,xmm12 - pand xmm11,xmm13 - pand xmm3,xmm8 - pxor xmm7,xmm11 - pxor xmm3,xmm1 - pxor xmm11,xmm10 - pxor xmm1,xmm9 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - pxor xmm10,xmm13 - pand xmm10,xmm6 - pxor xmm6,xmm0 - pand xmm0,xmm14 - pand xmm6,xmm13 - pxor xmm6,xmm0 - pxor xmm0,xmm10 - pxor xmm6,xmm11 - pxor xmm3,xmm11 - pxor xmm0,xmm7 - pxor xmm1,xmm7 - pxor xmm6,xmm15 - pxor xmm0,xmm5 - pxor xmm3,xmm6 - pxor xmm5,xmm15 - pxor xmm15,xmm0 - - pxor xmm0,xmm4 - pxor xmm4,xmm1 - pxor xmm1,xmm2 - pxor xmm2,xmm4 - pxor xmm3,xmm4 - - pxor xmm5,xmm2 - dec r10d - jl NEAR $L$enc_done - pshufd xmm7,xmm15,0x93 - pshufd xmm8,xmm0,0x93 - pxor xmm15,xmm7 - pshufd xmm9,xmm3,0x93 - pxor xmm0,xmm8 - pshufd xmm10,xmm5,0x93 - pxor xmm3,xmm9 - pshufd xmm11,xmm2,0x93 - pxor xmm5,xmm10 - pshufd xmm12,xmm6,0x93 - pxor xmm2,xmm11 - pshufd xmm13,xmm1,0x93 - pxor xmm6,xmm12 - pshufd xmm14,xmm4,0x93 - pxor xmm1,xmm13 - pxor xmm4,xmm14 - - pxor xmm8,xmm15 - pxor xmm7,xmm4 - pxor xmm8,xmm4 - pshufd xmm15,xmm15,0x4E - pxor xmm9,xmm0 - pshufd xmm0,xmm0,0x4E - pxor xmm12,xmm2 - pxor xmm15,xmm7 - pxor xmm13,xmm6 - pxor xmm0,xmm8 - pxor xmm11,xmm5 - pshufd xmm7,xmm2,0x4E - pxor xmm14,xmm1 - pshufd xmm8,xmm6,0x4E - pxor xmm10,xmm3 - pshufd xmm2,xmm5,0x4E - pxor xmm10,xmm4 - pshufd xmm6,xmm4,0x4E - pxor xmm11,xmm4 - pshufd xmm5,xmm1,0x4E - pxor xmm7,xmm11 - pshufd xmm1,xmm3,0x4E - pxor xmm8,xmm12 - pxor xmm2,xmm10 - pxor xmm6,xmm14 - pxor xmm5,xmm13 - movdqa xmm3,xmm7 - pxor xmm1,xmm9 - movdqa xmm4,xmm8 - movdqa xmm7,XMMWORD[48+r11] - jnz NEAR $L$enc_loop - movdqa xmm7,XMMWORD[64+r11] - jmp NEAR $L$enc_loop -ALIGN 16 -$L$enc_done: - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm1 - psrlq xmm1,1 - movdqa xmm10,xmm2 - psrlq xmm2,1 - pxor xmm1,xmm4 - pxor xmm2,xmm6 - pand xmm1,xmm7 - pand xmm2,xmm7 - pxor xmm4,xmm1 - psllq xmm1,1 - pxor xmm6,xmm2 - psllq xmm2,1 - pxor xmm1,xmm9 - pxor xmm2,xmm10 - movdqa xmm9,xmm3 - psrlq xmm3,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm3,xmm5 - pxor xmm15,xmm0 - pand xmm3,xmm7 - pand xmm15,xmm7 - pxor xmm5,xmm3 - psllq xmm3,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm3,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm6 - psrlq xmm6,2 - movdqa xmm10,xmm2 - psrlq xmm2,2 - pxor xmm6,xmm4 - pxor xmm2,xmm1 - pand xmm6,xmm8 - pand xmm2,xmm8 - pxor xmm4,xmm6 - psllq xmm6,2 - pxor xmm1,xmm2 - psllq xmm2,2 - pxor xmm6,xmm9 - pxor xmm2,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm5 - pxor xmm15,xmm3 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm5,xmm0 - psllq xmm0,2 - pxor xmm3,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm5 - psrlq xmm5,4 - movdqa xmm10,xmm3 - psrlq xmm3,4 - pxor xmm5,xmm4 - pxor xmm3,xmm1 - pand xmm5,xmm7 - pand xmm3,xmm7 - pxor xmm4,xmm5 - psllq xmm5,4 - pxor xmm1,xmm3 - psllq xmm3,4 - pxor xmm5,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm6 - pxor xmm15,xmm2 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm6,xmm0 - psllq xmm0,4 - pxor xmm2,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[rax] - pxor xmm3,xmm7 - pxor xmm5,xmm7 - pxor xmm2,xmm7 - pxor xmm6,xmm7 - pxor xmm1,xmm7 - pxor xmm4,xmm7 - pxor xmm15,xmm7 - pxor xmm0,xmm7 - DB 0F3h,0C3h ;repret - - - - -ALIGN 64 -_bsaes_decrypt8: - - lea r11,[$L$BS0] - - movdqa xmm8,XMMWORD[rax] - lea rax,[16+rax] - movdqa xmm7,XMMWORD[((-48))+r11] - pxor xmm15,xmm8 - pxor xmm0,xmm8 - pxor xmm1,xmm8 - pxor xmm2,xmm8 -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,xmm8 - pxor xmm4,xmm8 -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,xmm8 - pxor xmm6,xmm8 -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm5 - psrlq xmm5,1 - movdqa xmm10,xmm3 - psrlq xmm3,1 - pxor xmm5,xmm6 - pxor xmm3,xmm4 - pand xmm5,xmm7 - pand xmm3,xmm7 - pxor xmm6,xmm5 - psllq xmm5,1 - pxor xmm4,xmm3 - psllq xmm3,1 - pxor xmm5,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm1 - psrlq xmm1,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm1,xmm2 - pxor xmm15,xmm0 - pand xmm1,xmm7 - pand xmm15,xmm7 - pxor xmm2,xmm1 - psllq xmm1,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm1,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm4 - psrlq xmm4,2 - movdqa xmm10,xmm3 - psrlq xmm3,2 - pxor xmm4,xmm6 - pxor xmm3,xmm5 - pand xmm4,xmm8 - pand xmm3,xmm8 - pxor xmm6,xmm4 - psllq xmm4,2 - pxor xmm5,xmm3 - psllq xmm3,2 - pxor xmm4,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm2 - pxor xmm15,xmm1 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm2,xmm0 - psllq xmm0,2 - pxor xmm1,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm2 - psrlq xmm2,4 - movdqa xmm10,xmm1 - psrlq xmm1,4 - pxor xmm2,xmm6 - pxor xmm1,xmm5 - pand xmm2,xmm7 - pand xmm1,xmm7 - pxor xmm6,xmm2 - psllq xmm2,4 - pxor xmm5,xmm1 - psllq xmm1,4 - pxor xmm2,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm4 - pxor xmm15,xmm3 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm4,xmm0 - psllq xmm0,4 - pxor xmm3,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - dec r10d - jmp NEAR $L$dec_sbox -ALIGN 16 -$L$dec_loop: - pxor xmm15,XMMWORD[rax] - pxor xmm0,XMMWORD[16+rax] - pxor xmm1,XMMWORD[32+rax] - pxor xmm2,XMMWORD[48+rax] -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,XMMWORD[64+rax] - pxor xmm4,XMMWORD[80+rax] -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,XMMWORD[96+rax] - pxor xmm6,XMMWORD[112+rax] -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - lea rax,[128+rax] -$L$dec_sbox: - pxor xmm2,xmm3 - - pxor xmm3,xmm6 - pxor xmm1,xmm6 - pxor xmm5,xmm3 - pxor xmm6,xmm5 - pxor xmm0,xmm6 - - pxor xmm15,xmm0 - pxor xmm1,xmm4 - pxor xmm2,xmm15 - pxor xmm4,xmm15 - pxor xmm0,xmm2 - movdqa xmm10,xmm2 - movdqa xmm9,xmm6 - movdqa xmm8,xmm0 - movdqa xmm12,xmm3 - movdqa xmm11,xmm4 - - pxor xmm10,xmm15 - pxor xmm9,xmm3 - pxor xmm8,xmm5 - movdqa xmm13,xmm10 - pxor xmm12,xmm15 - movdqa xmm7,xmm9 - pxor xmm11,xmm1 - movdqa xmm14,xmm10 - - por xmm9,xmm8 - por xmm10,xmm11 - pxor xmm14,xmm7 - pand xmm13,xmm11 - pxor xmm11,xmm8 - pand xmm7,xmm8 - pand xmm14,xmm11 - movdqa xmm11,xmm5 - pxor xmm11,xmm1 - pand xmm12,xmm11 - pxor xmm10,xmm12 - pxor xmm9,xmm12 - movdqa xmm12,xmm2 - movdqa xmm11,xmm0 - pxor xmm12,xmm6 - pxor xmm11,xmm4 - movdqa xmm8,xmm12 - pand xmm12,xmm11 - por xmm8,xmm11 - pxor xmm7,xmm12 - pxor xmm10,xmm14 - pxor xmm9,xmm13 - pxor xmm8,xmm14 - movdqa xmm11,xmm3 - pxor xmm7,xmm13 - movdqa xmm12,xmm15 - pxor xmm8,xmm13 - movdqa xmm13,xmm6 - pand xmm11,xmm5 - movdqa xmm14,xmm2 - pand xmm12,xmm1 - pand xmm13,xmm0 - por xmm14,xmm4 - pxor xmm10,xmm11 - pxor xmm9,xmm12 - pxor xmm8,xmm13 - pxor xmm7,xmm14 - - - - - - movdqa xmm11,xmm10 - pand xmm10,xmm8 - pxor xmm11,xmm9 - - movdqa xmm13,xmm7 - movdqa xmm14,xmm11 - pxor xmm13,xmm10 - pand xmm14,xmm13 - - movdqa xmm12,xmm8 - pxor xmm14,xmm9 - pxor xmm12,xmm7 - - pxor xmm10,xmm9 - - pand xmm12,xmm10 - - movdqa xmm9,xmm13 - pxor xmm12,xmm7 - - pxor xmm9,xmm12 - pxor xmm8,xmm12 - - pand xmm9,xmm7 - - pxor xmm13,xmm9 - pxor xmm8,xmm9 - - pand xmm13,xmm14 - - pxor xmm13,xmm11 - movdqa xmm11,xmm4 - movdqa xmm7,xmm0 - movdqa xmm9,xmm14 - pxor xmm9,xmm13 - pand xmm9,xmm4 - pxor xmm4,xmm0 - pand xmm0,xmm14 - pand xmm4,xmm13 - pxor xmm4,xmm0 - pxor xmm0,xmm9 - pxor xmm11,xmm1 - pxor xmm7,xmm5 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm1 - pxor xmm11,xmm7 - pxor xmm1,xmm5 - pand xmm7,xmm14 - pand xmm5,xmm12 - pand xmm11,xmm13 - pand xmm1,xmm8 - pxor xmm7,xmm11 - pxor xmm1,xmm5 - pxor xmm11,xmm10 - pxor xmm5,xmm9 - pxor xmm4,xmm11 - pxor xmm1,xmm11 - pxor xmm0,xmm7 - pxor xmm5,xmm7 - - movdqa xmm11,xmm2 - movdqa xmm7,xmm6 - pxor xmm11,xmm15 - pxor xmm7,xmm3 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm15 - pxor xmm11,xmm7 - pxor xmm15,xmm3 - pand xmm7,xmm14 - pand xmm3,xmm12 - pand xmm11,xmm13 - pand xmm15,xmm8 - pxor xmm7,xmm11 - pxor xmm15,xmm3 - pxor xmm11,xmm10 - pxor xmm3,xmm9 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - pxor xmm10,xmm13 - pand xmm10,xmm2 - pxor xmm2,xmm6 - pand xmm6,xmm14 - pand xmm2,xmm13 - pxor xmm2,xmm6 - pxor xmm6,xmm10 - pxor xmm2,xmm11 - pxor xmm15,xmm11 - pxor xmm6,xmm7 - pxor xmm3,xmm7 - pxor xmm0,xmm6 - pxor xmm5,xmm4 - - pxor xmm3,xmm0 - pxor xmm1,xmm6 - pxor xmm4,xmm6 - pxor xmm3,xmm1 - pxor xmm6,xmm15 - pxor xmm3,xmm4 - pxor xmm2,xmm5 - pxor xmm5,xmm0 - pxor xmm2,xmm3 - - pxor xmm3,xmm15 - pxor xmm6,xmm2 - dec r10d - jl NEAR $L$dec_done - - pshufd xmm7,xmm15,0x4E - pshufd xmm13,xmm2,0x4E - pxor xmm7,xmm15 - pshufd xmm14,xmm4,0x4E - pxor xmm13,xmm2 - pshufd xmm8,xmm0,0x4E - pxor xmm14,xmm4 - pshufd xmm9,xmm5,0x4E - pxor xmm8,xmm0 - pshufd xmm10,xmm3,0x4E - pxor xmm9,xmm5 - pxor xmm15,xmm13 - pxor xmm0,xmm13 - pshufd xmm11,xmm1,0x4E - pxor xmm10,xmm3 - pxor xmm5,xmm7 - pxor xmm3,xmm8 - pshufd xmm12,xmm6,0x4E - pxor xmm11,xmm1 - pxor xmm0,xmm14 - pxor xmm1,xmm9 - pxor xmm12,xmm6 - - pxor xmm5,xmm14 - pxor xmm3,xmm13 - pxor xmm1,xmm13 - pxor xmm6,xmm10 - pxor xmm2,xmm11 - pxor xmm1,xmm14 - pxor xmm6,xmm14 - pxor xmm4,xmm12 - pshufd xmm7,xmm15,0x93 - pshufd xmm8,xmm0,0x93 - pxor xmm15,xmm7 - pshufd xmm9,xmm5,0x93 - pxor xmm0,xmm8 - pshufd xmm10,xmm3,0x93 - pxor xmm5,xmm9 - pshufd xmm11,xmm1,0x93 - pxor xmm3,xmm10 - pshufd xmm12,xmm6,0x93 - pxor xmm1,xmm11 - pshufd xmm13,xmm2,0x93 - pxor xmm6,xmm12 - pshufd xmm14,xmm4,0x93 - pxor xmm2,xmm13 - pxor xmm4,xmm14 - - pxor xmm8,xmm15 - pxor xmm7,xmm4 - pxor xmm8,xmm4 - pshufd xmm15,xmm15,0x4E - pxor xmm9,xmm0 - pshufd xmm0,xmm0,0x4E - pxor xmm12,xmm1 - pxor xmm15,xmm7 - pxor xmm13,xmm6 - pxor xmm0,xmm8 - pxor xmm11,xmm3 - pshufd xmm7,xmm1,0x4E - pxor xmm14,xmm2 - pshufd xmm8,xmm6,0x4E - pxor xmm10,xmm5 - pshufd xmm1,xmm3,0x4E - pxor xmm10,xmm4 - pshufd xmm6,xmm4,0x4E - pxor xmm11,xmm4 - pshufd xmm3,xmm2,0x4E - pxor xmm7,xmm11 - pshufd xmm2,xmm5,0x4E - pxor xmm8,xmm12 - pxor xmm10,xmm1 - pxor xmm6,xmm14 - pxor xmm13,xmm3 - movdqa xmm3,xmm7 - pxor xmm2,xmm9 - movdqa xmm5,xmm13 - movdqa xmm4,xmm8 - movdqa xmm1,xmm2 - movdqa xmm2,xmm10 - movdqa xmm7,XMMWORD[((-16))+r11] - jnz NEAR $L$dec_loop - movdqa xmm7,XMMWORD[((-32))+r11] - jmp NEAR $L$dec_loop -ALIGN 16 -$L$dec_done: - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm2 - psrlq xmm2,1 - movdqa xmm10,xmm1 - psrlq xmm1,1 - pxor xmm2,xmm4 - pxor xmm1,xmm6 - pand xmm2,xmm7 - pand xmm1,xmm7 - pxor xmm4,xmm2 - psllq xmm2,1 - pxor xmm6,xmm1 - psllq xmm1,1 - pxor xmm2,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm5 - psrlq xmm5,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm5,xmm3 - pxor xmm15,xmm0 - pand xmm5,xmm7 - pand xmm15,xmm7 - pxor xmm3,xmm5 - psllq xmm5,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm5,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm6 - psrlq xmm6,2 - movdqa xmm10,xmm1 - psrlq xmm1,2 - pxor xmm6,xmm4 - pxor xmm1,xmm2 - pand xmm6,xmm8 - pand xmm1,xmm8 - pxor xmm4,xmm6 - psllq xmm6,2 - pxor xmm2,xmm1 - psllq xmm1,2 - pxor xmm6,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm3 - pxor xmm15,xmm5 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm3,xmm0 - psllq xmm0,2 - pxor xmm5,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm3 - psrlq xmm3,4 - movdqa xmm10,xmm5 - psrlq xmm5,4 - pxor xmm3,xmm4 - pxor xmm5,xmm2 - pand xmm3,xmm7 - pand xmm5,xmm7 - pxor xmm4,xmm3 - psllq xmm3,4 - pxor xmm2,xmm5 - psllq xmm5,4 - pxor xmm3,xmm9 - pxor xmm5,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm6 - pxor xmm15,xmm1 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm6,xmm0 - psllq xmm0,4 - pxor xmm1,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[rax] - pxor xmm5,xmm7 - pxor xmm3,xmm7 - pxor xmm1,xmm7 - pxor xmm6,xmm7 - pxor xmm2,xmm7 - pxor xmm4,xmm7 - pxor xmm15,xmm7 - pxor xmm0,xmm7 - DB 0F3h,0C3h ;repret - - - -ALIGN 16 -_bsaes_key_convert: - - lea r11,[$L$masks] - movdqu xmm7,XMMWORD[rcx] - lea rcx,[16+rcx] - movdqa xmm0,XMMWORD[r11] - movdqa xmm1,XMMWORD[16+r11] - movdqa xmm2,XMMWORD[32+r11] - movdqa xmm3,XMMWORD[48+r11] - movdqa xmm4,XMMWORD[64+r11] - pcmpeqd xmm5,xmm5 - - movdqu xmm6,XMMWORD[rcx] - movdqa XMMWORD[rax],xmm7 - lea rax,[16+rax] - dec r10d - jmp NEAR $L$key_loop -ALIGN 16 -$L$key_loop: -DB 102,15,56,0,244 - - movdqa xmm8,xmm0 - movdqa xmm9,xmm1 - - pand xmm8,xmm6 - pand xmm9,xmm6 - movdqa xmm10,xmm2 - pcmpeqb xmm8,xmm0 - psllq xmm0,4 - movdqa xmm11,xmm3 - pcmpeqb xmm9,xmm1 - psllq xmm1,4 - - pand xmm10,xmm6 - pand xmm11,xmm6 - movdqa xmm12,xmm0 - pcmpeqb xmm10,xmm2 - psllq xmm2,4 - movdqa xmm13,xmm1 - pcmpeqb xmm11,xmm3 - psllq xmm3,4 - - movdqa xmm14,xmm2 - movdqa xmm15,xmm3 - pxor xmm8,xmm5 - pxor xmm9,xmm5 - - pand xmm12,xmm6 - pand xmm13,xmm6 - movdqa XMMWORD[rax],xmm8 - pcmpeqb xmm12,xmm0 - psrlq xmm0,4 - movdqa XMMWORD[16+rax],xmm9 - pcmpeqb xmm13,xmm1 - psrlq xmm1,4 - lea rcx,[16+rcx] - - pand xmm14,xmm6 - pand xmm15,xmm6 - movdqa XMMWORD[32+rax],xmm10 - pcmpeqb xmm14,xmm2 - psrlq xmm2,4 - movdqa XMMWORD[48+rax],xmm11 - pcmpeqb xmm15,xmm3 - psrlq xmm3,4 - movdqu xmm6,XMMWORD[rcx] - - pxor xmm13,xmm5 - pxor xmm14,xmm5 - movdqa XMMWORD[64+rax],xmm12 - movdqa XMMWORD[80+rax],xmm13 - movdqa XMMWORD[96+rax],xmm14 - movdqa XMMWORD[112+rax],xmm15 - lea rax,[128+rax] - dec r10d - jnz NEAR $L$key_loop - - movdqa xmm7,XMMWORD[80+r11] - - DB 0F3h,0C3h ;repret - - -EXTERN asm_AES_cbc_encrypt -global bsaes_cbc_encrypt - -ALIGN 16 -bsaes_cbc_encrypt: - - mov r11d,DWORD[48+rsp] - cmp r11d,0 - jne NEAR asm_AES_cbc_encrypt - cmp r8,128 - jb NEAR asm_AES_cbc_encrypt - - mov rax,rsp -$L$cbc_dec_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$cbc_dec_body: - mov rbp,rsp - - mov eax,DWORD[240+r9] - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - mov rbx,r10 - shr r14,4 - - mov edx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,edx - call _bsaes_key_convert - pxor xmm7,XMMWORD[rsp] - movdqa XMMWORD[rax],xmm6 - movdqa XMMWORD[rsp],xmm7 - - movdqu xmm14,XMMWORD[rbx] - sub r14,8 -$L$cbc_dec_loop: - movdqu xmm15,XMMWORD[r12] - movdqu xmm0,XMMWORD[16+r12] - movdqu xmm1,XMMWORD[32+r12] - movdqu xmm2,XMMWORD[48+r12] - movdqu xmm3,XMMWORD[64+r12] - movdqu xmm4,XMMWORD[80+r12] - mov rax,rsp - movdqu xmm5,XMMWORD[96+r12] - mov r10d,edx - movdqu xmm6,XMMWORD[112+r12] - movdqa XMMWORD[32+rbp],xmm14 - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm6,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm2,xmm12 - movdqu xmm14,XMMWORD[112+r12] - pxor xmm4,xmm13 - movdqu XMMWORD[r13],xmm15 - lea r12,[128+r12] - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm2 - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - sub r14,8 - jnc NEAR $L$cbc_dec_loop - - add r14,8 - jz NEAR $L$cbc_dec_done - - movdqu xmm15,XMMWORD[r12] - mov rax,rsp - mov r10d,edx - cmp r14,2 - jb NEAR $L$cbc_dec_one - movdqu xmm0,XMMWORD[16+r12] - je NEAR $L$cbc_dec_two - movdqu xmm1,XMMWORD[32+r12] - cmp r14,4 - jb NEAR $L$cbc_dec_three - movdqu xmm2,XMMWORD[48+r12] - je NEAR $L$cbc_dec_four - movdqu xmm3,XMMWORD[64+r12] - cmp r14,6 - jb NEAR $L$cbc_dec_five - movdqu xmm4,XMMWORD[80+r12] - je NEAR $L$cbc_dec_six - movdqu xmm5,XMMWORD[96+r12] - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm6,xmm11 - movdqu xmm14,XMMWORD[96+r12] - pxor xmm2,xmm12 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm2 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_six: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu xmm14,XMMWORD[80+r12] - pxor xmm6,xmm11 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_five: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm14,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_four: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm14,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_three: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm14,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_two: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm14,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_one: - lea rcx,[r12] - lea rdx,[32+rbp] - lea r8,[r15] - call asm_AES_decrypt - pxor xmm14,XMMWORD[32+rbp] - movdqu XMMWORD[r13],xmm14 - movdqa xmm14,xmm15 - -$L$cbc_dec_done: - movdqu XMMWORD[rbx],xmm14 - lea rax,[rsp] - pxor xmm0,xmm0 -$L$cbc_dec_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$cbc_dec_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$cbc_dec_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$cbc_dec_epilogue: - DB 0F3h,0C3h ;repret - - - -global bsaes_ctr32_encrypt_blocks - -ALIGN 16 -bsaes_ctr32_encrypt_blocks: - - mov rax,rsp -$L$ctr_enc_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$ctr_enc_body: - mov rbp,rsp - - movdqu xmm0,XMMWORD[r10] - mov eax,DWORD[240+r9] - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - movdqa XMMWORD[32+rbp],xmm0 - cmp r8,8 - jb NEAR $L$ctr_enc_short - - mov ebx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,ebx - call _bsaes_key_convert - pxor xmm7,xmm6 - movdqa XMMWORD[rax],xmm7 - - movdqa xmm8,XMMWORD[rsp] - lea r11,[$L$ADD1] - movdqa xmm15,XMMWORD[32+rbp] - movdqa xmm7,XMMWORD[((-32))+r11] -DB 102,68,15,56,0,199 -DB 102,68,15,56,0,255 - movdqa XMMWORD[rsp],xmm8 - jmp NEAR $L$ctr_enc_loop -ALIGN 16 -$L$ctr_enc_loop: - movdqa XMMWORD[32+rbp],xmm15 - movdqa xmm0,xmm15 - movdqa xmm1,xmm15 - paddd xmm0,XMMWORD[r11] - movdqa xmm2,xmm15 - paddd xmm1,XMMWORD[16+r11] - movdqa xmm3,xmm15 - paddd xmm2,XMMWORD[32+r11] - movdqa xmm4,xmm15 - paddd xmm3,XMMWORD[48+r11] - movdqa xmm5,xmm15 - paddd xmm4,XMMWORD[64+r11] - movdqa xmm6,xmm15 - paddd xmm5,XMMWORD[80+r11] - paddd xmm6,XMMWORD[96+r11] - - - - movdqa xmm8,XMMWORD[rsp] - lea rax,[16+rsp] - movdqa xmm7,XMMWORD[((-16))+r11] - pxor xmm15,xmm8 - pxor xmm0,xmm8 - pxor xmm1,xmm8 - pxor xmm2,xmm8 -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,xmm8 - pxor xmm4,xmm8 -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,xmm8 - pxor xmm6,xmm8 -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - lea r11,[$L$BS0] - mov r10d,ebx - - call _bsaes_encrypt8_bitslice - - sub r14,8 - jc NEAR $L$ctr_enc_loop_done - - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - movdqu xmm9,XMMWORD[32+r12] - movdqu xmm10,XMMWORD[48+r12] - movdqu xmm11,XMMWORD[64+r12] - movdqu xmm12,XMMWORD[80+r12] - movdqu xmm13,XMMWORD[96+r12] - movdqu xmm14,XMMWORD[112+r12] - lea r12,[128+r12] - pxor xmm7,xmm15 - movdqa xmm15,XMMWORD[32+rbp] - pxor xmm0,xmm8 - movdqu XMMWORD[r13],xmm7 - pxor xmm3,xmm9 - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,xmm10 - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,xmm11 - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,xmm12 - movdqu XMMWORD[64+r13],xmm2 - pxor xmm1,xmm13 - movdqu XMMWORD[80+r13],xmm6 - pxor xmm4,xmm14 - movdqu XMMWORD[96+r13],xmm1 - lea r11,[$L$ADD1] - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - paddd xmm15,XMMWORD[112+r11] - jnz NEAR $L$ctr_enc_loop - - jmp NEAR $L$ctr_enc_done -ALIGN 16 -$L$ctr_enc_loop_done: - add r14,8 - movdqu xmm7,XMMWORD[r12] - pxor xmm15,xmm7 - movdqu XMMWORD[r13],xmm15 - cmp r14,2 - jb NEAR $L$ctr_enc_done - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm8 - movdqu XMMWORD[16+r13],xmm0 - je NEAR $L$ctr_enc_done - movdqu xmm9,XMMWORD[32+r12] - pxor xmm3,xmm9 - movdqu XMMWORD[32+r13],xmm3 - cmp r14,4 - jb NEAR $L$ctr_enc_done - movdqu xmm10,XMMWORD[48+r12] - pxor xmm5,xmm10 - movdqu XMMWORD[48+r13],xmm5 - je NEAR $L$ctr_enc_done - movdqu xmm11,XMMWORD[64+r12] - pxor xmm2,xmm11 - movdqu XMMWORD[64+r13],xmm2 - cmp r14,6 - jb NEAR $L$ctr_enc_done - movdqu xmm12,XMMWORD[80+r12] - pxor xmm6,xmm12 - movdqu XMMWORD[80+r13],xmm6 - je NEAR $L$ctr_enc_done - movdqu xmm13,XMMWORD[96+r12] - pxor xmm1,xmm13 - movdqu XMMWORD[96+r13],xmm1 - jmp NEAR $L$ctr_enc_done - -ALIGN 16 -$L$ctr_enc_short: - lea rcx,[32+rbp] - lea rdx,[48+rbp] - lea r8,[r15] - call asm_AES_encrypt - movdqu xmm0,XMMWORD[r12] - lea r12,[16+r12] - mov eax,DWORD[44+rbp] - bswap eax - pxor xmm0,XMMWORD[48+rbp] - inc eax - movdqu XMMWORD[r13],xmm0 - bswap eax - lea r13,[16+r13] - mov DWORD[44+rsp],eax - dec r14 - jnz NEAR $L$ctr_enc_short - -$L$ctr_enc_done: - lea rax,[rsp] - pxor xmm0,xmm0 -$L$ctr_enc_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$ctr_enc_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$ctr_enc_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$ctr_enc_epilogue: - DB 0F3h,0C3h ;repret - - -global bsaes_xts_encrypt - -ALIGN 16 -bsaes_xts_encrypt: - - mov rax,rsp -$L$xts_enc_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - mov r11,QWORD[168+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$xts_enc_body: - mov rbp,rsp - - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - - lea rcx,[r11] - lea rdx,[32+rbp] - lea r8,[r10] - call asm_AES_encrypt - - mov eax,DWORD[240+r15] - mov rbx,r14 - - mov edx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,edx - call _bsaes_key_convert - pxor xmm7,xmm6 - movdqa XMMWORD[rax],xmm7 - - and r14,-16 - sub rsp,0x80 - movdqa xmm6,XMMWORD[32+rbp] - - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - - sub r14,0x80 - jc NEAR $L$xts_enc_short - jmp NEAR $L$xts_enc_loop - -ALIGN 16 -$L$xts_enc_loop: - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqu xmm14,XMMWORD[112+r12] - lea r12,[128+r12] - movdqa XMMWORD[112+rsp],xmm6 - pxor xmm5,xmm13 - lea rax,[128+rsp] - pxor xmm6,xmm14 - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm2 - pxor xmm1,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - pxor xmm4,XMMWORD[112+rsp] - movdqu XMMWORD[96+r13],xmm1 - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - - movdqa xmm6,XMMWORD[112+rsp] - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - - sub r14,0x80 - jnc NEAR $L$xts_enc_loop - -$L$xts_enc_short: - add r14,0x80 - jz NEAR $L$xts_enc_done - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - cmp r14,16 - je NEAR $L$xts_enc_1 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - cmp r14,32 - je NEAR $L$xts_enc_2 - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - cmp r14,48 - je NEAR $L$xts_enc_3 - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - cmp r14,64 - je NEAR $L$xts_enc_4 - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - cmp r14,80 - je NEAR $L$xts_enc_5 - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - cmp r14,96 - je NEAR $L$xts_enc_6 - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqa XMMWORD[112+rsp],xmm6 - lea r12,[112+r12] - pxor xmm5,xmm13 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm2 - pxor xmm1,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm1 - lea r13,[112+r13] - - movdqa xmm6,XMMWORD[112+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_6: - pxor xmm3,xmm11 - lea r12,[96+r12] - pxor xmm4,xmm12 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm2 - movdqu XMMWORD[80+r13],xmm6 - lea r13,[96+r13] - - movdqa xmm6,XMMWORD[96+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_5: - pxor xmm2,xmm10 - lea r12,[80+r12] - pxor xmm3,xmm11 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - movdqu XMMWORD[64+r13],xmm2 - lea r13,[80+r13] - - movdqa xmm6,XMMWORD[80+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_4: - pxor xmm1,xmm9 - lea r12,[64+r12] - pxor xmm2,xmm10 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - movdqu XMMWORD[48+r13],xmm5 - lea r13,[64+r13] - - movdqa xmm6,XMMWORD[64+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_3: - pxor xmm0,xmm8 - lea r12,[48+r12] - pxor xmm1,xmm9 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm3 - lea r13,[48+r13] - - movdqa xmm6,XMMWORD[48+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_2: - pxor xmm15,xmm7 - lea r12,[32+r12] - pxor xmm0,xmm8 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - lea r13,[32+r13] - - movdqa xmm6,XMMWORD[32+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_1: - pxor xmm7,xmm15 - lea r12,[16+r12] - movdqa XMMWORD[32+rbp],xmm7 - lea rcx,[32+rbp] - lea rdx,[32+rbp] - lea r8,[r15] - call asm_AES_encrypt - pxor xmm15,XMMWORD[32+rbp] - - - - - - movdqu XMMWORD[r13],xmm15 - lea r13,[16+r13] - - movdqa xmm6,XMMWORD[16+rsp] - -$L$xts_enc_done: - and ebx,15 - jz NEAR $L$xts_enc_ret - mov rdx,r13 - -$L$xts_enc_steal: - movzx eax,BYTE[r12] - movzx ecx,BYTE[((-16))+rdx] - lea r12,[1+r12] - mov BYTE[((-16))+rdx],al - mov BYTE[rdx],cl - lea rdx,[1+rdx] - sub ebx,1 - jnz NEAR $L$xts_enc_steal - - movdqu xmm15,XMMWORD[((-16))+r13] - lea rcx,[32+rbp] - pxor xmm15,xmm6 - lea rdx,[32+rbp] - movdqa XMMWORD[32+rbp],xmm15 - lea r8,[r15] - call asm_AES_encrypt - pxor xmm6,XMMWORD[32+rbp] - movdqu XMMWORD[(-16)+r13],xmm6 - -$L$xts_enc_ret: - lea rax,[rsp] - pxor xmm0,xmm0 -$L$xts_enc_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$xts_enc_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$xts_enc_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$xts_enc_epilogue: - DB 0F3h,0C3h ;repret - - - -global bsaes_xts_decrypt - -ALIGN 16 -bsaes_xts_decrypt: - - mov rax,rsp -$L$xts_dec_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - mov r11,QWORD[168+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$xts_dec_body: - mov rbp,rsp - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - - lea rcx,[r11] - lea rdx,[32+rbp] - lea r8,[r10] - call asm_AES_encrypt - - mov eax,DWORD[240+r15] - mov rbx,r14 - - mov edx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,edx - call _bsaes_key_convert - pxor xmm7,XMMWORD[rsp] - movdqa XMMWORD[rax],xmm6 - movdqa XMMWORD[rsp],xmm7 - - xor eax,eax - and r14,-16 - test ebx,15 - setnz al - shl rax,4 - sub r14,rax - - sub rsp,0x80 - movdqa xmm6,XMMWORD[32+rbp] - - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - - sub r14,0x80 - jc NEAR $L$xts_dec_short - jmp NEAR $L$xts_dec_loop - -ALIGN 16 -$L$xts_dec_loop: - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqu xmm14,XMMWORD[112+r12] - lea r12,[128+r12] - movdqa XMMWORD[112+rsp],xmm6 - pxor xmm5,xmm13 - lea rax,[128+rsp] - pxor xmm6,xmm14 - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm1 - pxor xmm2,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - pxor xmm4,XMMWORD[112+rsp] - movdqu XMMWORD[96+r13],xmm2 - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - - movdqa xmm6,XMMWORD[112+rsp] - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - - sub r14,0x80 - jnc NEAR $L$xts_dec_loop - -$L$xts_dec_short: - add r14,0x80 - jz NEAR $L$xts_dec_done - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - cmp r14,16 - je NEAR $L$xts_dec_1 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - cmp r14,32 - je NEAR $L$xts_dec_2 - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - cmp r14,48 - je NEAR $L$xts_dec_3 - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - cmp r14,64 - je NEAR $L$xts_dec_4 - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - cmp r14,80 - je NEAR $L$xts_dec_5 - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - cmp r14,96 - je NEAR $L$xts_dec_6 - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqa XMMWORD[112+rsp],xmm6 - lea r12,[112+r12] - pxor xmm5,xmm13 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm1 - pxor xmm2,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm2 - lea r13,[112+r13] - - movdqa xmm6,XMMWORD[112+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_6: - pxor xmm3,xmm11 - lea r12,[96+r12] - pxor xmm4,xmm12 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - lea r13,[96+r13] - - movdqa xmm6,XMMWORD[96+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_5: - pxor xmm2,xmm10 - lea r12,[80+r12] - pxor xmm3,xmm11 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - lea r13,[80+r13] - - movdqa xmm6,XMMWORD[80+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_4: - pxor xmm1,xmm9 - lea r12,[64+r12] - pxor xmm2,xmm10 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - lea r13,[64+r13] - - movdqa xmm6,XMMWORD[64+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_3: - pxor xmm0,xmm8 - lea r12,[48+r12] - pxor xmm1,xmm9 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - lea r13,[48+r13] - - movdqa xmm6,XMMWORD[48+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_2: - pxor xmm15,xmm7 - lea r12,[32+r12] - pxor xmm0,xmm8 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - lea r13,[32+r13] - - movdqa xmm6,XMMWORD[32+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_1: - pxor xmm7,xmm15 - lea r12,[16+r12] - movdqa XMMWORD[32+rbp],xmm7 - lea rcx,[32+rbp] - lea rdx,[32+rbp] - lea r8,[r15] - call asm_AES_decrypt - pxor xmm15,XMMWORD[32+rbp] - - - - - - movdqu XMMWORD[r13],xmm15 - lea r13,[16+r13] - - movdqa xmm6,XMMWORD[16+rsp] - -$L$xts_dec_done: - and ebx,15 - jz NEAR $L$xts_dec_ret - - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - pshufd xmm13,xmm14,0x13 - movdqa xmm5,xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - movdqu xmm15,XMMWORD[r12] - pxor xmm6,xmm13 - - lea rcx,[32+rbp] - pxor xmm15,xmm6 - lea rdx,[32+rbp] - movdqa XMMWORD[32+rbp],xmm15 - lea r8,[r15] - call asm_AES_decrypt - pxor xmm6,XMMWORD[32+rbp] - mov rdx,r13 - movdqu XMMWORD[r13],xmm6 - -$L$xts_dec_steal: - movzx eax,BYTE[16+r12] - movzx ecx,BYTE[rdx] - lea r12,[1+r12] - mov BYTE[rdx],al - mov BYTE[16+rdx],cl - lea rdx,[1+rdx] - sub ebx,1 - jnz NEAR $L$xts_dec_steal - - movdqu xmm15,XMMWORD[r13] - lea rcx,[32+rbp] - pxor xmm15,xmm5 - lea rdx,[32+rbp] - movdqa XMMWORD[32+rbp],xmm15 - lea r8,[r15] - call asm_AES_decrypt - pxor xmm5,XMMWORD[32+rbp] - movdqu XMMWORD[r13],xmm5 - -$L$xts_dec_ret: - lea rax,[rsp] - pxor xmm0,xmm0 -$L$xts_dec_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$xts_dec_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$xts_dec_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$xts_dec_epilogue: - DB 0F3h,0C3h ;repret - - - -ALIGN 64 -_bsaes_const: -$L$M0ISR: - DQ 0x0a0e0206070b0f03,0x0004080c0d010509 -$L$ISRM0: - DQ 0x01040b0e0205080f,0x0306090c00070a0d -$L$ISR: - DQ 0x0504070602010003,0x0f0e0d0c080b0a09 -$L$BS0: - DQ 0x5555555555555555,0x5555555555555555 -$L$BS1: - DQ 0x3333333333333333,0x3333333333333333 -$L$BS2: - DQ 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f -$L$SR: - DQ 0x0504070600030201,0x0f0e0d0c0a09080b -$L$SRM0: - DQ 0x0304090e00050a0f,0x01060b0c0207080d -$L$M0SR: - DQ 0x0a0e02060f03070b,0x0004080c05090d01 -$L$SWPUP: - DQ 0x0706050403020100,0x0c0d0e0f0b0a0908 -$L$SWPUPM0SR: - DQ 0x0a0d02060c03070b,0x0004080f05090e01 -$L$ADD1: - DQ 0x0000000000000000,0x0000000100000000 -$L$ADD2: - DQ 0x0000000000000000,0x0000000200000000 -$L$ADD3: - DQ 0x0000000000000000,0x0000000300000000 -$L$ADD4: - DQ 0x0000000000000000,0x0000000400000000 -$L$ADD5: - DQ 0x0000000000000000,0x0000000500000000 -$L$ADD6: - DQ 0x0000000000000000,0x0000000600000000 -$L$ADD7: - DQ 0x0000000000000000,0x0000000700000000 -$L$ADD8: - DQ 0x0000000000000000,0x0000000800000000 -$L$xts_magic: - DD 0x87,0,1,0 -$L$masks: - DQ 0x0101010101010101,0x0101010101010101 - DQ 0x0202020202020202,0x0202020202020202 - DQ 0x0404040404040404,0x0404040404040404 - DQ 0x0808080808080808,0x0808080808080808 -$L$M0: - DQ 0x02060a0e03070b0f,0x0004080c0105090d -$L$63: - DQ 0x6363636363636363,0x6363636363636363 -DB 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102 -DB 111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44 -DB 32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44 -DB 32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32 -DB 65,110,100,121,32,80,111,108,121,97,107,111,118,0 -ALIGN 64 - -EXTERN __imp_RtlVirtualUnwind - -ALIGN 16 -se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - mov rsi,QWORD[8+r9] - mov r11,QWORD[56+r9] - - mov r10d,DWORD[r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jbe NEAR $L$in_prologue - - mov r10d,DWORD[4+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_prologue - - mov r10d,DWORD[8+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_tail - - mov rax,QWORD[160+r8] - - lea rsi,[64+rax] - lea rdi,[512+r8] - mov ecx,20 - DD 0xa548f3fc - lea rax,[((160+120))+rax] - -$L$in_tail: - mov rbp,QWORD[((-48))+rax] - mov rbx,QWORD[((-40))+rax] - mov r12,QWORD[((-32))+rax] - mov r13,QWORD[((-24))+rax] - mov r14,QWORD[((-16))+rax] - mov r15,QWORD[((-8))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_prologue: - mov QWORD[152+r8],rax - - mov rdi,QWORD[40+r9] - mov rsi,r8 - mov ecx,154 - DD 0xa548f3fc - - mov rsi,r9 - xor rcx,rcx - mov rdx,QWORD[8+rsi] - mov r8,QWORD[rsi] - mov r9,QWORD[16+rsi] - mov r10,QWORD[40+rsi] - lea r11,[56+rsi] - lea r12,[24+rsi] - mov QWORD[32+rsp],r10 - mov QWORD[40+rsp],r11 - mov QWORD[48+rsp],r12 - mov QWORD[56+rsp],rcx - call QWORD[__imp_RtlVirtualUnwind] - - mov eax,1 - add rsp,64 - popfq - pop r15 - pop r14 - pop r13 - pop r12 - pop rbp - pop rbx - pop rdi - pop rsi - DB 0F3h,0C3h ;repret - - -section .pdata rdata align=4 -ALIGN 4 - DD $L$cbc_dec_prologue wrt ..imagebase - DD $L$cbc_dec_epilogue wrt ..imagebase - DD $L$cbc_dec_info wrt ..imagebase - - DD $L$ctr_enc_prologue wrt ..imagebase - DD $L$ctr_enc_epilogue wrt ..imagebase - DD $L$ctr_enc_info wrt ..imagebase - - DD $L$xts_enc_prologue wrt ..imagebase - DD $L$xts_enc_epilogue wrt ..imagebase - DD $L$xts_enc_info wrt ..imagebase - - DD $L$xts_dec_prologue wrt ..imagebase - DD $L$xts_dec_epilogue wrt ..imagebase - DD $L$xts_dec_info wrt ..imagebase - -section .xdata rdata align=8 -ALIGN 8 -$L$cbc_dec_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$cbc_dec_body wrt ..imagebase,$L$cbc_dec_epilogue wrt ..imagebase - DD $L$cbc_dec_tail wrt ..imagebase - DD 0 -$L$ctr_enc_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$ctr_enc_body wrt ..imagebase,$L$ctr_enc_epilogue wrt ..imagebase - DD $L$ctr_enc_tail wrt ..imagebase - DD 0 -$L$xts_enc_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$xts_enc_body wrt ..imagebase,$L$xts_enc_epilogue wrt ..imagebase - DD $L$xts_enc_tail wrt ..imagebase - DD 0 -$L$xts_dec_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$xts_dec_body wrt ..imagebase,$L$xts_dec_epilogue wrt ..imagebase - DD $L$xts_dec_tail wrt ..imagebase - DD 0 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm index 603a8d17b870ab..a474c5d9a68c9f 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm @@ -39,7 +39,7 @@ $L$SEH_begin_rsaz_512_sqr: sub rsp,128+24 $L$sqr_body: - mov rbp,rdx +DB 102,72,15,110,202 mov rdx,QWORD[rsi] mov rax,QWORD[8+rsi] mov QWORD[128+rsp],rcx @@ -54,6 +54,7 @@ $L$oop_sqr: mov DWORD[((128+8))+rsp],r8d mov rbx,rdx + mov rbp,rax mul rdx mov r8,rax mov rax,QWORD[16+rsi] @@ -92,31 +93,29 @@ $L$oop_sqr: mul rbx add r14,rax mov rax,rbx - mov r15,rdx - adc r15,0 + adc rdx,0 + xor rcx,rcx add r8,r8 - mov rcx,r9 - adc r9,r9 + mov r15,rdx + adc rcx,0 mul rax - mov QWORD[rsp],rax - add r8,rdx - adc r9,0 + add rdx,r8 + adc rcx,0 - mov QWORD[8+rsp],r8 - shr rcx,63 + mov QWORD[rsp],rax + mov QWORD[8+rsp],rdx - mov r8,QWORD[8+rsi] mov rax,QWORD[16+rsi] - mul r8 + mul rbp add r10,rax mov rax,QWORD[24+rsi] mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r11,rax mov rax,QWORD[32+rsi] adc rdx,0 @@ -124,7 +123,7 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r12,rax mov rax,QWORD[40+rsi] adc rdx,0 @@ -132,7 +131,7 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r13,rax mov rax,QWORD[48+rsi] adc rdx,0 @@ -140,7 +139,7 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r14,rax mov rax,QWORD[56+rsi] adc rdx,0 @@ -148,39 +147,39 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r15,rax - mov rax,r8 + mov rax,rbp adc rdx,0 add r15,rbx - mov r8,rdx - mov rdx,r10 - adc r8,0 + adc rdx,0 - add rdx,rdx - lea r10,[r10*2+rcx] - mov rbx,r11 - adc r11,r11 + xor rbx,rbx + add r9,r9 + mov r8,rdx + adc r10,r10 + adc rbx,0 mul rax + + add rax,rcx + mov rbp,QWORD[16+rsi] add r9,rax + mov rax,QWORD[24+rsi] adc r10,rdx - adc r11,0 + adc rbx,0 mov QWORD[16+rsp],r9 mov QWORD[24+rsp],r10 - shr rbx,63 - mov r9,QWORD[16+rsi] - mov rax,QWORD[24+rsi] - mul r9 + mul rbp add r12,rax mov rax,QWORD[32+rsi] mov rcx,rdx adc rcx,0 - mul r9 + mul rbp add r13,rax mov rax,QWORD[40+rsi] adc rdx,0 @@ -188,7 +187,7 @@ $L$oop_sqr: mov rcx,rdx adc rcx,0 - mul r9 + mul rbp add r14,rax mov rax,QWORD[48+rsi] adc rdx,0 @@ -196,9 +195,7 @@ $L$oop_sqr: mov rcx,rdx adc rcx,0 - mul r9 - mov r10,r12 - lea r12,[r12*2+rbx] + mul rbp add r15,rax mov rax,QWORD[56+rsi] adc rdx,0 @@ -206,36 +203,40 @@ $L$oop_sqr: mov rcx,rdx adc rcx,0 - mul r9 - shr r10,63 + mul rbp add r8,rax - mov rax,r9 + mov rax,rbp adc rdx,0 add r8,rcx - mov r9,rdx - adc r9,0 + adc rdx,0 - mov rcx,r13 - lea r13,[r13*2+r10] + xor rcx,rcx + add r11,r11 + mov r9,rdx + adc r12,r12 + adc rcx,0 mul rax + + add rax,rbx + mov r10,QWORD[24+rsi] add r11,rax + mov rax,QWORD[32+rsi] adc r12,rdx - adc r13,0 + adc rcx,0 mov QWORD[32+rsp],r11 mov QWORD[40+rsp],r12 - shr rcx,63 - mov r10,QWORD[24+rsi] - mov rax,QWORD[32+rsi] + mov r11,rax mul r10 add r14,rax mov rax,QWORD[40+rsi] mov rbx,rdx adc rbx,0 + mov r12,rax mul r10 add r15,rax mov rax,QWORD[48+rsi] @@ -244,9 +245,8 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 + mov rbp,rax mul r10 - mov r12,r14 - lea r14,[r14*2+rcx] add r8,rax mov rax,QWORD[56+rsi] adc rdx,0 @@ -255,32 +255,33 @@ $L$oop_sqr: adc rbx,0 mul r10 - shr r12,63 add r9,rax mov rax,r10 adc rdx,0 add r9,rbx - mov r10,rdx - adc r10,0 + adc rdx,0 - mov rbx,r15 - lea r15,[r15*2+r12] + xor rbx,rbx + add r13,r13 + mov r10,rdx + adc r14,r14 + adc rbx,0 mul rax + + add rax,rcx add r13,rax + mov rax,r12 adc r14,rdx - adc r15,0 + adc rbx,0 mov QWORD[48+rsp],r13 mov QWORD[56+rsp],r14 - shr rbx,63 - mov r11,QWORD[32+rsi] - mov rax,QWORD[40+rsi] mul r11 add r8,rax - mov rax,QWORD[48+rsi] + mov rax,rbp mov rcx,rdx adc rcx,0 @@ -288,97 +289,99 @@ $L$oop_sqr: add r9,rax mov rax,QWORD[56+rsi] adc rdx,0 - mov r12,r8 - lea r8,[r8*2+rbx] add r9,rcx mov rcx,rdx adc rcx,0 + mov r14,rax mul r11 - shr r12,63 add r10,rax mov rax,r11 adc rdx,0 add r10,rcx - mov r11,rdx - adc r11,0 + adc rdx,0 - mov rcx,r9 - lea r9,[r9*2+r12] + xor rcx,rcx + add r15,r15 + mov r11,rdx + adc r8,r8 + adc rcx,0 mul rax + + add rax,rbx add r15,rax + mov rax,rbp adc r8,rdx - adc r9,0 + adc rcx,0 mov QWORD[64+rsp],r15 mov QWORD[72+rsp],r8 - shr rcx,63 - mov r12,QWORD[40+rsi] - mov rax,QWORD[48+rsi] mul r12 add r10,rax - mov rax,QWORD[56+rsi] + mov rax,r14 mov rbx,rdx adc rbx,0 mul r12 add r11,rax mov rax,r12 - mov r15,r10 - lea r10,[r10*2+rcx] adc rdx,0 - shr r15,63 add r11,rbx - mov r12,rdx - adc r12,0 + adc rdx,0 - mov rbx,r11 - lea r11,[r11*2+r15] + xor rbx,rbx + add r9,r9 + mov r12,rdx + adc r10,r10 + adc rbx,0 mul rax + + add rax,rcx add r9,rax + mov rax,r14 adc r10,rdx - adc r11,0 + adc rbx,0 mov QWORD[80+rsp],r9 mov QWORD[88+rsp],r10 - mov r13,QWORD[48+rsi] - mov rax,QWORD[56+rsi] - mul r13 + mul rbp add r12,rax - mov rax,r13 - mov r13,rdx - adc r13,0 + mov rax,rbp + adc rdx,0 - xor r14,r14 - shl rbx,1 + xor rcx,rcx + add r11,r11 + mov r13,rdx adc r12,r12 - adc r13,r13 - adc r14,r14 + adc rcx,0 mul rax + + add rax,rbx add r11,rax + mov rax,r14 adc r12,rdx - adc r13,0 + adc rcx,0 mov QWORD[96+rsp],r11 mov QWORD[104+rsp],r12 - mov rax,QWORD[56+rsi] - mul rax - add r13,rax - adc rdx,0 + xor rbx,rbx + add r13,r13 + adc rbx,0 - add r14,rdx + mul rax - mov QWORD[112+rsp],r13 - mov QWORD[120+rsp],r14 + add rax,rcx + add rax,r13 + adc rdx,rbx mov r8,QWORD[rsp] mov r9,QWORD[8+rsp] @@ -388,6 +391,10 @@ $L$oop_sqr: mov r13,QWORD[40+rsp] mov r14,QWORD[48+rsp] mov r15,QWORD[56+rsp] +DB 102,72,15,126,205 + + mov QWORD[112+rsp],rax + mov QWORD[120+rsp],rdx call __rsaz_512_reduce @@ -416,9 +423,9 @@ ALIGN 32 $L$oop_sqrx: mov DWORD[((128+8))+rsp],r8d DB 102,72,15,110,199 -DB 102,72,15,110,205 mulx r9,r8,rax + mov rbx,rax mulx r10,rcx,QWORD[16+rsi] xor rbp,rbp @@ -426,40 +433,39 @@ DB 102,72,15,110,205 mulx r11,rax,QWORD[24+rsi] adcx r9,rcx - mulx r12,rcx,QWORD[32+rsi] +DB 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcx r10,rax - mulx r13,rax,QWORD[40+rsi] +DB 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcx r11,rcx -DB 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulx r14,rcx,QWORD[48+rsi] adcx r12,rax adcx r13,rcx -DB 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulx r15,rax,QWORD[56+rsi] adcx r14,rax adcx r15,rbp - mov rcx,r9 - shld r9,r8,1 - shl r8,1 - - xor ebp,ebp - mulx rdx,rax,rdx - adcx r8,rdx - mov rdx,QWORD[8+rsi] - adcx r9,rbp + mulx rdi,rax,rdx + mov rdx,rbx + xor rcx,rcx + adox r8,r8 + adcx r8,rdi + adox rcx,rbp + adcx rcx,rbp mov QWORD[rsp],rax mov QWORD[8+rsp],r8 - mulx rbx,rax,QWORD[16+rsi] +DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adox r10,rax adcx r11,rbx -DB 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulx r8,rdi,QWORD[24+rsi] adox r11,rdi +DB 0x66 adcx r12,r8 mulx rbx,rax,QWORD[32+rsi] @@ -477,24 +483,25 @@ DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00 DB 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adox r15,rdi adcx r8,rbp + mulx rdi,rax,rdx adox r8,rbp +DB 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - mov rbx,r11 - shld r11,r10,1 - shld r10,rcx,1 + xor rbx,rbx + adox r9,r9 - xor ebp,ebp - mulx rcx,rax,rdx - mov rdx,QWORD[16+rsi] + adcx rax,rcx + adox r10,r10 adcx r9,rax - adcx r10,rcx - adcx r11,rbp + adox rbx,rbp + adcx r10,rdi + adcx rbx,rbp mov QWORD[16+rsp],r9 DB 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -DB 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulx r9,rdi,QWORD[24+rsi] adox r12,rdi adcx r13,r9 @@ -502,7 +509,7 @@ DB 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 adox r13,rax adcx r14,rcx - mulx r9,rdi,QWORD[40+rsi] +DB 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adox r14,rdi adcx r15,r9 @@ -510,27 +517,28 @@ DB 0xc4,0xe2,0xfb,0xf6,0x8e,0x30,0x00,0x00,0x00 adox r15,rax adcx r8,rcx -DB 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulx r9,rdi,QWORD[56+rsi] adox r8,rdi adcx r9,rbp + mulx rdi,rax,rdx adox r9,rbp + mov rdx,QWORD[24+rsi] - mov rcx,r13 - shld r13,r12,1 - shld r12,rbx,1 + xor rcx,rcx + adox r11,r11 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rbx + adox r12,r12 adcx r11,rax - adcx r12,rdx - mov rdx,QWORD[24+rsi] - adcx r13,rbp + adox rcx,rbp + adcx r12,rdi + adcx rcx,rbp mov QWORD[32+rsp],r11 -DB 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + mov QWORD[40+rsp],r12 -DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulx rbx,rax,QWORD[32+rsi] adox r14,rax adcx r15,rbx @@ -545,25 +553,25 @@ DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 mulx r10,rdi,QWORD[56+rsi] adox r9,rdi adcx r10,rbp + mulx rdi,rax,rdx adox r10,rbp + mov rdx,QWORD[32+rsi] -DB 0x66 - mov rbx,r15 - shld r15,r14,1 - shld r14,rcx,1 + xor rbx,rbx + adox r13,r13 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rcx + adox r14,r14 adcx r13,rax - adcx r14,rdx - mov rdx,QWORD[32+rsi] - adcx r15,rbp + adox rbx,rbp + adcx r14,rdi + adcx rbx,rbp mov QWORD[48+rsp],r13 mov QWORD[56+rsp],r14 -DB 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulx r11,rdi,QWORD[40+rsi] adox r8,rdi adcx r9,r11 @@ -574,18 +582,19 @@ DB 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 mulx r11,rdi,QWORD[56+rsi] adox r10,rdi adcx r11,rbp + mulx rdi,rax,rdx + mov rdx,QWORD[40+rsi] adox r11,rbp - mov rcx,r9 - shld r9,r8,1 - shld r8,rbx,1 + xor rcx,rcx + adox r15,r15 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rbx + adox r8,r8 adcx r15,rax - adcx r8,rdx - mov rdx,QWORD[40+rsi] - adcx r9,rbp + adox rcx,rbp + adcx r8,rdi + adcx rcx,rbp mov QWORD[64+rsp],r15 mov QWORD[72+rsp],r8 @@ -598,18 +607,19 @@ DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00 DB 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adox r11,rdi adcx r12,rbp + mulx rdi,rax,rdx adox r12,rbp + mov rdx,QWORD[48+rsi] - mov rbx,r11 - shld r11,r10,1 - shld r10,rcx,1 + xor rbx,rbx + adox r9,r9 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rcx + adox r10,r10 adcx r9,rax - adcx r10,rdx - mov rdx,QWORD[48+rsi] - adcx r11,rbp + adcx r10,rdi + adox rbx,rbp + adcx rbx,rbp mov QWORD[80+rsp],r9 mov QWORD[88+rsp],r10 @@ -619,31 +629,31 @@ DB 0xc4,0x62,0xfb,0xf6,0xae,0x38,0x00,0x00,0x00 adox r12,rax adox r13,rbp - xor r14,r14 - shld r14,r13,1 - shld r13,r12,1 - shld r12,rbx,1 + mulx rdi,rax,rdx + xor rcx,rcx + mov rdx,QWORD[56+rsi] + adox r11,r11 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rbx + adox r12,r12 adcx r11,rax - adcx r12,rdx - mov rdx,QWORD[56+rsi] - adcx r13,rbp + adox rcx,rbp + adcx r12,rdi + adcx rcx,rbp DB 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 DB 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulx rdx,rax,rdx - adox r13,rax - adox rdx,rbp + xor rbx,rbx + adox r13,r13 -DB 0x66 - add r14,rdx + adcx rax,rcx + adox rbx,rbp + adcx rax,r13 + adcx rbx,rdx - mov QWORD[112+rsp],r13 - mov QWORD[120+rsp],r14 DB 102,72,15,126,199 DB 102,72,15,126,205 @@ -657,6 +667,9 @@ DB 102,72,15,126,205 mov r14,QWORD[48+rsp] mov r15,QWORD[56+rsp] + mov QWORD[112+rsp],rax + mov QWORD[120+rsp],rbx + call __rsaz_512_reducex add r8,QWORD[64+rsp] @@ -1502,6 +1515,7 @@ $L$SEH_end_rsaz_512_mul_by_one: ALIGN 32 __rsaz_512_reduce: + mov rbx,r8 imul rbx,QWORD[((128+8))+rsp] mov rax,QWORD[rbp] @@ -1583,9 +1597,11 @@ $L$reduction_loop: DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_reducex: + imul rdx,r8 xor rsi,rsi mov ecx,8 @@ -1639,8 +1655,10 @@ DB 0xc4,0x62,0xfb,0xf6,0xb5,0x30,0x00,0x00,0x00 DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_subtract: + mov QWORD[rdi],r8 mov QWORD[8+rdi],r9 mov QWORD[16+rdi],r10 @@ -1696,8 +1714,10 @@ __rsaz_512_subtract: DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_mul: + lea rdi,[8+rsp] mov rax,QWORD[rsi] @@ -1838,8 +1858,10 @@ $L$oop_mul: DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_mulx: + mulx r8,rbx,QWORD[rsi] mov rcx,-6 @@ -1957,10 +1979,12 @@ DB 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 DB 0F3h,0C3h ;repret + global rsaz_512_scatter4 ALIGN 16 rsaz_512_scatter4: + lea rcx,[r8*8+rcx] mov r9d,8 jmp NEAR $L$oop_scatter @@ -1975,10 +1999,12 @@ $L$oop_scatter: DB 0F3h,0C3h ;repret + global rsaz_512_gather4 ALIGN 16 rsaz_512_gather4: + $L$SEH_begin_rsaz_512_gather4: DB 0x48,0x81,0xec,0xa8,0x00,0x00,0x00 DB 0x0f,0x29,0x34,0x24 @@ -2067,6 +2093,7 @@ $L$oop_gather: $L$SEH_end_rsaz_512_gather4: + ALIGN 64 $L$inc: DD 0,0,1,1 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm index 81570ab2060e9b..0756714904eaad 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm @@ -583,6 +583,7 @@ $L$SEH_end_bn_mul4x_mont_gather5: ALIGN 32 mul4x_internal: + shl r9,5 movd xmm5,DWORD[56+rax] lea rax,[$L$inc] @@ -1105,6 +1106,7 @@ $L$inner4x: mov r15,QWORD[24+rbp] jmp NEAR $L$sqr4x_sub_entry + global bn_power5 ALIGN 32 @@ -1331,6 +1333,7 @@ __bn_sqr8x_internal: + lea rbp,[32+r10] @@ -2036,8 +2039,10 @@ DB 102,73,15,126,217 DB 0F3h,0C3h ;repret + ALIGN 32 __bn_post4x_internal: + mov r12,QWORD[rbp] lea rbx,[r9*1+rdi] mov rcx,r9 @@ -2089,10 +2094,12 @@ $L$sqr4x_sub_entry: neg r9 DB 0F3h,0C3h ;repret + global bn_from_montgomery ALIGN 32 bn_from_montgomery: + test DWORD[48+rsp],7 jz NEAR bn_from_mont8x xor eax,eax @@ -2100,6 +2107,7 @@ bn_from_montgomery: + ALIGN 32 bn_from_mont8x: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -2408,6 +2416,7 @@ $L$SEH_end_bn_mulx4x_mont_gather5: ALIGN 32 mulx4x_internal: + mov QWORD[8+rsp],r9 mov r10,r9 neg r9 @@ -2828,6 +2837,7 @@ $L$mulx4x_inner: jmp NEAR $L$sqrx4x_sub_entry + ALIGN 32 bn_powerx5: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -3598,6 +3608,7 @@ DB 102,72,15,126,213 ALIGN 32 __bn_postx4x_internal: + mov r12,QWORD[rbp] mov r10,rcx mov r9,rcx @@ -3646,10 +3657,12 @@ $L$sqrx4x_sub_entry: DB 0F3h,0C3h ;repret + global bn_get_bits5 ALIGN 16 bn_get_bits5: + lea r10,[rcx] lea r11,[1+rcx] mov ecx,edx @@ -3665,10 +3678,12 @@ bn_get_bits5: DB 0F3h,0C3h ;repret + global bn_scatter5 ALIGN 16 bn_scatter5: + cmp edx,0 jz NEAR $L$scatter_epilogue lea r8,[r9*8+r8] @@ -3683,12 +3698,14 @@ $L$scatter_epilogue: DB 0F3h,0C3h ;repret + global bn_gather5 ALIGN 32 bn_gather5: $L$SEH_begin_bn_gather5: + DB 0x4c,0x8d,0x14,0x24 DB 0x48,0x81,0xec,0x08,0x01,0x00,0x00 lea rax,[$L$inc] @@ -3846,6 +3863,7 @@ $L$gather: DB 0F3h,0C3h ;repret $L$SEH_end_bn_gather5: + ALIGN 64 $L$inc: DD 0,0,1,1 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h index eba30a9c2857ac..eee9e84f1825ed 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Fri Sep 13 16:02:58 2019 UTC" +#define DATE "built on: Wed Mar 18 21:10:25 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm index 7a0f351e51fc54..4cf1d322acc9d1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm @@ -10,6 +10,7 @@ global Camellia_EncryptBlock ALIGN 16 Camellia_EncryptBlock: + mov eax,128 sub eax,ecx mov ecx,3 @@ -17,6 +18,7 @@ Camellia_EncryptBlock: jmp NEAR $L$enc_rounds + global Camellia_EncryptBlock_Rounds ALIGN 16 @@ -95,6 +97,7 @@ $L$SEH_end_Camellia_EncryptBlock_Rounds: ALIGN 16 _x86_64_Camellia_encrypt: + xor r9d,DWORD[r14] xor r8d,DWORD[4+r14] xor r11d,DWORD[8+r14] @@ -300,10 +303,12 @@ DB 0xf3,0xc3 + global Camellia_DecryptBlock ALIGN 16 Camellia_DecryptBlock: + mov eax,128 sub eax,ecx mov ecx,3 @@ -311,6 +316,7 @@ Camellia_DecryptBlock: jmp NEAR $L$dec_rounds + global Camellia_DecryptBlock_Rounds ALIGN 16 @@ -389,6 +395,7 @@ $L$SEH_end_Camellia_DecryptBlock_Rounds: ALIGN 16 _x86_64_Camellia_decrypt: + xor r9d,DWORD[r14] xor r8d,DWORD[4+r14] xor r11d,DWORD[8+r14] @@ -593,6 +600,7 @@ $L$ddone: DB 0xf3,0xc3 + global Camellia_Ekeygen ALIGN 16 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm index c87f73a8aaee06..9930dadce66880 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm @@ -3958,10 +3958,12 @@ $L$SEH_begin_ecp_nistz256_to_mont: mov rsi,rdx + mov ecx,0x80100 and ecx,DWORD[((OPENSSL_ia32cap_P+8))] lea rdx,[$L$RR] jmp NEAR $L$mul_mont + $L$SEH_end_ecp_nistz256_to_mont: @@ -4922,6 +4924,7 @@ global ecp_nistz256_scatter_w5 ALIGN 32 ecp_nistz256_scatter_w5: + lea r8d,[((-3))+r8*2+r8] movdqa xmm0,XMMWORD[rdx] shl r8d,5 @@ -4942,6 +4945,7 @@ ecp_nistz256_scatter_w5: + global ecp_nistz256_gather_w5 ALIGN 32 @@ -5035,6 +5039,7 @@ global ecp_nistz256_scatter_w7 ALIGN 32 ecp_nistz256_scatter_w7: + movdqu xmm0,XMMWORD[rdx] shl r8d,6 movdqu xmm1,XMMWORD[16+rdx] @@ -5050,6 +5055,7 @@ ecp_nistz256_scatter_w7: + global ecp_nistz256_gather_w7 ALIGN 32 @@ -5861,26 +5867,16 @@ DB 102,73,15,110,220 or r12,r8 or r12,r9 -DB 0x3e - jnz NEAR $L$add_proceedq DB 102,73,15,126,208 DB 102,73,15,126,217 - test r8,r8 - jnz NEAR $L$add_proceedq - test r9,r9 - jz NEAR $L$add_doubleq -DB 102,72,15,126,199 - pxor xmm0,xmm0 - movdqu XMMWORD[rdi],xmm0 - movdqu XMMWORD[16+rdi],xmm0 - movdqu XMMWORD[32+rdi],xmm0 - movdqu XMMWORD[48+rdi],xmm0 - movdqu XMMWORD[64+rdi],xmm0 - movdqu XMMWORD[80+rdi],xmm0 - jmp NEAR $L$add_doneq + or r12,r8 + or r12,r9 + + +DB 0x3e + jnz NEAR $L$add_proceedq -ALIGN 32 $L$add_doubleq: DB 102,72,15,126,206 DB 102,72,15,126,199 @@ -6994,26 +6990,16 @@ DB 102,73,15,110,220 or r12,r8 or r12,r9 -DB 0x3e - jnz NEAR $L$add_proceedx DB 102,73,15,126,208 DB 102,73,15,126,217 - test r8,r8 - jnz NEAR $L$add_proceedx - test r9,r9 - jz NEAR $L$add_doublex -DB 102,72,15,126,199 - pxor xmm0,xmm0 - movdqu XMMWORD[rdi],xmm0 - movdqu XMMWORD[16+rdi],xmm0 - movdqu XMMWORD[32+rdi],xmm0 - movdqu XMMWORD[48+rdi],xmm0 - movdqu XMMWORD[64+rdi],xmm0 - movdqu XMMWORD[80+rdi],xmm0 - jmp NEAR $L$add_donex + or r12,r8 + or r12,r9 + + +DB 0x3e + jnz NEAR $L$add_proceedx -ALIGN 32 $L$add_doublex: DB 102,72,15,126,206 DB 102,72,15,126,199 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm index 84d55134ac746b..d6c6312363e0fc 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm @@ -414,6 +414,7 @@ global x25519_fe64_eligible ALIGN 32 x25519_fe64_eligible: + mov ecx,DWORD[((OPENSSL_ia32cap_P+8))] xor eax,eax and ecx,0x80100 @@ -422,6 +423,7 @@ x25519_fe64_eligible: DB 0F3h,0C3h ;repret + global x25519_fe64_mul ALIGN 32 @@ -675,6 +677,7 @@ $L$SEH_begin_x25519_fe64_mul121666: $L$fe64_mul121666_body: + mov edx,121666 mulx rcx,r8,QWORD[rsi] mulx rax,r9,QWORD[8+rsi] @@ -705,6 +708,7 @@ $L$fe64_mul121666_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_mul121666: global x25519_fe64_add @@ -721,6 +725,7 @@ $L$SEH_begin_x25519_fe64_add: $L$fe64_add_body: + mov r8,QWORD[rsi] mov r9,QWORD[8+rsi] mov r10,QWORD[16+rsi] @@ -751,6 +756,7 @@ $L$fe64_add_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_add: global x25519_fe64_sub @@ -767,6 +773,7 @@ $L$SEH_begin_x25519_fe64_sub: $L$fe64_sub_body: + mov r8,QWORD[rsi] mov r9,QWORD[8+rsi] mov r10,QWORD[16+rsi] @@ -797,6 +804,7 @@ $L$fe64_sub_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_sub: global x25519_fe64_tobytes @@ -812,6 +820,7 @@ $L$SEH_begin_x25519_fe64_tobytes: $L$fe64_to_body: + mov r8,QWORD[rsi] mov r9,QWORD[8+rsi] mov r10,QWORD[16+rsi] @@ -849,6 +858,7 @@ $L$fe64_to_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_tobytes: DB 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101 DB 115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h index d803b518584f2e..dab67d1b37ae72 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h index c3b41df01e40a3..0c96ce73633dac 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_WIN32 # define DSO_EXTENSION ".dll" #endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm index b1d83324575b69..9fba32b883a6ba 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm @@ -8,6 +8,7 @@ section .text code align=64 ALIGN 32 _aesni_ctr32_ghash_6x: + vmovdqu xmm2,XMMWORD[32+r11] sub rdx,6 vpxor xmm4,xmm4,xmm4 @@ -316,6 +317,7 @@ $L$6x_done: DB 0F3h,0C3h ;repret + global aesni_gcm_decrypt ALIGN 32 @@ -457,6 +459,7 @@ $L$SEH_end_aesni_gcm_decrypt: ALIGN 32 _aesni_ctr32_6x: + vmovdqu xmm4,XMMWORD[((0-128))+rcx] vmovdqu xmm2,XMMWORD[32+r11] lea r13,[((-1))+rbp] @@ -545,6 +548,7 @@ $L$handle_ctr32_2: jmp NEAR $L$oop_ctr32 + global aesni_gcm_encrypt ALIGN 32 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm index 5717654508c112..6f688b63e0990a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm @@ -26,6 +26,7 @@ $L$SEH_begin_poly1305_init: mov rdx,r8 + xor rax,rax mov QWORD[rdi],rax mov QWORD[8+rdi],rax @@ -63,6 +64,7 @@ $L$no_key: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_init: @@ -198,6 +200,7 @@ $L$SEH_begin_poly1305_emit: mov rdx,r8 + $L$emit: mov r8,QWORD[rdi] mov r9,QWORD[8+rdi] @@ -220,10 +223,12 @@ $L$emit: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_emit: ALIGN 32 __poly1305_block: + mul r14 mov r9,rax mov rax,r11 @@ -266,8 +271,10 @@ __poly1305_block: + ALIGN 32 __poly1305_init_avx: + mov r14,r11 mov rbx,r12 xor rbp,rbp @@ -428,6 +435,7 @@ __poly1305_init_avx: + ALIGN 32 poly1305_blocks_avx: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -1296,6 +1304,7 @@ $L$SEH_begin_poly1305_emit_avx: mov rdx,r8 + cmp DWORD[20+rdi],0 je NEAR $L$emit @@ -1348,6 +1357,7 @@ $L$SEH_begin_poly1305_emit_avx: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_emit_avx: ALIGN 32 @@ -2607,6 +2617,7 @@ $L$SEH_begin_poly1305_init_base2_44: mov rdx,r8 + xor rax,rax mov QWORD[rdi],rax mov QWORD[8+rdi],rax @@ -2642,6 +2653,7 @@ $L$init_base2_44: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_init_base2_44: ALIGN 32 @@ -2656,6 +2668,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52: mov rcx,r9 + shr rdx,4 jz NEAR $L$no_data_vpmadd52 @@ -2764,6 +2777,7 @@ $L$no_data_vpmadd52: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_blocks_vpmadd52: ALIGN 32 @@ -2778,6 +2792,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_4x: mov rcx,r9 + shr rdx,4 jz NEAR $L$no_data_vpmadd52_4x @@ -3204,6 +3219,7 @@ $L$no_data_vpmadd52_4x: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_blocks_vpmadd52_4x: ALIGN 32 @@ -3218,6 +3234,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_8x: mov rcx,r9 + shr rdx,4 jz NEAR $L$no_data_vpmadd52_8x @@ -3560,6 +3577,7 @@ $L$no_data_vpmadd52_8x: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_blocks_vpmadd52_8x: ALIGN 32 @@ -3573,6 +3591,7 @@ $L$SEH_begin_poly1305_emit_base2_44: mov rdx,r8 + mov r8,QWORD[rdi] mov r9,QWORD[8+rdi] mov r10,QWORD[16+rdi] @@ -3605,6 +3624,7 @@ $L$SEH_begin_poly1305_emit_base2_44: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_emit_base2_44: ALIGN 64 $L$const: @@ -3646,6 +3666,7 @@ global xor128_encrypt_n_pad ALIGN 16 xor128_encrypt_n_pad: + sub rdx,r8 sub rcx,r8 mov r10,r9 @@ -3689,10 +3710,12 @@ $L$done_enc: DB 0F3h,0C3h ;repret + global xor128_decrypt_n_pad ALIGN 16 xor128_decrypt_n_pad: + sub rdx,r8 sub rcx,r8 mov r10,r9 @@ -3739,6 +3762,7 @@ $L$done_dec: mov rax,r8 DB 0F3h,0C3h ;repret + EXTERN __imp_RtlVirtualUnwind ALIGN 16 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm index 5732b40ed64f3f..edbcc06e34b673 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm @@ -19,13 +19,14 @@ $L$SEH_begin_RC4: mov rdx,r8 mov rcx,r9 + + or rsi,rsi jne NEAR $L$entry mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret $L$entry: - push rbx push r12 @@ -558,6 +559,7 @@ $L$SEH_begin_RC4_set_key: mov rdx,r8 + lea rdi,[8+rdi] lea rdx,[rsi*1+rdx] neg rsi @@ -626,12 +628,14 @@ $L$exit_key: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_RC4_set_key: global RC4_options ALIGN 16 RC4_options: + lea rax,[$L$opts] mov edx,DWORD[OPENSSL_ia32cap_P] bt edx,20 @@ -644,6 +648,7 @@ $L$8xchar: add rax,12 $L$done: DB 0F3h,0C3h ;repret + ALIGN 64 $L$opts: DB 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm index d0471cb3b3e8c0..fdab35d95c2f29 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm @@ -8,6 +8,7 @@ section .text code align=64 ALIGN 32 __KeccakF1600: + mov rax,QWORD[60+rdi] mov rbx,QWORD[68+rdi] mov rcx,QWORD[76+rdi] @@ -263,6 +264,7 @@ $L$oop: + ALIGN 32 KeccakF1600: diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm index d796380ae8e82e..1b60a7ce75cae0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm @@ -1458,10 +1458,10 @@ DB 102,15,56,0,251 movaps xmm9,XMMWORD[((-8-16))+rax] mov rsp,rax $L$epilogue_shaext: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_sha1_block_data_order_shaext: ALIGN 16 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm index fc102444ff49ff..9ff3cbb92b5df1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm @@ -1804,6 +1804,7 @@ $L$SEH_begin_sha256_block_data_order_shaext: _shaext_shortcut: + lea rsp,[((-88))+rsp] movaps XMMWORD[(-8-80)+rax],xmm6 movaps XMMWORD[(-8-64)+rax],xmm7 @@ -2022,6 +2023,7 @@ $L$epilogue_shaext: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_sha256_block_data_order_shaext: ALIGN 64 @@ -5476,6 +5478,8 @@ $L$ower_avx2: lea rsp,[448+rsp] + + add eax,DWORD[rdi] add ebx,DWORD[4+rdi] add ecx,DWORD[8+rdi] @@ -5501,15 +5505,17 @@ $L$ower_avx2: jbe NEAR $L$oop_avx2 lea rbp,[rsp] + + + $L$done_avx2: - lea rsp,[rbp] - mov rsi,QWORD[88+rsp] + mov rsi,QWORD[88+rbp] vzeroupper - movaps xmm6,XMMWORD[((64+32))+rsp] - movaps xmm7,XMMWORD[((64+48))+rsp] - movaps xmm8,XMMWORD[((64+64))+rsp] - movaps xmm9,XMMWORD[((64+80))+rsp] + movaps xmm6,XMMWORD[((64+32))+rbp] + movaps xmm7,XMMWORD[((64+48))+rbp] + movaps xmm8,XMMWORD[((64+64))+rbp] + movaps xmm9,XMMWORD[((64+80))+rbp] mov r15,QWORD[((-48))+rsi] mov r14,QWORD[((-40))+rsi] diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm index 1a9935d7b6ffc2..fc2269c8435930 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm @@ -5468,6 +5468,8 @@ $L$ower_avx2: lea rsp,[1152+rsp] + + add rax,QWORD[rdi] add rbx,QWORD[8+rdi] add rcx,QWORD[16+rdi] @@ -5493,17 +5495,19 @@ $L$ower_avx2: jbe NEAR $L$oop_avx2 lea rbp,[rsp] + + + $L$done_avx2: - lea rsp,[rbp] - mov rsi,QWORD[152+rsp] + mov rsi,QWORD[152+rbp] vzeroupper - movaps xmm6,XMMWORD[((128+32))+rsp] - movaps xmm7,XMMWORD[((128+48))+rsp] - movaps xmm8,XMMWORD[((128+64))+rsp] - movaps xmm9,XMMWORD[((128+80))+rsp] - movaps xmm10,XMMWORD[((128+96))+rsp] - movaps xmm11,XMMWORD[((128+112))+rsp] + movaps xmm6,XMMWORD[((128+32))+rbp] + movaps xmm7,XMMWORD[((128+48))+rbp] + movaps xmm8,XMMWORD[((128+64))+rbp] + movaps xmm9,XMMWORD[((128+80))+rbp] + movaps xmm10,XMMWORD[((128+96))+rbp] + movaps xmm11,XMMWORD[((128+112))+rbp] mov r15,QWORD[((-48))+rsi] mov r14,QWORD[((-40))+rsi] diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm index e2fec12d2211bf..f57d3210fc935f 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm @@ -17,6 +17,7 @@ global OPENSSL_atomic_add ALIGN 16 OPENSSL_atomic_add: + mov eax,DWORD[rcx] $L$spin: lea r8,[rax*1+rdx] DB 0xf0 @@ -27,16 +28,19 @@ DB 0x48,0x98 DB 0F3h,0C3h ;repret + global OPENSSL_rdtsc ALIGN 16 OPENSSL_rdtsc: + rdtsc shl rdx,32 or rax,rdx DB 0F3h,0C3h ;repret + global OPENSSL_ia32_cpuid ALIGN 16 @@ -219,6 +223,7 @@ global OPENSSL_cleanse ALIGN 16 OPENSSL_cleanse: + xor rax,rax cmp rdx,15 jae NEAR $L$ot @@ -250,10 +255,12 @@ $L$aligned: DB 0F3h,0C3h ;repret + global CRYPTO_memcmp ALIGN 16 CRYPTO_memcmp: + xor rax,rax xor r10,r10 cmp r8,0 @@ -283,6 +290,7 @@ $L$oop_cmp: $L$no_data: DB 0F3h,0C3h ;repret + global OPENSSL_wipe_cpu ALIGN 16 @@ -306,6 +314,7 @@ global OPENSSL_instrument_bus ALIGN 16 OPENSSL_instrument_bus: + mov r10,rcx mov rcx,rdx mov r11,rdx @@ -334,10 +343,12 @@ DB 0xf0 DB 0F3h,0C3h ;repret + global OPENSSL_instrument_bus2 ALIGN 16 OPENSSL_instrument_bus2: + mov r10,rcx mov rcx,rdx mov r11,r8 @@ -381,10 +392,12 @@ $L$done2: sub rax,rcx DB 0F3h,0C3h ;repret + global OPENSSL_ia32_rdrand_bytes ALIGN 16 OPENSSL_ia32_rdrand_bytes: + xor rax,rax cmp rdx,0 je NEAR $L$done_rdrand_bytes @@ -422,10 +435,12 @@ $L$done_rdrand_bytes: xor r10,r10 DB 0F3h,0C3h ;repret + global OPENSSL_ia32_rdseed_bytes ALIGN 16 OPENSSL_ia32_rdseed_bytes: + xor rax,rax cmp rdx,0 je NEAR $L$done_rdseed_bytes diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h index c4bc935b0a25d2..de662de12be0f1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi index 2d20ac387916a0..91ad847952bcc6 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi @@ -20,6 +20,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi index 20ef5e5d4b3a08..5ddf062b390fc7 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi @@ -727,6 +727,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm index 1a22e6b6ed13c0..a95fc8411c77fe 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm @@ -54,13 +54,13 @@ our %config = ( export_var_as_fn => "1", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_WIN64A" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -116,8 +116,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN64A", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -133,7 +133,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x562305dbe5d8)", + RANLIB => "CODE(0x55c8e9449798)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s", @@ -259,6 +259,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -376,8 +377,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -645,14 +646,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -728,6 +721,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1525,6 +1526,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3266,7 +3273,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3274,6 +3280,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3767,14 +3774,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4215,6 +4214,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4924,49 +4931,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4976,25 +4975,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -5012,13 +5007,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5032,613 +5025,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5656,188 +5547,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5847,19 +5707,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5885,31 +5742,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5919,37 +5771,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5959,31 +5805,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -6001,278 +5842,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6282,301 +6077,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6584,7 +6329,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6592,7 +6336,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6600,7 +6343,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6608,7 +6350,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6616,7 +6357,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6624,163 +6364,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6798,241 +6511,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7040,21 +6713,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7062,13 +6732,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7076,81 +6744,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7158,328 +6813,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7489,91 +7083,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7592,7 +7171,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7602,361 +7180,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7978,265 +7496,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8246,31 +7720,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8280,7 +7749,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8294,7 +7762,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8312,19 +7779,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8338,7 +7802,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8356,13 +7819,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8388,727 +7849,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9159,6 +8499,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9403,7 +8751,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9729,7 +9076,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9775,7 +9121,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9841,7 +9186,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9866,7 +9210,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9964,7 +9307,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -10014,18 +9356,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10036,6 +9375,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10099,10 +9442,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10131,6 +9470,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10395,6 +9738,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15378,7 +14722,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15386,6 +14729,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15613,6 +14957,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15715,10 +15067,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15747,6 +15095,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aes-x86_64.asm deleted file mode 100644 index c01e41b30164db..00000000000000 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aes-x86_64.asm +++ /dev/null @@ -1,2960 +0,0 @@ -default rel -%define XMMWORD -%define YMMWORD -%define ZMMWORD -section .text code align=64 - - -ALIGN 16 -_x86_64_AES_encrypt: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - - mov r13d,DWORD[240+r15] - sub r13d,1 - jmp NEAR $L$enc_loop -ALIGN 16 -$L$enc_loop: - - movzx esi,al - movzx edi,bl - movzx ebp,cl - mov r10d,DWORD[rsi*8+r14] - mov r11d,DWORD[rdi*8+r14] - mov r12d,DWORD[rbp*8+r14] - - movzx esi,bh - movzx edi,ch - movzx ebp,dl - xor r10d,DWORD[3+rsi*8+r14] - xor r11d,DWORD[3+rdi*8+r14] - mov r8d,DWORD[rbp*8+r14] - - movzx esi,dh - shr ecx,16 - movzx ebp,ah - xor r12d,DWORD[3+rsi*8+r14] - shr edx,16 - xor r8d,DWORD[3+rbp*8+r14] - - shr ebx,16 - lea r15,[16+r15] - shr eax,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - xor r10d,DWORD[2+rsi*8+r14] - xor r11d,DWORD[2+rdi*8+r14] - xor r12d,DWORD[2+rbp*8+r14] - - movzx esi,dh - movzx edi,ah - movzx ebp,bl - xor r10d,DWORD[1+rsi*8+r14] - xor r11d,DWORD[1+rdi*8+r14] - xor r8d,DWORD[2+rbp*8+r14] - - mov edx,DWORD[12+r15] - movzx edi,bh - movzx ebp,ch - mov eax,DWORD[r15] - xor r12d,DWORD[1+rdi*8+r14] - xor r8d,DWORD[1+rbp*8+r14] - - mov ebx,DWORD[4+r15] - mov ecx,DWORD[8+r15] - xor eax,r10d - xor ebx,r11d - xor ecx,r12d - xor edx,r8d - sub r13d,1 - jnz NEAR $L$enc_loop - movzx esi,al - movzx edi,bl - movzx ebp,cl - movzx r10d,BYTE[2+rsi*8+r14] - movzx r11d,BYTE[2+rdi*8+r14] - movzx r12d,BYTE[2+rbp*8+r14] - - movzx esi,dl - movzx edi,bh - movzx ebp,ch - movzx r8d,BYTE[2+rsi*8+r14] - mov edi,DWORD[rdi*8+r14] - mov ebp,DWORD[rbp*8+r14] - - and edi,0x0000ff00 - and ebp,0x0000ff00 - - xor r10d,edi - xor r11d,ebp - shr ecx,16 - - movzx esi,dh - movzx edi,ah - shr edx,16 - mov esi,DWORD[rsi*8+r14] - mov edi,DWORD[rdi*8+r14] - - and esi,0x0000ff00 - and edi,0x0000ff00 - shr ebx,16 - xor r12d,esi - xor r8d,edi - shr eax,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - mov esi,DWORD[rsi*8+r14] - mov edi,DWORD[rdi*8+r14] - mov ebp,DWORD[rbp*8+r14] - - and esi,0x00ff0000 - and edi,0x00ff0000 - and ebp,0x00ff0000 - - xor r10d,esi - xor r11d,edi - xor r12d,ebp - - movzx esi,bl - movzx edi,dh - movzx ebp,ah - mov esi,DWORD[rsi*8+r14] - mov edi,DWORD[2+rdi*8+r14] - mov ebp,DWORD[2+rbp*8+r14] - - and esi,0x00ff0000 - and edi,0xff000000 - and ebp,0xff000000 - - xor r8d,esi - xor r10d,edi - xor r11d,ebp - - movzx esi,bh - movzx edi,ch - mov edx,DWORD[((16+12))+r15] - mov esi,DWORD[2+rsi*8+r14] - mov edi,DWORD[2+rdi*8+r14] - mov eax,DWORD[((16+0))+r15] - - and esi,0xff000000 - and edi,0xff000000 - - xor r12d,esi - xor r8d,edi - - mov ebx,DWORD[((16+4))+r15] - mov ecx,DWORD[((16+8))+r15] - xor eax,r10d - xor ebx,r11d - xor ecx,r12d - xor edx,r8d -DB 0xf3,0xc3 - - -ALIGN 16 -_x86_64_AES_encrypt_compact: - - lea r8,[128+r14] - mov edi,DWORD[((0-128))+r8] - mov ebp,DWORD[((32-128))+r8] - mov r10d,DWORD[((64-128))+r8] - mov r11d,DWORD[((96-128))+r8] - mov edi,DWORD[((128-128))+r8] - mov ebp,DWORD[((160-128))+r8] - mov r10d,DWORD[((192-128))+r8] - mov r11d,DWORD[((224-128))+r8] - jmp NEAR $L$enc_loop_compact -ALIGN 16 -$L$enc_loop_compact: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - lea r15,[16+r15] - movzx r10d,al - movzx r11d,bl - movzx r12d,cl - movzx r8d,dl - movzx esi,bh - movzx edi,ch - shr ecx,16 - movzx ebp,dh - movzx r10d,BYTE[r10*1+r14] - movzx r11d,BYTE[r11*1+r14] - movzx r12d,BYTE[r12*1+r14] - movzx r8d,BYTE[r8*1+r14] - - movzx r9d,BYTE[rsi*1+r14] - movzx esi,ah - movzx r13d,BYTE[rdi*1+r14] - movzx edi,cl - movzx ebp,BYTE[rbp*1+r14] - movzx esi,BYTE[rsi*1+r14] - - shl r9d,8 - shr edx,16 - shl r13d,8 - xor r10d,r9d - shr eax,16 - movzx r9d,dl - shr ebx,16 - xor r11d,r13d - shl ebp,8 - movzx r13d,al - movzx edi,BYTE[rdi*1+r14] - xor r12d,ebp - - shl esi,8 - movzx ebp,bl - shl edi,16 - xor r8d,esi - movzx r9d,BYTE[r9*1+r14] - movzx esi,dh - movzx r13d,BYTE[r13*1+r14] - xor r10d,edi - - shr ecx,8 - movzx edi,ah - shl r9d,16 - shr ebx,8 - shl r13d,16 - xor r11d,r9d - movzx ebp,BYTE[rbp*1+r14] - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx edx,BYTE[rcx*1+r14] - movzx ecx,BYTE[rbx*1+r14] - - shl ebp,16 - xor r12d,r13d - shl esi,24 - xor r8d,ebp - shl edi,24 - xor r10d,esi - shl edx,24 - xor r11d,edi - shl ecx,24 - mov eax,r10d - mov ebx,r11d - xor ecx,r12d - xor edx,r8d - cmp r15,QWORD[16+rsp] - je NEAR $L$enc_compact_done - mov r10d,0x80808080 - mov r11d,0x80808080 - and r10d,eax - and r11d,ebx - mov esi,r10d - mov edi,r11d - shr r10d,7 - lea r8d,[rax*1+rax] - shr r11d,7 - lea r9d,[rbx*1+rbx] - sub esi,r10d - sub edi,r11d - and r8d,0xfefefefe - and r9d,0xfefefefe - and esi,0x1b1b1b1b - and edi,0x1b1b1b1b - mov r10d,eax - mov r11d,ebx - xor r8d,esi - xor r9d,edi - - xor eax,r8d - xor ebx,r9d - mov r12d,0x80808080 - rol eax,24 - mov ebp,0x80808080 - rol ebx,24 - and r12d,ecx - and ebp,edx - xor eax,r8d - xor ebx,r9d - mov esi,r12d - ror r10d,16 - mov edi,ebp - ror r11d,16 - lea r8d,[rcx*1+rcx] - shr r12d,7 - xor eax,r10d - shr ebp,7 - xor ebx,r11d - ror r10d,8 - lea r9d,[rdx*1+rdx] - ror r11d,8 - sub esi,r12d - sub edi,ebp - xor eax,r10d - xor ebx,r11d - - and r8d,0xfefefefe - and r9d,0xfefefefe - and esi,0x1b1b1b1b - and edi,0x1b1b1b1b - mov r12d,ecx - mov ebp,edx - xor r8d,esi - xor r9d,edi - - ror r12d,16 - xor ecx,r8d - ror ebp,16 - xor edx,r9d - rol ecx,24 - mov esi,DWORD[r14] - rol edx,24 - xor ecx,r8d - mov edi,DWORD[64+r14] - xor edx,r9d - mov r8d,DWORD[128+r14] - xor ecx,r12d - ror r12d,8 - xor edx,ebp - ror ebp,8 - xor ecx,r12d - mov r9d,DWORD[192+r14] - xor edx,ebp - jmp NEAR $L$enc_loop_compact -ALIGN 16 -$L$enc_compact_done: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] -DB 0xf3,0xc3 - - -global AES_encrypt - -ALIGN 16 -global asm_AES_encrypt - -asm_AES_encrypt: -AES_encrypt: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_encrypt: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - mov rax,rsp - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - - - lea rcx,[((-63))+rdx] - and rsp,-64 - sub rcx,rsp - neg rcx - and rcx,0x3c0 - sub rsp,rcx - sub rsp,32 - - mov QWORD[16+rsp],rsi - mov QWORD[24+rsp],rax - -$L$enc_prologue: - - mov r15,rdx - mov r13d,DWORD[240+r15] - - mov eax,DWORD[rdi] - mov ebx,DWORD[4+rdi] - mov ecx,DWORD[8+rdi] - mov edx,DWORD[12+rdi] - - shl r13d,4 - lea rbp,[r13*1+r15] - mov QWORD[rsp],r15 - mov QWORD[8+rsp],rbp - - - lea r14,[(($L$AES_Te+2048))] - lea rbp,[768+rsp] - sub rbp,r14 - and rbp,0x300 - lea r14,[rbp*1+r14] - - call _x86_64_AES_encrypt_compact - - mov r9,QWORD[16+rsp] - mov rsi,QWORD[24+rsp] - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - mov r15,QWORD[((-48))+rsi] - - mov r14,QWORD[((-40))+rsi] - - mov r13,QWORD[((-32))+rsi] - - mov r12,QWORD[((-24))+rsi] - - mov rbp,QWORD[((-16))+rsi] - - mov rbx,QWORD[((-8))+rsi] - - lea rsp,[rsi] - -$L$enc_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_encrypt: - -ALIGN 16 -_x86_64_AES_decrypt: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - - mov r13d,DWORD[240+r15] - sub r13d,1 - jmp NEAR $L$dec_loop -ALIGN 16 -$L$dec_loop: - - movzx esi,al - movzx edi,bl - movzx ebp,cl - mov r10d,DWORD[rsi*8+r14] - mov r11d,DWORD[rdi*8+r14] - mov r12d,DWORD[rbp*8+r14] - - movzx esi,dh - movzx edi,ah - movzx ebp,dl - xor r10d,DWORD[3+rsi*8+r14] - xor r11d,DWORD[3+rdi*8+r14] - mov r8d,DWORD[rbp*8+r14] - - movzx esi,bh - shr eax,16 - movzx ebp,ch - xor r12d,DWORD[3+rsi*8+r14] - shr edx,16 - xor r8d,DWORD[3+rbp*8+r14] - - shr ebx,16 - lea r15,[16+r15] - shr ecx,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - xor r10d,DWORD[2+rsi*8+r14] - xor r11d,DWORD[2+rdi*8+r14] - xor r12d,DWORD[2+rbp*8+r14] - - movzx esi,bh - movzx edi,ch - movzx ebp,bl - xor r10d,DWORD[1+rsi*8+r14] - xor r11d,DWORD[1+rdi*8+r14] - xor r8d,DWORD[2+rbp*8+r14] - - movzx esi,dh - mov edx,DWORD[12+r15] - movzx ebp,ah - xor r12d,DWORD[1+rsi*8+r14] - mov eax,DWORD[r15] - xor r8d,DWORD[1+rbp*8+r14] - - xor eax,r10d - mov ebx,DWORD[4+r15] - mov ecx,DWORD[8+r15] - xor ecx,r12d - xor ebx,r11d - xor edx,r8d - sub r13d,1 - jnz NEAR $L$dec_loop - lea r14,[2048+r14] - movzx esi,al - movzx edi,bl - movzx ebp,cl - movzx r10d,BYTE[rsi*1+r14] - movzx r11d,BYTE[rdi*1+r14] - movzx r12d,BYTE[rbp*1+r14] - - movzx esi,dl - movzx edi,dh - movzx ebp,ah - movzx r8d,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - - shl edi,8 - shl ebp,8 - - xor r10d,edi - xor r11d,ebp - shr edx,16 - - movzx esi,bh - movzx edi,ch - shr eax,16 - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - - shl esi,8 - shl edi,8 - shr ebx,16 - xor r12d,esi - xor r8d,edi - shr ecx,16 - - movzx esi,cl - movzx edi,dl - movzx ebp,al - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - - shl esi,16 - shl edi,16 - shl ebp,16 - - xor r10d,esi - xor r11d,edi - xor r12d,ebp - - movzx esi,bl - movzx edi,bh - movzx ebp,ch - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - - shl esi,16 - shl edi,24 - shl ebp,24 - - xor r8d,esi - xor r10d,edi - xor r11d,ebp - - movzx esi,dh - movzx edi,ah - mov edx,DWORD[((16+12))+r15] - movzx esi,BYTE[rsi*1+r14] - movzx edi,BYTE[rdi*1+r14] - mov eax,DWORD[((16+0))+r15] - - shl esi,24 - shl edi,24 - - xor r12d,esi - xor r8d,edi - - mov ebx,DWORD[((16+4))+r15] - mov ecx,DWORD[((16+8))+r15] - lea r14,[((-2048))+r14] - xor eax,r10d - xor ebx,r11d - xor ecx,r12d - xor edx,r8d -DB 0xf3,0xc3 - - -ALIGN 16 -_x86_64_AES_decrypt_compact: - - lea r8,[128+r14] - mov edi,DWORD[((0-128))+r8] - mov ebp,DWORD[((32-128))+r8] - mov r10d,DWORD[((64-128))+r8] - mov r11d,DWORD[((96-128))+r8] - mov edi,DWORD[((128-128))+r8] - mov ebp,DWORD[((160-128))+r8] - mov r10d,DWORD[((192-128))+r8] - mov r11d,DWORD[((224-128))+r8] - jmp NEAR $L$dec_loop_compact - -ALIGN 16 -$L$dec_loop_compact: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] - lea r15,[16+r15] - movzx r10d,al - movzx r11d,bl - movzx r12d,cl - movzx r8d,dl - movzx esi,dh - movzx edi,ah - shr edx,16 - movzx ebp,bh - movzx r10d,BYTE[r10*1+r14] - movzx r11d,BYTE[r11*1+r14] - movzx r12d,BYTE[r12*1+r14] - movzx r8d,BYTE[r8*1+r14] - - movzx r9d,BYTE[rsi*1+r14] - movzx esi,ch - movzx r13d,BYTE[rdi*1+r14] - movzx ebp,BYTE[rbp*1+r14] - movzx esi,BYTE[rsi*1+r14] - - shr ecx,16 - shl r13d,8 - shl r9d,8 - movzx edi,cl - shr eax,16 - xor r10d,r9d - shr ebx,16 - movzx r9d,dl - - shl ebp,8 - xor r11d,r13d - shl esi,8 - movzx r13d,al - movzx edi,BYTE[rdi*1+r14] - xor r12d,ebp - movzx ebp,bl - - shl edi,16 - xor r8d,esi - movzx r9d,BYTE[r9*1+r14] - movzx esi,bh - movzx ebp,BYTE[rbp*1+r14] - xor r10d,edi - movzx r13d,BYTE[r13*1+r14] - movzx edi,ch - - shl ebp,16 - shl r9d,16 - shl r13d,16 - xor r8d,ebp - movzx ebp,dh - xor r11d,r9d - shr eax,8 - xor r12d,r13d - - movzx esi,BYTE[rsi*1+r14] - movzx ebx,BYTE[rdi*1+r14] - movzx ecx,BYTE[rbp*1+r14] - movzx edx,BYTE[rax*1+r14] - - mov eax,r10d - shl esi,24 - shl ebx,24 - shl ecx,24 - xor eax,esi - shl edx,24 - xor ebx,r11d - xor ecx,r12d - xor edx,r8d - cmp r15,QWORD[16+rsp] - je NEAR $L$dec_compact_done - - mov rsi,QWORD[((256+0))+r14] - shl rbx,32 - shl rdx,32 - mov rdi,QWORD[((256+8))+r14] - or rax,rbx - or rcx,rdx - mov rbp,QWORD[((256+16))+r14] - mov r9,rsi - mov r12,rsi - and r9,rax - and r12,rcx - mov rbx,r9 - mov rdx,r12 - shr r9,7 - lea r8,[rax*1+rax] - shr r12,7 - lea r11,[rcx*1+rcx] - sub rbx,r9 - sub rdx,r12 - and r8,rdi - and r11,rdi - and rbx,rbp - and rdx,rbp - xor r8,rbx - xor r11,rdx - mov r10,rsi - mov r13,rsi - - and r10,r8 - and r13,r11 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - lea r9,[r8*1+r8] - shr r13,7 - lea r12,[r11*1+r11] - sub rbx,r10 - sub rdx,r13 - and r9,rdi - and r12,rdi - and rbx,rbp - and rdx,rbp - xor r9,rbx - xor r12,rdx - mov r10,rsi - mov r13,rsi - - and r10,r9 - and r13,r12 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - xor r8,rax - shr r13,7 - xor r11,rcx - sub rbx,r10 - sub rdx,r13 - lea r10,[r9*1+r9] - lea r13,[r12*1+r12] - xor r9,rax - xor r12,rcx - and r10,rdi - and r13,rdi - and rbx,rbp - and rdx,rbp - xor r10,rbx - xor r13,rdx - - xor rax,r10 - xor rcx,r13 - xor r8,r10 - xor r11,r13 - mov rbx,rax - mov rdx,rcx - xor r9,r10 - shr rbx,32 - xor r12,r13 - shr rdx,32 - xor r10,r8 - rol eax,8 - xor r13,r11 - rol ecx,8 - xor r10,r9 - rol ebx,8 - xor r13,r12 - - rol edx,8 - xor eax,r10d - shr r10,32 - xor ecx,r13d - shr r13,32 - xor ebx,r10d - xor edx,r13d - - mov r10,r8 - rol r8d,24 - mov r13,r11 - rol r11d,24 - shr r10,32 - xor eax,r8d - shr r13,32 - xor ecx,r11d - rol r10d,24 - mov r8,r9 - rol r13d,24 - mov r11,r12 - shr r8,32 - xor ebx,r10d - shr r11,32 - xor edx,r13d - - mov rsi,QWORD[r14] - rol r9d,16 - mov rdi,QWORD[64+r14] - rol r12d,16 - mov rbp,QWORD[128+r14] - rol r8d,16 - mov r10,QWORD[192+r14] - xor eax,r9d - rol r11d,16 - xor ecx,r12d - mov r13,QWORD[256+r14] - xor ebx,r8d - xor edx,r11d - jmp NEAR $L$dec_loop_compact -ALIGN 16 -$L$dec_compact_done: - xor eax,DWORD[r15] - xor ebx,DWORD[4+r15] - xor ecx,DWORD[8+r15] - xor edx,DWORD[12+r15] -DB 0xf3,0xc3 - - -global AES_decrypt - -ALIGN 16 -global asm_AES_decrypt - -asm_AES_decrypt: -AES_decrypt: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_decrypt: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - mov rax,rsp - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - - - lea rcx,[((-63))+rdx] - and rsp,-64 - sub rcx,rsp - neg rcx - and rcx,0x3c0 - sub rsp,rcx - sub rsp,32 - - mov QWORD[16+rsp],rsi - mov QWORD[24+rsp],rax - -$L$dec_prologue: - - mov r15,rdx - mov r13d,DWORD[240+r15] - - mov eax,DWORD[rdi] - mov ebx,DWORD[4+rdi] - mov ecx,DWORD[8+rdi] - mov edx,DWORD[12+rdi] - - shl r13d,4 - lea rbp,[r13*1+r15] - mov QWORD[rsp],r15 - mov QWORD[8+rsp],rbp - - - lea r14,[(($L$AES_Td+2048))] - lea rbp,[768+rsp] - sub rbp,r14 - and rbp,0x300 - lea r14,[rbp*1+r14] - shr rbp,3 - add r14,rbp - - call _x86_64_AES_decrypt_compact - - mov r9,QWORD[16+rsp] - mov rsi,QWORD[24+rsp] - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - mov r15,QWORD[((-48))+rsi] - - mov r14,QWORD[((-40))+rsi] - - mov r13,QWORD[((-32))+rsi] - - mov r12,QWORD[((-24))+rsi] - - mov rbp,QWORD[((-16))+rsi] - - mov rbx,QWORD[((-8))+rsi] - - lea rsp,[rsi] - -$L$dec_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_decrypt: -global AES_set_encrypt_key - -ALIGN 16 -AES_set_encrypt_key: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_set_encrypt_key: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - sub rsp,8 - -$L$enc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - mov rbp,QWORD[40+rsp] - - mov rbx,QWORD[48+rsp] - - add rsp,56 - -$L$enc_key_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_set_encrypt_key: - - -ALIGN 16 -_x86_64_AES_set_encrypt_key: - - mov ecx,esi - mov rsi,rdi - mov rdi,rdx - - test rsi,-1 - jz NEAR $L$badpointer - test rdi,-1 - jz NEAR $L$badpointer - - lea rbp,[$L$AES_Te] - lea rbp,[((2048+128))+rbp] - - - mov eax,DWORD[((0-128))+rbp] - mov ebx,DWORD[((32-128))+rbp] - mov r8d,DWORD[((64-128))+rbp] - mov edx,DWORD[((96-128))+rbp] - mov eax,DWORD[((128-128))+rbp] - mov ebx,DWORD[((160-128))+rbp] - mov r8d,DWORD[((192-128))+rbp] - mov edx,DWORD[((224-128))+rbp] - - cmp ecx,128 - je NEAR $L$10rounds - cmp ecx,192 - je NEAR $L$12rounds - cmp ecx,256 - je NEAR $L$14rounds - mov rax,-2 - jmp NEAR $L$exit - -$L$10rounds: - mov rax,QWORD[rsi] - mov rdx,QWORD[8+rsi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rdx - - shr rdx,32 - xor ecx,ecx - jmp NEAR $L$10shortcut -ALIGN 4 -$L$10loop: - mov eax,DWORD[rdi] - mov edx,DWORD[12+rdi] -$L$10shortcut: - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,24 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,8 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,16 - xor eax,ebx - - xor eax,DWORD[((1024-128))+rcx*4+rbp] - mov DWORD[16+rdi],eax - xor eax,DWORD[4+rdi] - mov DWORD[20+rdi],eax - xor eax,DWORD[8+rdi] - mov DWORD[24+rdi],eax - xor eax,DWORD[12+rdi] - mov DWORD[28+rdi],eax - add ecx,1 - lea rdi,[16+rdi] - cmp ecx,10 - jl NEAR $L$10loop - - mov DWORD[80+rdi],10 - xor rax,rax - jmp NEAR $L$exit - -$L$12rounds: - mov rax,QWORD[rsi] - mov rbx,QWORD[8+rsi] - mov rdx,QWORD[16+rsi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rbx - mov QWORD[16+rdi],rdx - - shr rdx,32 - xor ecx,ecx - jmp NEAR $L$12shortcut -ALIGN 4 -$L$12loop: - mov eax,DWORD[rdi] - mov edx,DWORD[20+rdi] -$L$12shortcut: - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,24 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,8 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,16 - xor eax,ebx - - xor eax,DWORD[((1024-128))+rcx*4+rbp] - mov DWORD[24+rdi],eax - xor eax,DWORD[4+rdi] - mov DWORD[28+rdi],eax - xor eax,DWORD[8+rdi] - mov DWORD[32+rdi],eax - xor eax,DWORD[12+rdi] - mov DWORD[36+rdi],eax - - cmp ecx,7 - je NEAR $L$12break - add ecx,1 - - xor eax,DWORD[16+rdi] - mov DWORD[40+rdi],eax - xor eax,DWORD[20+rdi] - mov DWORD[44+rdi],eax - - lea rdi,[24+rdi] - jmp NEAR $L$12loop -$L$12break: - mov DWORD[72+rdi],12 - xor rax,rax - jmp NEAR $L$exit - -$L$14rounds: - mov rax,QWORD[rsi] - mov rbx,QWORD[8+rsi] - mov rcx,QWORD[16+rsi] - mov rdx,QWORD[24+rsi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rbx - mov QWORD[16+rdi],rcx - mov QWORD[24+rdi],rdx - - shr rdx,32 - xor ecx,ecx - jmp NEAR $L$14shortcut -ALIGN 4 -$L$14loop: - mov eax,DWORD[rdi] - mov edx,DWORD[28+rdi] -$L$14shortcut: - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,24 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,8 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,16 - xor eax,ebx - - xor eax,DWORD[((1024-128))+rcx*4+rbp] - mov DWORD[32+rdi],eax - xor eax,DWORD[4+rdi] - mov DWORD[36+rdi],eax - xor eax,DWORD[8+rdi] - mov DWORD[40+rdi],eax - xor eax,DWORD[12+rdi] - mov DWORD[44+rdi],eax - - cmp ecx,6 - je NEAR $L$14break - add ecx,1 - - mov edx,eax - mov eax,DWORD[16+rdi] - movzx esi,dl - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shr edx,16 - shl ebx,8 - movzx esi,dl - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - movzx esi,dh - shl ebx,16 - xor eax,ebx - - movzx ebx,BYTE[((-128))+rsi*1+rbp] - shl ebx,24 - xor eax,ebx - - mov DWORD[48+rdi],eax - xor eax,DWORD[20+rdi] - mov DWORD[52+rdi],eax - xor eax,DWORD[24+rdi] - mov DWORD[56+rdi],eax - xor eax,DWORD[28+rdi] - mov DWORD[60+rdi],eax - - lea rdi,[32+rdi] - jmp NEAR $L$14loop -$L$14break: - mov DWORD[48+rdi],14 - xor rax,rax - jmp NEAR $L$exit - -$L$badpointer: - mov rax,-1 -$L$exit: -DB 0xf3,0xc3 - - -global AES_set_decrypt_key - -ALIGN 16 -AES_set_decrypt_key: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_set_decrypt_key: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - - - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - - push rdx - -$L$dec_key_prologue: - - call _x86_64_AES_set_encrypt_key - mov r8,QWORD[rsp] - cmp eax,0 - jne NEAR $L$abort - - mov r14d,DWORD[240+r8] - xor rdi,rdi - lea rcx,[r14*4+rdi] - mov rsi,r8 - lea rdi,[rcx*4+r8] -ALIGN 4 -$L$invert: - mov rax,QWORD[rsi] - mov rbx,QWORD[8+rsi] - mov rcx,QWORD[rdi] - mov rdx,QWORD[8+rdi] - mov QWORD[rdi],rax - mov QWORD[8+rdi],rbx - mov QWORD[rsi],rcx - mov QWORD[8+rsi],rdx - lea rsi,[16+rsi] - lea rdi,[((-16))+rdi] - cmp rdi,rsi - jne NEAR $L$invert - - lea rax,[(($L$AES_Te+2048+1024))] - - mov rsi,QWORD[40+rax] - mov rdi,QWORD[48+rax] - mov rbp,QWORD[56+rax] - - mov r15,r8 - sub r14d,1 -ALIGN 4 -$L$permute: - lea r15,[16+r15] - mov rax,QWORD[r15] - mov rcx,QWORD[8+r15] - mov r9,rsi - mov r12,rsi - and r9,rax - and r12,rcx - mov rbx,r9 - mov rdx,r12 - shr r9,7 - lea r8,[rax*1+rax] - shr r12,7 - lea r11,[rcx*1+rcx] - sub rbx,r9 - sub rdx,r12 - and r8,rdi - and r11,rdi - and rbx,rbp - and rdx,rbp - xor r8,rbx - xor r11,rdx - mov r10,rsi - mov r13,rsi - - and r10,r8 - and r13,r11 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - lea r9,[r8*1+r8] - shr r13,7 - lea r12,[r11*1+r11] - sub rbx,r10 - sub rdx,r13 - and r9,rdi - and r12,rdi - and rbx,rbp - and rdx,rbp - xor r9,rbx - xor r12,rdx - mov r10,rsi - mov r13,rsi - - and r10,r9 - and r13,r12 - mov rbx,r10 - mov rdx,r13 - shr r10,7 - xor r8,rax - shr r13,7 - xor r11,rcx - sub rbx,r10 - sub rdx,r13 - lea r10,[r9*1+r9] - lea r13,[r12*1+r12] - xor r9,rax - xor r12,rcx - and r10,rdi - and r13,rdi - and rbx,rbp - and rdx,rbp - xor r10,rbx - xor r13,rdx - - xor rax,r10 - xor rcx,r13 - xor r8,r10 - xor r11,r13 - mov rbx,rax - mov rdx,rcx - xor r9,r10 - shr rbx,32 - xor r12,r13 - shr rdx,32 - xor r10,r8 - rol eax,8 - xor r13,r11 - rol ecx,8 - xor r10,r9 - rol ebx,8 - xor r13,r12 - - rol edx,8 - xor eax,r10d - shr r10,32 - xor ecx,r13d - shr r13,32 - xor ebx,r10d - xor edx,r13d - - mov r10,r8 - rol r8d,24 - mov r13,r11 - rol r11d,24 - shr r10,32 - xor eax,r8d - shr r13,32 - xor ecx,r11d - rol r10d,24 - mov r8,r9 - rol r13d,24 - mov r11,r12 - shr r8,32 - xor ebx,r10d - shr r11,32 - xor edx,r13d - - - rol r9d,16 - - rol r12d,16 - - rol r8d,16 - - xor eax,r9d - rol r11d,16 - xor ecx,r12d - - xor ebx,r8d - xor edx,r11d - mov DWORD[r15],eax - mov DWORD[4+r15],ebx - mov DWORD[8+r15],ecx - mov DWORD[12+r15],edx - sub r14d,1 - jnz NEAR $L$permute - - xor rax,rax -$L$abort: - mov r15,QWORD[8+rsp] - - mov r14,QWORD[16+rsp] - - mov r13,QWORD[24+rsp] - - mov r12,QWORD[32+rsp] - - mov rbp,QWORD[40+rsp] - - mov rbx,QWORD[48+rsp] - - add rsp,56 - -$L$dec_key_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_set_decrypt_key: -global AES_cbc_encrypt - -ALIGN 16 -EXTERN OPENSSL_ia32cap_P -global asm_AES_cbc_encrypt - -asm_AES_cbc_encrypt: -AES_cbc_encrypt: - mov QWORD[8+rsp],rdi ;WIN64 prologue - mov QWORD[16+rsp],rsi - mov rax,rsp -$L$SEH_begin_AES_cbc_encrypt: - mov rdi,rcx - mov rsi,rdx - mov rdx,r8 - mov rcx,r9 - mov r8,QWORD[40+rsp] - mov r9,QWORD[48+rsp] - - - - cmp rdx,0 - je NEAR $L$cbc_epilogue - pushfq - - - - push rbx - - push rbp - - push r12 - - push r13 - - push r14 - - push r15 - -$L$cbc_prologue: - - cld - mov r9d,r9d - - lea r14,[$L$AES_Te] - lea r10,[$L$AES_Td] - cmp r9,0 - cmove r14,r10 - - - mov r10d,DWORD[OPENSSL_ia32cap_P] - cmp rdx,512 - jb NEAR $L$cbc_slow_prologue - test rdx,15 - jnz NEAR $L$cbc_slow_prologue - bt r10d,28 - jc NEAR $L$cbc_slow_prologue - - - lea r15,[((-88-248))+rsp] - and r15,-64 - - - mov r10,r14 - lea r11,[2304+r14] - mov r12,r15 - and r10,0xFFF - and r11,0xFFF - and r12,0xFFF - - cmp r12,r11 - jb NEAR $L$cbc_te_break_out - sub r12,r11 - sub r15,r12 - jmp NEAR $L$cbc_te_ok -$L$cbc_te_break_out: - sub r12,r10 - and r12,0xFFF - add r12,320 - sub r15,r12 -ALIGN 4 -$L$cbc_te_ok: - - xchg r15,rsp - - - mov QWORD[16+rsp],r15 - -$L$cbc_fast_body: - mov QWORD[24+rsp],rdi - mov QWORD[32+rsp],rsi - mov QWORD[40+rsp],rdx - mov QWORD[48+rsp],rcx - mov QWORD[56+rsp],r8 - mov DWORD[((80+240))+rsp],0 - mov rbp,r8 - mov rbx,r9 - mov r9,rsi - mov r8,rdi - mov r15,rcx - - mov eax,DWORD[240+r15] - - mov r10,r15 - sub r10,r14 - and r10,0xfff - cmp r10,2304 - jb NEAR $L$cbc_do_ecopy - cmp r10,4096-248 - jb NEAR $L$cbc_skip_ecopy -ALIGN 4 -$L$cbc_do_ecopy: - mov rsi,r15 - lea rdi,[80+rsp] - lea r15,[80+rsp] - mov ecx,240/8 - DD 0x90A548F3 - mov DWORD[rdi],eax -$L$cbc_skip_ecopy: - mov QWORD[rsp],r15 - - mov ecx,18 -ALIGN 4 -$L$cbc_prefetch_te: - mov r10,QWORD[r14] - mov r11,QWORD[32+r14] - mov r12,QWORD[64+r14] - mov r13,QWORD[96+r14] - lea r14,[128+r14] - sub ecx,1 - jnz NEAR $L$cbc_prefetch_te - lea r14,[((-2304))+r14] - - cmp rbx,0 - je NEAR $L$FAST_DECRYPT - - - mov eax,DWORD[rbp] - mov ebx,DWORD[4+rbp] - mov ecx,DWORD[8+rbp] - mov edx,DWORD[12+rbp] - -ALIGN 4 -$L$cbc_fast_enc_loop: - xor eax,DWORD[r8] - xor ebx,DWORD[4+r8] - xor ecx,DWORD[8+r8] - xor edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - - call _x86_64_AES_encrypt - - mov r8,QWORD[24+rsp] - mov r10,QWORD[40+rsp] - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - sub r10,16 - test r10,-16 - mov QWORD[40+rsp],r10 - jnz NEAR $L$cbc_fast_enc_loop - mov rbp,QWORD[56+rsp] - mov DWORD[rbp],eax - mov DWORD[4+rbp],ebx - mov DWORD[8+rbp],ecx - mov DWORD[12+rbp],edx - - jmp NEAR $L$cbc_fast_cleanup - - -ALIGN 16 -$L$FAST_DECRYPT: - cmp r9,r8 - je NEAR $L$cbc_fast_dec_in_place - - mov QWORD[64+rsp],rbp -ALIGN 4 -$L$cbc_fast_dec_loop: - mov eax,DWORD[r8] - mov ebx,DWORD[4+r8] - mov ecx,DWORD[8+r8] - mov edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - - call _x86_64_AES_decrypt - - mov rbp,QWORD[64+rsp] - mov r8,QWORD[24+rsp] - mov r10,QWORD[40+rsp] - xor eax,DWORD[rbp] - xor ebx,DWORD[4+rbp] - xor ecx,DWORD[8+rbp] - xor edx,DWORD[12+rbp] - mov rbp,r8 - - sub r10,16 - mov QWORD[40+rsp],r10 - mov QWORD[64+rsp],rbp - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - jnz NEAR $L$cbc_fast_dec_loop - mov r12,QWORD[56+rsp] - mov r10,QWORD[rbp] - mov r11,QWORD[8+rbp] - mov QWORD[r12],r10 - mov QWORD[8+r12],r11 - jmp NEAR $L$cbc_fast_cleanup - -ALIGN 16 -$L$cbc_fast_dec_in_place: - mov r10,QWORD[rbp] - mov r11,QWORD[8+rbp] - mov QWORD[((0+64))+rsp],r10 - mov QWORD[((8+64))+rsp],r11 -ALIGN 4 -$L$cbc_fast_dec_in_place_loop: - mov eax,DWORD[r8] - mov ebx,DWORD[4+r8] - mov ecx,DWORD[8+r8] - mov edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - - call _x86_64_AES_decrypt - - mov r8,QWORD[24+rsp] - mov r10,QWORD[40+rsp] - xor eax,DWORD[((0+64))+rsp] - xor ebx,DWORD[((4+64))+rsp] - xor ecx,DWORD[((8+64))+rsp] - xor edx,DWORD[((12+64))+rsp] - - mov r11,QWORD[r8] - mov r12,QWORD[8+r8] - sub r10,16 - jz NEAR $L$cbc_fast_dec_in_place_done - - mov QWORD[((0+64))+rsp],r11 - mov QWORD[((8+64))+rsp],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - mov QWORD[40+rsp],r10 - jmp NEAR $L$cbc_fast_dec_in_place_loop -$L$cbc_fast_dec_in_place_done: - mov rdi,QWORD[56+rsp] - mov QWORD[rdi],r11 - mov QWORD[8+rdi],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - -ALIGN 4 -$L$cbc_fast_cleanup: - cmp DWORD[((80+240))+rsp],0 - lea rdi,[80+rsp] - je NEAR $L$cbc_exit - mov ecx,240/8 - xor rax,rax - DD 0x90AB48F3 - - jmp NEAR $L$cbc_exit - - -ALIGN 16 -$L$cbc_slow_prologue: - - - lea rbp,[((-88))+rsp] - and rbp,-64 - - lea r10,[((-88-63))+rcx] - sub r10,rbp - neg r10 - and r10,0x3c0 - sub rbp,r10 - - xchg rbp,rsp - - - mov QWORD[16+rsp],rbp - -$L$cbc_slow_body: - - - - - mov QWORD[56+rsp],r8 - mov rbp,r8 - mov rbx,r9 - mov r9,rsi - mov r8,rdi - mov r15,rcx - mov r10,rdx - - mov eax,DWORD[240+r15] - mov QWORD[rsp],r15 - shl eax,4 - lea rax,[rax*1+r15] - mov QWORD[8+rsp],rax - - - lea r14,[2048+r14] - lea rax,[((768-8))+rsp] - sub rax,r14 - and rax,0x300 - lea r14,[rax*1+r14] - - cmp rbx,0 - je NEAR $L$SLOW_DECRYPT - - - test r10,-16 - mov eax,DWORD[rbp] - mov ebx,DWORD[4+rbp] - mov ecx,DWORD[8+rbp] - mov edx,DWORD[12+rbp] - jz NEAR $L$cbc_slow_enc_tail - -ALIGN 4 -$L$cbc_slow_enc_loop: - xor eax,DWORD[r8] - xor ebx,DWORD[4+r8] - xor ecx,DWORD[8+r8] - xor edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - mov QWORD[32+rsp],r9 - mov QWORD[40+rsp],r10 - - call _x86_64_AES_encrypt_compact - - mov r8,QWORD[24+rsp] - mov r9,QWORD[32+rsp] - mov r10,QWORD[40+rsp] - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - sub r10,16 - test r10,-16 - jnz NEAR $L$cbc_slow_enc_loop - test r10,15 - jnz NEAR $L$cbc_slow_enc_tail - mov rbp,QWORD[56+rsp] - mov DWORD[rbp],eax - mov DWORD[4+rbp],ebx - mov DWORD[8+rbp],ecx - mov DWORD[12+rbp],edx - - jmp NEAR $L$cbc_exit - -ALIGN 4 -$L$cbc_slow_enc_tail: - mov r11,rax - mov r12,rcx - mov rcx,r10 - mov rsi,r8 - mov rdi,r9 - DD 0x9066A4F3 - mov rcx,16 - sub rcx,r10 - xor rax,rax - DD 0x9066AAF3 - mov r8,r9 - mov r10,16 - mov rax,r11 - mov rcx,r12 - jmp NEAR $L$cbc_slow_enc_loop - -ALIGN 16 -$L$SLOW_DECRYPT: - shr rax,3 - add r14,rax - - mov r11,QWORD[rbp] - mov r12,QWORD[8+rbp] - mov QWORD[((0+64))+rsp],r11 - mov QWORD[((8+64))+rsp],r12 - -ALIGN 4 -$L$cbc_slow_dec_loop: - mov eax,DWORD[r8] - mov ebx,DWORD[4+r8] - mov ecx,DWORD[8+r8] - mov edx,DWORD[12+r8] - mov r15,QWORD[rsp] - mov QWORD[24+rsp],r8 - mov QWORD[32+rsp],r9 - mov QWORD[40+rsp],r10 - - call _x86_64_AES_decrypt_compact - - mov r8,QWORD[24+rsp] - mov r9,QWORD[32+rsp] - mov r10,QWORD[40+rsp] - xor eax,DWORD[((0+64))+rsp] - xor ebx,DWORD[((4+64))+rsp] - xor ecx,DWORD[((8+64))+rsp] - xor edx,DWORD[((12+64))+rsp] - - mov r11,QWORD[r8] - mov r12,QWORD[8+r8] - sub r10,16 - jc NEAR $L$cbc_slow_dec_partial - jz NEAR $L$cbc_slow_dec_done - - mov QWORD[((0+64))+rsp],r11 - mov QWORD[((8+64))+rsp],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - lea r8,[16+r8] - lea r9,[16+r9] - jmp NEAR $L$cbc_slow_dec_loop -$L$cbc_slow_dec_done: - mov rdi,QWORD[56+rsp] - mov QWORD[rdi],r11 - mov QWORD[8+rdi],r12 - - mov DWORD[r9],eax - mov DWORD[4+r9],ebx - mov DWORD[8+r9],ecx - mov DWORD[12+r9],edx - - jmp NEAR $L$cbc_exit - -ALIGN 4 -$L$cbc_slow_dec_partial: - mov rdi,QWORD[56+rsp] - mov QWORD[rdi],r11 - mov QWORD[8+rdi],r12 - - mov DWORD[((0+64))+rsp],eax - mov DWORD[((4+64))+rsp],ebx - mov DWORD[((8+64))+rsp],ecx - mov DWORD[((12+64))+rsp],edx - - mov rdi,r9 - lea rsi,[64+rsp] - lea rcx,[16+r10] - DD 0x9066A4F3 - jmp NEAR $L$cbc_exit - -ALIGN 16 -$L$cbc_exit: - mov rsi,QWORD[16+rsp] - - mov r15,QWORD[rsi] - - mov r14,QWORD[8+rsi] - - mov r13,QWORD[16+rsi] - - mov r12,QWORD[24+rsi] - - mov rbp,QWORD[32+rsi] - - mov rbx,QWORD[40+rsi] - - lea rsp,[48+rsi] - -$L$cbc_popfq: - popfq - - - -$L$cbc_epilogue: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue - mov rsi,QWORD[16+rsp] - DB 0F3h,0C3h ;repret - -$L$SEH_end_AES_cbc_encrypt: -ALIGN 64 -$L$AES_Te: - DD 0xa56363c6,0xa56363c6 - DD 0x847c7cf8,0x847c7cf8 - DD 0x997777ee,0x997777ee - DD 0x8d7b7bf6,0x8d7b7bf6 - DD 0x0df2f2ff,0x0df2f2ff - DD 0xbd6b6bd6,0xbd6b6bd6 - DD 0xb16f6fde,0xb16f6fde - DD 0x54c5c591,0x54c5c591 - DD 0x50303060,0x50303060 - DD 0x03010102,0x03010102 - DD 0xa96767ce,0xa96767ce - DD 0x7d2b2b56,0x7d2b2b56 - DD 0x19fefee7,0x19fefee7 - DD 0x62d7d7b5,0x62d7d7b5 - DD 0xe6abab4d,0xe6abab4d - DD 0x9a7676ec,0x9a7676ec - DD 0x45caca8f,0x45caca8f - DD 0x9d82821f,0x9d82821f - DD 0x40c9c989,0x40c9c989 - DD 0x877d7dfa,0x877d7dfa - DD 0x15fafaef,0x15fafaef - DD 0xeb5959b2,0xeb5959b2 - DD 0xc947478e,0xc947478e - DD 0x0bf0f0fb,0x0bf0f0fb - DD 0xecadad41,0xecadad41 - DD 0x67d4d4b3,0x67d4d4b3 - DD 0xfda2a25f,0xfda2a25f - DD 0xeaafaf45,0xeaafaf45 - DD 0xbf9c9c23,0xbf9c9c23 - DD 0xf7a4a453,0xf7a4a453 - DD 0x967272e4,0x967272e4 - DD 0x5bc0c09b,0x5bc0c09b - DD 0xc2b7b775,0xc2b7b775 - DD 0x1cfdfde1,0x1cfdfde1 - DD 0xae93933d,0xae93933d - DD 0x6a26264c,0x6a26264c - DD 0x5a36366c,0x5a36366c - DD 0x413f3f7e,0x413f3f7e - DD 0x02f7f7f5,0x02f7f7f5 - DD 0x4fcccc83,0x4fcccc83 - DD 0x5c343468,0x5c343468 - DD 0xf4a5a551,0xf4a5a551 - DD 0x34e5e5d1,0x34e5e5d1 - DD 0x08f1f1f9,0x08f1f1f9 - DD 0x937171e2,0x937171e2 - DD 0x73d8d8ab,0x73d8d8ab - DD 0x53313162,0x53313162 - DD 0x3f15152a,0x3f15152a - DD 0x0c040408,0x0c040408 - DD 0x52c7c795,0x52c7c795 - DD 0x65232346,0x65232346 - DD 0x5ec3c39d,0x5ec3c39d - DD 0x28181830,0x28181830 - DD 0xa1969637,0xa1969637 - DD 0x0f05050a,0x0f05050a - DD 0xb59a9a2f,0xb59a9a2f - DD 0x0907070e,0x0907070e - DD 0x36121224,0x36121224 - DD 0x9b80801b,0x9b80801b - DD 0x3de2e2df,0x3de2e2df - DD 0x26ebebcd,0x26ebebcd - DD 0x6927274e,0x6927274e - DD 0xcdb2b27f,0xcdb2b27f - DD 0x9f7575ea,0x9f7575ea - DD 0x1b090912,0x1b090912 - DD 0x9e83831d,0x9e83831d - DD 0x742c2c58,0x742c2c58 - DD 0x2e1a1a34,0x2e1a1a34 - DD 0x2d1b1b36,0x2d1b1b36 - DD 0xb26e6edc,0xb26e6edc - DD 0xee5a5ab4,0xee5a5ab4 - DD 0xfba0a05b,0xfba0a05b - DD 0xf65252a4,0xf65252a4 - DD 0x4d3b3b76,0x4d3b3b76 - DD 0x61d6d6b7,0x61d6d6b7 - DD 0xceb3b37d,0xceb3b37d - DD 0x7b292952,0x7b292952 - DD 0x3ee3e3dd,0x3ee3e3dd - DD 0x712f2f5e,0x712f2f5e - DD 0x97848413,0x97848413 - DD 0xf55353a6,0xf55353a6 - DD 0x68d1d1b9,0x68d1d1b9 - DD 0x00000000,0x00000000 - DD 0x2cededc1,0x2cededc1 - DD 0x60202040,0x60202040 - DD 0x1ffcfce3,0x1ffcfce3 - DD 0xc8b1b179,0xc8b1b179 - DD 0xed5b5bb6,0xed5b5bb6 - DD 0xbe6a6ad4,0xbe6a6ad4 - DD 0x46cbcb8d,0x46cbcb8d - DD 0xd9bebe67,0xd9bebe67 - DD 0x4b393972,0x4b393972 - DD 0xde4a4a94,0xde4a4a94 - DD 0xd44c4c98,0xd44c4c98 - DD 0xe85858b0,0xe85858b0 - DD 0x4acfcf85,0x4acfcf85 - DD 0x6bd0d0bb,0x6bd0d0bb - DD 0x2aefefc5,0x2aefefc5 - DD 0xe5aaaa4f,0xe5aaaa4f - DD 0x16fbfbed,0x16fbfbed - DD 0xc5434386,0xc5434386 - DD 0xd74d4d9a,0xd74d4d9a - DD 0x55333366,0x55333366 - DD 0x94858511,0x94858511 - DD 0xcf45458a,0xcf45458a - DD 0x10f9f9e9,0x10f9f9e9 - DD 0x06020204,0x06020204 - DD 0x817f7ffe,0x817f7ffe - DD 0xf05050a0,0xf05050a0 - DD 0x443c3c78,0x443c3c78 - DD 0xba9f9f25,0xba9f9f25 - DD 0xe3a8a84b,0xe3a8a84b - DD 0xf35151a2,0xf35151a2 - DD 0xfea3a35d,0xfea3a35d - DD 0xc0404080,0xc0404080 - DD 0x8a8f8f05,0x8a8f8f05 - DD 0xad92923f,0xad92923f - DD 0xbc9d9d21,0xbc9d9d21 - DD 0x48383870,0x48383870 - DD 0x04f5f5f1,0x04f5f5f1 - DD 0xdfbcbc63,0xdfbcbc63 - DD 0xc1b6b677,0xc1b6b677 - DD 0x75dadaaf,0x75dadaaf - DD 0x63212142,0x63212142 - DD 0x30101020,0x30101020 - DD 0x1affffe5,0x1affffe5 - DD 0x0ef3f3fd,0x0ef3f3fd - DD 0x6dd2d2bf,0x6dd2d2bf - DD 0x4ccdcd81,0x4ccdcd81 - DD 0x140c0c18,0x140c0c18 - DD 0x35131326,0x35131326 - DD 0x2fececc3,0x2fececc3 - DD 0xe15f5fbe,0xe15f5fbe - DD 0xa2979735,0xa2979735 - DD 0xcc444488,0xcc444488 - DD 0x3917172e,0x3917172e - DD 0x57c4c493,0x57c4c493 - DD 0xf2a7a755,0xf2a7a755 - DD 0x827e7efc,0x827e7efc - DD 0x473d3d7a,0x473d3d7a - DD 0xac6464c8,0xac6464c8 - DD 0xe75d5dba,0xe75d5dba - DD 0x2b191932,0x2b191932 - DD 0x957373e6,0x957373e6 - DD 0xa06060c0,0xa06060c0 - DD 0x98818119,0x98818119 - DD 0xd14f4f9e,0xd14f4f9e - DD 0x7fdcdca3,0x7fdcdca3 - DD 0x66222244,0x66222244 - DD 0x7e2a2a54,0x7e2a2a54 - DD 0xab90903b,0xab90903b - DD 0x8388880b,0x8388880b - DD 0xca46468c,0xca46468c - DD 0x29eeeec7,0x29eeeec7 - DD 0xd3b8b86b,0xd3b8b86b - DD 0x3c141428,0x3c141428 - DD 0x79dedea7,0x79dedea7 - DD 0xe25e5ebc,0xe25e5ebc - DD 0x1d0b0b16,0x1d0b0b16 - DD 0x76dbdbad,0x76dbdbad - DD 0x3be0e0db,0x3be0e0db - DD 0x56323264,0x56323264 - DD 0x4e3a3a74,0x4e3a3a74 - DD 0x1e0a0a14,0x1e0a0a14 - DD 0xdb494992,0xdb494992 - DD 0x0a06060c,0x0a06060c - DD 0x6c242448,0x6c242448 - DD 0xe45c5cb8,0xe45c5cb8 - DD 0x5dc2c29f,0x5dc2c29f - DD 0x6ed3d3bd,0x6ed3d3bd - DD 0xefacac43,0xefacac43 - DD 0xa66262c4,0xa66262c4 - DD 0xa8919139,0xa8919139 - DD 0xa4959531,0xa4959531 - DD 0x37e4e4d3,0x37e4e4d3 - DD 0x8b7979f2,0x8b7979f2 - DD 0x32e7e7d5,0x32e7e7d5 - DD 0x43c8c88b,0x43c8c88b - DD 0x5937376e,0x5937376e - DD 0xb76d6dda,0xb76d6dda - DD 0x8c8d8d01,0x8c8d8d01 - DD 0x64d5d5b1,0x64d5d5b1 - DD 0xd24e4e9c,0xd24e4e9c - DD 0xe0a9a949,0xe0a9a949 - DD 0xb46c6cd8,0xb46c6cd8 - DD 0xfa5656ac,0xfa5656ac - DD 0x07f4f4f3,0x07f4f4f3 - DD 0x25eaeacf,0x25eaeacf - DD 0xaf6565ca,0xaf6565ca - DD 0x8e7a7af4,0x8e7a7af4 - DD 0xe9aeae47,0xe9aeae47 - DD 0x18080810,0x18080810 - DD 0xd5baba6f,0xd5baba6f - DD 0x887878f0,0x887878f0 - DD 0x6f25254a,0x6f25254a - DD 0x722e2e5c,0x722e2e5c - DD 0x241c1c38,0x241c1c38 - DD 0xf1a6a657,0xf1a6a657 - DD 0xc7b4b473,0xc7b4b473 - DD 0x51c6c697,0x51c6c697 - DD 0x23e8e8cb,0x23e8e8cb - DD 0x7cdddda1,0x7cdddda1 - DD 0x9c7474e8,0x9c7474e8 - DD 0x211f1f3e,0x211f1f3e - DD 0xdd4b4b96,0xdd4b4b96 - DD 0xdcbdbd61,0xdcbdbd61 - DD 0x868b8b0d,0x868b8b0d - DD 0x858a8a0f,0x858a8a0f - DD 0x907070e0,0x907070e0 - DD 0x423e3e7c,0x423e3e7c - DD 0xc4b5b571,0xc4b5b571 - DD 0xaa6666cc,0xaa6666cc - DD 0xd8484890,0xd8484890 - DD 0x05030306,0x05030306 - DD 0x01f6f6f7,0x01f6f6f7 - DD 0x120e0e1c,0x120e0e1c - DD 0xa36161c2,0xa36161c2 - DD 0x5f35356a,0x5f35356a - DD 0xf95757ae,0xf95757ae - DD 0xd0b9b969,0xd0b9b969 - DD 0x91868617,0x91868617 - DD 0x58c1c199,0x58c1c199 - DD 0x271d1d3a,0x271d1d3a - DD 0xb99e9e27,0xb99e9e27 - DD 0x38e1e1d9,0x38e1e1d9 - DD 0x13f8f8eb,0x13f8f8eb - DD 0xb398982b,0xb398982b - DD 0x33111122,0x33111122 - DD 0xbb6969d2,0xbb6969d2 - DD 0x70d9d9a9,0x70d9d9a9 - DD 0x898e8e07,0x898e8e07 - DD 0xa7949433,0xa7949433 - DD 0xb69b9b2d,0xb69b9b2d - DD 0x221e1e3c,0x221e1e3c - DD 0x92878715,0x92878715 - DD 0x20e9e9c9,0x20e9e9c9 - DD 0x49cece87,0x49cece87 - DD 0xff5555aa,0xff5555aa - DD 0x78282850,0x78282850 - DD 0x7adfdfa5,0x7adfdfa5 - DD 0x8f8c8c03,0x8f8c8c03 - DD 0xf8a1a159,0xf8a1a159 - DD 0x80898909,0x80898909 - DD 0x170d0d1a,0x170d0d1a - DD 0xdabfbf65,0xdabfbf65 - DD 0x31e6e6d7,0x31e6e6d7 - DD 0xc6424284,0xc6424284 - DD 0xb86868d0,0xb86868d0 - DD 0xc3414182,0xc3414182 - DD 0xb0999929,0xb0999929 - DD 0x772d2d5a,0x772d2d5a - DD 0x110f0f1e,0x110f0f1e - DD 0xcbb0b07b,0xcbb0b07b - DD 0xfc5454a8,0xfc5454a8 - DD 0xd6bbbb6d,0xd6bbbb6d - DD 0x3a16162c,0x3a16162c -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -DB 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -DB 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -DB 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -DB 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -DB 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -DB 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -DB 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -DB 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -DB 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -DB 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -DB 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -DB 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -DB 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -DB 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -DB 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -DB 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -DB 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -DB 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -DB 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -DB 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -DB 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -DB 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -DB 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -DB 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -DB 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -DB 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -DB 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -DB 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -DB 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -DB 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -DB 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -DB 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 - DD 0x00000001,0x00000002,0x00000004,0x00000008 - DD 0x00000010,0x00000020,0x00000040,0x00000080 - DD 0x0000001b,0x00000036,0x80808080,0x80808080 - DD 0xfefefefe,0xfefefefe,0x1b1b1b1b,0x1b1b1b1b -ALIGN 64 -$L$AES_Td: - DD 0x50a7f451,0x50a7f451 - DD 0x5365417e,0x5365417e - DD 0xc3a4171a,0xc3a4171a - DD 0x965e273a,0x965e273a - DD 0xcb6bab3b,0xcb6bab3b - DD 0xf1459d1f,0xf1459d1f - DD 0xab58faac,0xab58faac - DD 0x9303e34b,0x9303e34b - DD 0x55fa3020,0x55fa3020 - DD 0xf66d76ad,0xf66d76ad - DD 0x9176cc88,0x9176cc88 - DD 0x254c02f5,0x254c02f5 - DD 0xfcd7e54f,0xfcd7e54f - DD 0xd7cb2ac5,0xd7cb2ac5 - DD 0x80443526,0x80443526 - DD 0x8fa362b5,0x8fa362b5 - DD 0x495ab1de,0x495ab1de - DD 0x671bba25,0x671bba25 - DD 0x980eea45,0x980eea45 - DD 0xe1c0fe5d,0xe1c0fe5d - DD 0x02752fc3,0x02752fc3 - DD 0x12f04c81,0x12f04c81 - DD 0xa397468d,0xa397468d - DD 0xc6f9d36b,0xc6f9d36b - DD 0xe75f8f03,0xe75f8f03 - DD 0x959c9215,0x959c9215 - DD 0xeb7a6dbf,0xeb7a6dbf - DD 0xda595295,0xda595295 - DD 0x2d83bed4,0x2d83bed4 - DD 0xd3217458,0xd3217458 - DD 0x2969e049,0x2969e049 - DD 0x44c8c98e,0x44c8c98e - DD 0x6a89c275,0x6a89c275 - DD 0x78798ef4,0x78798ef4 - DD 0x6b3e5899,0x6b3e5899 - DD 0xdd71b927,0xdd71b927 - DD 0xb64fe1be,0xb64fe1be - DD 0x17ad88f0,0x17ad88f0 - DD 0x66ac20c9,0x66ac20c9 - DD 0xb43ace7d,0xb43ace7d - DD 0x184adf63,0x184adf63 - DD 0x82311ae5,0x82311ae5 - DD 0x60335197,0x60335197 - DD 0x457f5362,0x457f5362 - DD 0xe07764b1,0xe07764b1 - DD 0x84ae6bbb,0x84ae6bbb - DD 0x1ca081fe,0x1ca081fe - DD 0x942b08f9,0x942b08f9 - DD 0x58684870,0x58684870 - DD 0x19fd458f,0x19fd458f - DD 0x876cde94,0x876cde94 - DD 0xb7f87b52,0xb7f87b52 - DD 0x23d373ab,0x23d373ab - DD 0xe2024b72,0xe2024b72 - DD 0x578f1fe3,0x578f1fe3 - DD 0x2aab5566,0x2aab5566 - DD 0x0728ebb2,0x0728ebb2 - DD 0x03c2b52f,0x03c2b52f - DD 0x9a7bc586,0x9a7bc586 - DD 0xa50837d3,0xa50837d3 - DD 0xf2872830,0xf2872830 - DD 0xb2a5bf23,0xb2a5bf23 - DD 0xba6a0302,0xba6a0302 - DD 0x5c8216ed,0x5c8216ed - DD 0x2b1ccf8a,0x2b1ccf8a - DD 0x92b479a7,0x92b479a7 - DD 0xf0f207f3,0xf0f207f3 - DD 0xa1e2694e,0xa1e2694e - DD 0xcdf4da65,0xcdf4da65 - DD 0xd5be0506,0xd5be0506 - DD 0x1f6234d1,0x1f6234d1 - DD 0x8afea6c4,0x8afea6c4 - DD 0x9d532e34,0x9d532e34 - DD 0xa055f3a2,0xa055f3a2 - DD 0x32e18a05,0x32e18a05 - DD 0x75ebf6a4,0x75ebf6a4 - DD 0x39ec830b,0x39ec830b - DD 0xaaef6040,0xaaef6040 - DD 0x069f715e,0x069f715e - DD 0x51106ebd,0x51106ebd - DD 0xf98a213e,0xf98a213e - DD 0x3d06dd96,0x3d06dd96 - DD 0xae053edd,0xae053edd - DD 0x46bde64d,0x46bde64d - DD 0xb58d5491,0xb58d5491 - DD 0x055dc471,0x055dc471 - DD 0x6fd40604,0x6fd40604 - DD 0xff155060,0xff155060 - DD 0x24fb9819,0x24fb9819 - DD 0x97e9bdd6,0x97e9bdd6 - DD 0xcc434089,0xcc434089 - DD 0x779ed967,0x779ed967 - DD 0xbd42e8b0,0xbd42e8b0 - DD 0x888b8907,0x888b8907 - DD 0x385b19e7,0x385b19e7 - DD 0xdbeec879,0xdbeec879 - DD 0x470a7ca1,0x470a7ca1 - DD 0xe90f427c,0xe90f427c - DD 0xc91e84f8,0xc91e84f8 - DD 0x00000000,0x00000000 - DD 0x83868009,0x83868009 - DD 0x48ed2b32,0x48ed2b32 - DD 0xac70111e,0xac70111e - DD 0x4e725a6c,0x4e725a6c - DD 0xfbff0efd,0xfbff0efd - DD 0x5638850f,0x5638850f - DD 0x1ed5ae3d,0x1ed5ae3d - DD 0x27392d36,0x27392d36 - DD 0x64d90f0a,0x64d90f0a - DD 0x21a65c68,0x21a65c68 - DD 0xd1545b9b,0xd1545b9b - DD 0x3a2e3624,0x3a2e3624 - DD 0xb1670a0c,0xb1670a0c - DD 0x0fe75793,0x0fe75793 - DD 0xd296eeb4,0xd296eeb4 - DD 0x9e919b1b,0x9e919b1b - DD 0x4fc5c080,0x4fc5c080 - DD 0xa220dc61,0xa220dc61 - DD 0x694b775a,0x694b775a - DD 0x161a121c,0x161a121c - DD 0x0aba93e2,0x0aba93e2 - DD 0xe52aa0c0,0xe52aa0c0 - DD 0x43e0223c,0x43e0223c - DD 0x1d171b12,0x1d171b12 - DD 0x0b0d090e,0x0b0d090e - DD 0xadc78bf2,0xadc78bf2 - DD 0xb9a8b62d,0xb9a8b62d - DD 0xc8a91e14,0xc8a91e14 - DD 0x8519f157,0x8519f157 - DD 0x4c0775af,0x4c0775af - DD 0xbbdd99ee,0xbbdd99ee - DD 0xfd607fa3,0xfd607fa3 - DD 0x9f2601f7,0x9f2601f7 - DD 0xbcf5725c,0xbcf5725c - DD 0xc53b6644,0xc53b6644 - DD 0x347efb5b,0x347efb5b - DD 0x7629438b,0x7629438b - DD 0xdcc623cb,0xdcc623cb - DD 0x68fcedb6,0x68fcedb6 - DD 0x63f1e4b8,0x63f1e4b8 - DD 0xcadc31d7,0xcadc31d7 - DD 0x10856342,0x10856342 - DD 0x40229713,0x40229713 - DD 0x2011c684,0x2011c684 - DD 0x7d244a85,0x7d244a85 - DD 0xf83dbbd2,0xf83dbbd2 - DD 0x1132f9ae,0x1132f9ae - DD 0x6da129c7,0x6da129c7 - DD 0x4b2f9e1d,0x4b2f9e1d - DD 0xf330b2dc,0xf330b2dc - DD 0xec52860d,0xec52860d - DD 0xd0e3c177,0xd0e3c177 - DD 0x6c16b32b,0x6c16b32b - DD 0x99b970a9,0x99b970a9 - DD 0xfa489411,0xfa489411 - DD 0x2264e947,0x2264e947 - DD 0xc48cfca8,0xc48cfca8 - DD 0x1a3ff0a0,0x1a3ff0a0 - DD 0xd82c7d56,0xd82c7d56 - DD 0xef903322,0xef903322 - DD 0xc74e4987,0xc74e4987 - DD 0xc1d138d9,0xc1d138d9 - DD 0xfea2ca8c,0xfea2ca8c - DD 0x360bd498,0x360bd498 - DD 0xcf81f5a6,0xcf81f5a6 - DD 0x28de7aa5,0x28de7aa5 - DD 0x268eb7da,0x268eb7da - DD 0xa4bfad3f,0xa4bfad3f - DD 0xe49d3a2c,0xe49d3a2c - DD 0x0d927850,0x0d927850 - DD 0x9bcc5f6a,0x9bcc5f6a - DD 0x62467e54,0x62467e54 - DD 0xc2138df6,0xc2138df6 - DD 0xe8b8d890,0xe8b8d890 - DD 0x5ef7392e,0x5ef7392e - DD 0xf5afc382,0xf5afc382 - DD 0xbe805d9f,0xbe805d9f - DD 0x7c93d069,0x7c93d069 - DD 0xa92dd56f,0xa92dd56f - DD 0xb31225cf,0xb31225cf - DD 0x3b99acc8,0x3b99acc8 - DD 0xa77d1810,0xa77d1810 - DD 0x6e639ce8,0x6e639ce8 - DD 0x7bbb3bdb,0x7bbb3bdb - DD 0x097826cd,0x097826cd - DD 0xf418596e,0xf418596e - DD 0x01b79aec,0x01b79aec - DD 0xa89a4f83,0xa89a4f83 - DD 0x656e95e6,0x656e95e6 - DD 0x7ee6ffaa,0x7ee6ffaa - DD 0x08cfbc21,0x08cfbc21 - DD 0xe6e815ef,0xe6e815ef - DD 0xd99be7ba,0xd99be7ba - DD 0xce366f4a,0xce366f4a - DD 0xd4099fea,0xd4099fea - DD 0xd67cb029,0xd67cb029 - DD 0xafb2a431,0xafb2a431 - DD 0x31233f2a,0x31233f2a - DD 0x3094a5c6,0x3094a5c6 - DD 0xc066a235,0xc066a235 - DD 0x37bc4e74,0x37bc4e74 - DD 0xa6ca82fc,0xa6ca82fc - DD 0xb0d090e0,0xb0d090e0 - DD 0x15d8a733,0x15d8a733 - DD 0x4a9804f1,0x4a9804f1 - DD 0xf7daec41,0xf7daec41 - DD 0x0e50cd7f,0x0e50cd7f - DD 0x2ff69117,0x2ff69117 - DD 0x8dd64d76,0x8dd64d76 - DD 0x4db0ef43,0x4db0ef43 - DD 0x544daacc,0x544daacc - DD 0xdf0496e4,0xdf0496e4 - DD 0xe3b5d19e,0xe3b5d19e - DD 0x1b886a4c,0x1b886a4c - DD 0xb81f2cc1,0xb81f2cc1 - DD 0x7f516546,0x7f516546 - DD 0x04ea5e9d,0x04ea5e9d - DD 0x5d358c01,0x5d358c01 - DD 0x737487fa,0x737487fa - DD 0x2e410bfb,0x2e410bfb - DD 0x5a1d67b3,0x5a1d67b3 - DD 0x52d2db92,0x52d2db92 - DD 0x335610e9,0x335610e9 - DD 0x1347d66d,0x1347d66d - DD 0x8c61d79a,0x8c61d79a - DD 0x7a0ca137,0x7a0ca137 - DD 0x8e14f859,0x8e14f859 - DD 0x893c13eb,0x893c13eb - DD 0xee27a9ce,0xee27a9ce - DD 0x35c961b7,0x35c961b7 - DD 0xede51ce1,0xede51ce1 - DD 0x3cb1477a,0x3cb1477a - DD 0x59dfd29c,0x59dfd29c - DD 0x3f73f255,0x3f73f255 - DD 0x79ce1418,0x79ce1418 - DD 0xbf37c773,0xbf37c773 - DD 0xeacdf753,0xeacdf753 - DD 0x5baafd5f,0x5baafd5f - DD 0x146f3ddf,0x146f3ddf - DD 0x86db4478,0x86db4478 - DD 0x81f3afca,0x81f3afca - DD 0x3ec468b9,0x3ec468b9 - DD 0x2c342438,0x2c342438 - DD 0x5f40a3c2,0x5f40a3c2 - DD 0x72c31d16,0x72c31d16 - DD 0x0c25e2bc,0x0c25e2bc - DD 0x8b493c28,0x8b493c28 - DD 0x41950dff,0x41950dff - DD 0x7101a839,0x7101a839 - DD 0xdeb30c08,0xdeb30c08 - DD 0x9ce4b4d8,0x9ce4b4d8 - DD 0x90c15664,0x90c15664 - DD 0x6184cb7b,0x6184cb7b - DD 0x70b632d5,0x70b632d5 - DD 0x745c6c48,0x745c6c48 - DD 0x4257b8d0,0x4257b8d0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -DB 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -DB 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -DB 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -DB 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -DB 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -DB 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -DB 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -DB 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -DB 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -DB 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -DB 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -DB 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -DB 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -DB 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -DB 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -DB 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -DB 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -DB 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -DB 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -DB 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -DB 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -DB 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -DB 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -DB 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -DB 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -DB 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -DB 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -DB 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -DB 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -DB 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -DB 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d - DD 0x80808080,0x80808080,0xfefefefe,0xfefefefe - DD 0x1b1b1b1b,0x1b1b1b1b,0,0 -DB 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32 -DB 67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97 -DB 112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103 -DB 62,0 -ALIGN 64 -EXTERN __imp_RtlVirtualUnwind - -ALIGN 16 -block_se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - mov rsi,QWORD[8+r9] - mov r11,QWORD[56+r9] - - mov r10d,DWORD[r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jb NEAR $L$in_block_prologue - - mov rax,QWORD[152+r8] - - mov r10d,DWORD[4+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_block_prologue - - mov rax,QWORD[24+rax] - - mov rbx,QWORD[((-8))+rax] - mov rbp,QWORD[((-16))+rax] - mov r12,QWORD[((-24))+rax] - mov r13,QWORD[((-32))+rax] - mov r14,QWORD[((-40))+rax] - mov r15,QWORD[((-48))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_block_prologue: - mov rdi,QWORD[8+rax] - mov rsi,QWORD[16+rax] - mov QWORD[152+r8],rax - mov QWORD[168+r8],rsi - mov QWORD[176+r8],rdi - - jmp NEAR $L$common_seh_exit - - - -ALIGN 16 -key_se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - mov rsi,QWORD[8+r9] - mov r11,QWORD[56+r9] - - mov r10d,DWORD[r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jb NEAR $L$in_key_prologue - - mov rax,QWORD[152+r8] - - mov r10d,DWORD[4+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_key_prologue - - lea rax,[56+rax] - - mov rbx,QWORD[((-8))+rax] - mov rbp,QWORD[((-16))+rax] - mov r12,QWORD[((-24))+rax] - mov r13,QWORD[((-32))+rax] - mov r14,QWORD[((-40))+rax] - mov r15,QWORD[((-48))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_key_prologue: - mov rdi,QWORD[8+rax] - mov rsi,QWORD[16+rax] - mov QWORD[152+r8],rax - mov QWORD[168+r8],rsi - mov QWORD[176+r8],rdi - - jmp NEAR $L$common_seh_exit - - - -ALIGN 16 -cbc_se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - lea r10,[$L$cbc_prologue] - cmp rbx,r10 - jb NEAR $L$in_cbc_prologue - - lea r10,[$L$cbc_fast_body] - cmp rbx,r10 - jb NEAR $L$in_cbc_frame_setup - - lea r10,[$L$cbc_slow_prologue] - cmp rbx,r10 - jb NEAR $L$in_cbc_body - - lea r10,[$L$cbc_slow_body] - cmp rbx,r10 - jb NEAR $L$in_cbc_frame_setup - -$L$in_cbc_body: - mov rax,QWORD[152+r8] - - lea r10,[$L$cbc_epilogue] - cmp rbx,r10 - jae NEAR $L$in_cbc_prologue - - lea rax,[8+rax] - - lea r10,[$L$cbc_popfq] - cmp rbx,r10 - jae NEAR $L$in_cbc_prologue - - mov rax,QWORD[8+rax] - lea rax,[56+rax] - -$L$in_cbc_frame_setup: - mov rbx,QWORD[((-16))+rax] - mov rbp,QWORD[((-24))+rax] - mov r12,QWORD[((-32))+rax] - mov r13,QWORD[((-40))+rax] - mov r14,QWORD[((-48))+rax] - mov r15,QWORD[((-56))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_cbc_prologue: - mov rdi,QWORD[8+rax] - mov rsi,QWORD[16+rax] - mov QWORD[152+r8],rax - mov QWORD[168+r8],rsi - mov QWORD[176+r8],rdi - -$L$common_seh_exit: - - mov rdi,QWORD[40+r9] - mov rsi,r8 - mov ecx,154 - DD 0xa548f3fc - - mov rsi,r9 - xor rcx,rcx - mov rdx,QWORD[8+rsi] - mov r8,QWORD[rsi] - mov r9,QWORD[16+rsi] - mov r10,QWORD[40+rsi] - lea r11,[56+rsi] - lea r12,[24+rsi] - mov QWORD[32+rsp],r10 - mov QWORD[40+rsp],r11 - mov QWORD[48+rsp],r12 - mov QWORD[56+rsp],rcx - call QWORD[__imp_RtlVirtualUnwind] - - mov eax,1 - add rsp,64 - popfq - pop r15 - pop r14 - pop r13 - pop r12 - pop rbp - pop rbx - pop rdi - pop rsi - DB 0F3h,0C3h ;repret - - -section .pdata rdata align=4 -ALIGN 4 - DD $L$SEH_begin_AES_encrypt wrt ..imagebase - DD $L$SEH_end_AES_encrypt wrt ..imagebase - DD $L$SEH_info_AES_encrypt wrt ..imagebase - - DD $L$SEH_begin_AES_decrypt wrt ..imagebase - DD $L$SEH_end_AES_decrypt wrt ..imagebase - DD $L$SEH_info_AES_decrypt wrt ..imagebase - - DD $L$SEH_begin_AES_set_encrypt_key wrt ..imagebase - DD $L$SEH_end_AES_set_encrypt_key wrt ..imagebase - DD $L$SEH_info_AES_set_encrypt_key wrt ..imagebase - - DD $L$SEH_begin_AES_set_decrypt_key wrt ..imagebase - DD $L$SEH_end_AES_set_decrypt_key wrt ..imagebase - DD $L$SEH_info_AES_set_decrypt_key wrt ..imagebase - - DD $L$SEH_begin_AES_cbc_encrypt wrt ..imagebase - DD $L$SEH_end_AES_cbc_encrypt wrt ..imagebase - DD $L$SEH_info_AES_cbc_encrypt wrt ..imagebase - -section .xdata rdata align=8 -ALIGN 8 -$L$SEH_info_AES_encrypt: -DB 9,0,0,0 - DD block_se_handler wrt ..imagebase - DD $L$enc_prologue wrt ..imagebase,$L$enc_epilogue wrt ..imagebase -$L$SEH_info_AES_decrypt: -DB 9,0,0,0 - DD block_se_handler wrt ..imagebase - DD $L$dec_prologue wrt ..imagebase,$L$dec_epilogue wrt ..imagebase -$L$SEH_info_AES_set_encrypt_key: -DB 9,0,0,0 - DD key_se_handler wrt ..imagebase - DD $L$enc_key_prologue wrt ..imagebase,$L$enc_key_epilogue wrt ..imagebase -$L$SEH_info_AES_set_decrypt_key: -DB 9,0,0,0 - DD key_se_handler wrt ..imagebase - DD $L$dec_key_prologue wrt ..imagebase,$L$dec_key_epilogue wrt ..imagebase -$L$SEH_info_AES_cbc_encrypt: -DB 9,0,0,0 - DD cbc_se_handler wrt ..imagebase diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm index 925d1be94a94c9..ac71215c45e2dc 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm @@ -11,6 +11,7 @@ global aesni_cbc_sha1_enc ALIGN 32 aesni_cbc_sha1_enc: + mov r10d,DWORD[((OPENSSL_ia32cap_P+0))] mov r11,QWORD[((OPENSSL_ia32cap_P+4))] bt r11,61 @@ -24,6 +25,7 @@ aesni_cbc_sha1_enc: DB 0F3h,0C3h ;repret + ALIGN 32 aesni_cbc_sha1_enc_ssse3: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -2809,6 +2811,7 @@ $L$SEH_begin_aesni_cbc_sha1_enc_shaext: mov r9,QWORD[48+rsp] + mov r10,QWORD[56+rsp] lea rsp,[((-168))+rsp] movaps XMMWORD[(-8-160)+rax],xmm6 @@ -3133,6 +3136,7 @@ $L$epilogue_shaext: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_cbc_sha1_enc_shaext: EXTERN __imp_RtlVirtualUnwind diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm index b5d50c74dbaaee..17e571d38b1846 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm @@ -10,6 +10,7 @@ global aesni_cbc_sha256_enc ALIGN 16 aesni_cbc_sha256_enc: + lea r11,[OPENSSL_ia32cap_P] mov eax,1 cmp rcx,0 @@ -37,6 +38,7 @@ $L$probe: DB 0F3h,0C3h ;repret + ALIGN 64 K256: @@ -4128,23 +4130,25 @@ $L$ower_avx2: jbe NEAR $L$oop_avx2 lea rbp,[rsp] + + + $L$done_avx2: - lea rsp,[rbp] - mov r8,QWORD[((64+32))+rsp] - mov rsi,QWORD[120+rsp] + mov r8,QWORD[((64+32))+rbp] + mov rsi,QWORD[((64+56))+rbp] vmovdqu XMMWORD[r8],xmm8 vzeroall - movaps xmm6,XMMWORD[128+rsp] - movaps xmm7,XMMWORD[144+rsp] - movaps xmm8,XMMWORD[160+rsp] - movaps xmm9,XMMWORD[176+rsp] - movaps xmm10,XMMWORD[192+rsp] - movaps xmm11,XMMWORD[208+rsp] - movaps xmm12,XMMWORD[224+rsp] - movaps xmm13,XMMWORD[240+rsp] - movaps xmm14,XMMWORD[256+rsp] - movaps xmm15,XMMWORD[272+rsp] + movaps xmm6,XMMWORD[128+rbp] + movaps xmm7,XMMWORD[144+rbp] + movaps xmm8,XMMWORD[160+rbp] + movaps xmm9,XMMWORD[176+rbp] + movaps xmm10,XMMWORD[192+rbp] + movaps xmm11,XMMWORD[208+rbp] + movaps xmm12,XMMWORD[224+rbp] + movaps xmm13,XMMWORD[240+rbp] + movaps xmm14,XMMWORD[256+rbp] + movaps xmm15,XMMWORD[272+rbp] mov r15,QWORD[((-48))+rsi] mov r14,QWORD[((-40))+rsi] @@ -4180,6 +4184,7 @@ $L$SEH_begin_aesni_cbc_sha256_enc_shaext: mov r9,QWORD[48+rsp] + mov r10,QWORD[56+rsp] lea rsp,[((-168))+rsp] movaps XMMWORD[(-8-160)+rax],xmm6 @@ -4555,6 +4560,7 @@ $L$epilogue_shaext: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_cbc_sha256_enc_shaext: EXTERN __imp_RtlVirtualUnwind diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm index 823ba771d0a3af..f6027245a377a7 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm @@ -907,6 +907,7 @@ $L$SEH_begin_aesni_ccm64_encrypt_blocks: mov r9,QWORD[48+rsp] + lea rsp,[((-88))+rsp] movaps XMMWORD[rsp],xmm6 movaps XMMWORD[16+rsp],xmm7 @@ -983,6 +984,7 @@ $L$ccm64_enc_ret: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_ccm64_encrypt_blocks: global aesni_ccm64_decrypt_blocks @@ -1000,6 +1002,7 @@ $L$SEH_begin_aesni_ccm64_decrypt_blocks: mov r9,QWORD[48+rsp] + lea rsp,[((-88))+rsp] movaps XMMWORD[rsp],xmm6 movaps XMMWORD[16+rsp],xmm7 @@ -1110,6 +1113,7 @@ $L$ccm64_dec_ret: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_aesni_ccm64_decrypt_blocks: global aesni_ctr32_encrypt_blocks @@ -3019,6 +3023,7 @@ $L$SEH_end_aesni_ocb_encrypt: ALIGN 32 __ocb_encrypt6: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3119,8 +3124,10 @@ DB 102,65,15,56,221,255 + ALIGN 32 __ocb_encrypt4: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3188,8 +3195,10 @@ DB 102,65,15,56,221,237 + ALIGN 32 __ocb_encrypt1: + pxor xmm7,xmm15 pxor xmm7,xmm9 pxor xmm8,xmm2 @@ -3222,6 +3231,7 @@ DB 102,15,56,221,215 DB 0F3h,0C3h ;repret + global aesni_ocb_decrypt ALIGN 32 @@ -3493,6 +3503,7 @@ $L$SEH_end_aesni_ocb_decrypt: ALIGN 32 __ocb_decrypt6: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3587,8 +3598,10 @@ DB 102,65,15,56,223,255 + ALIGN 32 __ocb_decrypt4: + pxor xmm15,xmm9 movdqu xmm11,XMMWORD[r12*1+rbx] movdqa xmm12,xmm10 @@ -3652,8 +3665,10 @@ DB 102,65,15,56,223,237 + ALIGN 32 __ocb_decrypt1: + pxor xmm7,xmm15 pxor xmm7,xmm9 pxor xmm2,xmm7 @@ -3684,6 +3699,7 @@ DB 102,15,56,222,209 DB 102,15,56,223,215 DB 0F3h,0C3h ;repret + global aesni_cbc_encrypt ALIGN 16 @@ -4662,7 +4678,6 @@ $L$enc_key_ret: add rsp,8 DB 0F3h,0C3h ;repret - $L$SEH_end_set_encrypt_key: ALIGN 16 @@ -4735,6 +4750,7 @@ $L$key_expansion_256b: DB 0F3h,0C3h ;repret + ALIGN 64 $L$bswap_mask: DB 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/bsaes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/bsaes-x86_64.asm deleted file mode 100644 index 7cccb6a46983c4..00000000000000 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/bsaes-x86_64.asm +++ /dev/null @@ -1,2821 +0,0 @@ -default rel -%define XMMWORD -%define YMMWORD -%define ZMMWORD -section .text code align=64 - - -EXTERN asm_AES_encrypt -EXTERN asm_AES_decrypt - - -ALIGN 64 -_bsaes_encrypt8: - - lea r11,[$L$BS0] - - movdqa xmm8,XMMWORD[rax] - lea rax,[16+rax] - movdqa xmm7,XMMWORD[80+r11] - pxor xmm15,xmm8 - pxor xmm0,xmm8 - pxor xmm1,xmm8 - pxor xmm2,xmm8 -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,xmm8 - pxor xmm4,xmm8 -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,xmm8 - pxor xmm6,xmm8 -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm5 - psrlq xmm5,1 - movdqa xmm10,xmm3 - psrlq xmm3,1 - pxor xmm5,xmm6 - pxor xmm3,xmm4 - pand xmm5,xmm7 - pand xmm3,xmm7 - pxor xmm6,xmm5 - psllq xmm5,1 - pxor xmm4,xmm3 - psllq xmm3,1 - pxor xmm5,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm1 - psrlq xmm1,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm1,xmm2 - pxor xmm15,xmm0 - pand xmm1,xmm7 - pand xmm15,xmm7 - pxor xmm2,xmm1 - psllq xmm1,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm1,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm4 - psrlq xmm4,2 - movdqa xmm10,xmm3 - psrlq xmm3,2 - pxor xmm4,xmm6 - pxor xmm3,xmm5 - pand xmm4,xmm8 - pand xmm3,xmm8 - pxor xmm6,xmm4 - psllq xmm4,2 - pxor xmm5,xmm3 - psllq xmm3,2 - pxor xmm4,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm2 - pxor xmm15,xmm1 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm2,xmm0 - psllq xmm0,2 - pxor xmm1,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm2 - psrlq xmm2,4 - movdqa xmm10,xmm1 - psrlq xmm1,4 - pxor xmm2,xmm6 - pxor xmm1,xmm5 - pand xmm2,xmm7 - pand xmm1,xmm7 - pxor xmm6,xmm2 - psllq xmm2,4 - pxor xmm5,xmm1 - psllq xmm1,4 - pxor xmm2,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm4 - pxor xmm15,xmm3 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm4,xmm0 - psllq xmm0,4 - pxor xmm3,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - dec r10d - jmp NEAR $L$enc_sbox -ALIGN 16 -$L$enc_loop: - pxor xmm15,XMMWORD[rax] - pxor xmm0,XMMWORD[16+rax] - pxor xmm1,XMMWORD[32+rax] - pxor xmm2,XMMWORD[48+rax] -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,XMMWORD[64+rax] - pxor xmm4,XMMWORD[80+rax] -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,XMMWORD[96+rax] - pxor xmm6,XMMWORD[112+rax] -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - lea rax,[128+rax] -$L$enc_sbox: - pxor xmm4,xmm5 - pxor xmm1,xmm0 - pxor xmm2,xmm15 - pxor xmm5,xmm1 - pxor xmm4,xmm15 - - pxor xmm5,xmm2 - pxor xmm2,xmm6 - pxor xmm6,xmm4 - pxor xmm2,xmm3 - pxor xmm3,xmm4 - pxor xmm2,xmm0 - - pxor xmm1,xmm6 - pxor xmm0,xmm4 - movdqa xmm10,xmm6 - movdqa xmm9,xmm0 - movdqa xmm8,xmm4 - movdqa xmm12,xmm1 - movdqa xmm11,xmm5 - - pxor xmm10,xmm3 - pxor xmm9,xmm1 - pxor xmm8,xmm2 - movdqa xmm13,xmm10 - pxor xmm12,xmm3 - movdqa xmm7,xmm9 - pxor xmm11,xmm15 - movdqa xmm14,xmm10 - - por xmm9,xmm8 - por xmm10,xmm11 - pxor xmm14,xmm7 - pand xmm13,xmm11 - pxor xmm11,xmm8 - pand xmm7,xmm8 - pand xmm14,xmm11 - movdqa xmm11,xmm2 - pxor xmm11,xmm15 - pand xmm12,xmm11 - pxor xmm10,xmm12 - pxor xmm9,xmm12 - movdqa xmm12,xmm6 - movdqa xmm11,xmm4 - pxor xmm12,xmm0 - pxor xmm11,xmm5 - movdqa xmm8,xmm12 - pand xmm12,xmm11 - por xmm8,xmm11 - pxor xmm7,xmm12 - pxor xmm10,xmm14 - pxor xmm9,xmm13 - pxor xmm8,xmm14 - movdqa xmm11,xmm1 - pxor xmm7,xmm13 - movdqa xmm12,xmm3 - pxor xmm8,xmm13 - movdqa xmm13,xmm0 - pand xmm11,xmm2 - movdqa xmm14,xmm6 - pand xmm12,xmm15 - pand xmm13,xmm4 - por xmm14,xmm5 - pxor xmm10,xmm11 - pxor xmm9,xmm12 - pxor xmm8,xmm13 - pxor xmm7,xmm14 - - - - - - movdqa xmm11,xmm10 - pand xmm10,xmm8 - pxor xmm11,xmm9 - - movdqa xmm13,xmm7 - movdqa xmm14,xmm11 - pxor xmm13,xmm10 - pand xmm14,xmm13 - - movdqa xmm12,xmm8 - pxor xmm14,xmm9 - pxor xmm12,xmm7 - - pxor xmm10,xmm9 - - pand xmm12,xmm10 - - movdqa xmm9,xmm13 - pxor xmm12,xmm7 - - pxor xmm9,xmm12 - pxor xmm8,xmm12 - - pand xmm9,xmm7 - - pxor xmm13,xmm9 - pxor xmm8,xmm9 - - pand xmm13,xmm14 - - pxor xmm13,xmm11 - movdqa xmm11,xmm5 - movdqa xmm7,xmm4 - movdqa xmm9,xmm14 - pxor xmm9,xmm13 - pand xmm9,xmm5 - pxor xmm5,xmm4 - pand xmm4,xmm14 - pand xmm5,xmm13 - pxor xmm5,xmm4 - pxor xmm4,xmm9 - pxor xmm11,xmm15 - pxor xmm7,xmm2 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm15 - pxor xmm11,xmm7 - pxor xmm15,xmm2 - pand xmm7,xmm14 - pand xmm2,xmm12 - pand xmm11,xmm13 - pand xmm15,xmm8 - pxor xmm7,xmm11 - pxor xmm15,xmm2 - pxor xmm11,xmm10 - pxor xmm2,xmm9 - pxor xmm5,xmm11 - pxor xmm15,xmm11 - pxor xmm4,xmm7 - pxor xmm2,xmm7 - - movdqa xmm11,xmm6 - movdqa xmm7,xmm0 - pxor xmm11,xmm3 - pxor xmm7,xmm1 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm3 - pxor xmm11,xmm7 - pxor xmm3,xmm1 - pand xmm7,xmm14 - pand xmm1,xmm12 - pand xmm11,xmm13 - pand xmm3,xmm8 - pxor xmm7,xmm11 - pxor xmm3,xmm1 - pxor xmm11,xmm10 - pxor xmm1,xmm9 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - pxor xmm10,xmm13 - pand xmm10,xmm6 - pxor xmm6,xmm0 - pand xmm0,xmm14 - pand xmm6,xmm13 - pxor xmm6,xmm0 - pxor xmm0,xmm10 - pxor xmm6,xmm11 - pxor xmm3,xmm11 - pxor xmm0,xmm7 - pxor xmm1,xmm7 - pxor xmm6,xmm15 - pxor xmm0,xmm5 - pxor xmm3,xmm6 - pxor xmm5,xmm15 - pxor xmm15,xmm0 - - pxor xmm0,xmm4 - pxor xmm4,xmm1 - pxor xmm1,xmm2 - pxor xmm2,xmm4 - pxor xmm3,xmm4 - - pxor xmm5,xmm2 - dec r10d - jl NEAR $L$enc_done - pshufd xmm7,xmm15,0x93 - pshufd xmm8,xmm0,0x93 - pxor xmm15,xmm7 - pshufd xmm9,xmm3,0x93 - pxor xmm0,xmm8 - pshufd xmm10,xmm5,0x93 - pxor xmm3,xmm9 - pshufd xmm11,xmm2,0x93 - pxor xmm5,xmm10 - pshufd xmm12,xmm6,0x93 - pxor xmm2,xmm11 - pshufd xmm13,xmm1,0x93 - pxor xmm6,xmm12 - pshufd xmm14,xmm4,0x93 - pxor xmm1,xmm13 - pxor xmm4,xmm14 - - pxor xmm8,xmm15 - pxor xmm7,xmm4 - pxor xmm8,xmm4 - pshufd xmm15,xmm15,0x4E - pxor xmm9,xmm0 - pshufd xmm0,xmm0,0x4E - pxor xmm12,xmm2 - pxor xmm15,xmm7 - pxor xmm13,xmm6 - pxor xmm0,xmm8 - pxor xmm11,xmm5 - pshufd xmm7,xmm2,0x4E - pxor xmm14,xmm1 - pshufd xmm8,xmm6,0x4E - pxor xmm10,xmm3 - pshufd xmm2,xmm5,0x4E - pxor xmm10,xmm4 - pshufd xmm6,xmm4,0x4E - pxor xmm11,xmm4 - pshufd xmm5,xmm1,0x4E - pxor xmm7,xmm11 - pshufd xmm1,xmm3,0x4E - pxor xmm8,xmm12 - pxor xmm2,xmm10 - pxor xmm6,xmm14 - pxor xmm5,xmm13 - movdqa xmm3,xmm7 - pxor xmm1,xmm9 - movdqa xmm4,xmm8 - movdqa xmm7,XMMWORD[48+r11] - jnz NEAR $L$enc_loop - movdqa xmm7,XMMWORD[64+r11] - jmp NEAR $L$enc_loop -ALIGN 16 -$L$enc_done: - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm1 - psrlq xmm1,1 - movdqa xmm10,xmm2 - psrlq xmm2,1 - pxor xmm1,xmm4 - pxor xmm2,xmm6 - pand xmm1,xmm7 - pand xmm2,xmm7 - pxor xmm4,xmm1 - psllq xmm1,1 - pxor xmm6,xmm2 - psllq xmm2,1 - pxor xmm1,xmm9 - pxor xmm2,xmm10 - movdqa xmm9,xmm3 - psrlq xmm3,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm3,xmm5 - pxor xmm15,xmm0 - pand xmm3,xmm7 - pand xmm15,xmm7 - pxor xmm5,xmm3 - psllq xmm3,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm3,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm6 - psrlq xmm6,2 - movdqa xmm10,xmm2 - psrlq xmm2,2 - pxor xmm6,xmm4 - pxor xmm2,xmm1 - pand xmm6,xmm8 - pand xmm2,xmm8 - pxor xmm4,xmm6 - psllq xmm6,2 - pxor xmm1,xmm2 - psllq xmm2,2 - pxor xmm6,xmm9 - pxor xmm2,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm5 - pxor xmm15,xmm3 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm5,xmm0 - psllq xmm0,2 - pxor xmm3,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm5 - psrlq xmm5,4 - movdqa xmm10,xmm3 - psrlq xmm3,4 - pxor xmm5,xmm4 - pxor xmm3,xmm1 - pand xmm5,xmm7 - pand xmm3,xmm7 - pxor xmm4,xmm5 - psllq xmm5,4 - pxor xmm1,xmm3 - psllq xmm3,4 - pxor xmm5,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm6 - pxor xmm15,xmm2 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm6,xmm0 - psllq xmm0,4 - pxor xmm2,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[rax] - pxor xmm3,xmm7 - pxor xmm5,xmm7 - pxor xmm2,xmm7 - pxor xmm6,xmm7 - pxor xmm1,xmm7 - pxor xmm4,xmm7 - pxor xmm15,xmm7 - pxor xmm0,xmm7 - DB 0F3h,0C3h ;repret - - - - -ALIGN 64 -_bsaes_decrypt8: - - lea r11,[$L$BS0] - - movdqa xmm8,XMMWORD[rax] - lea rax,[16+rax] - movdqa xmm7,XMMWORD[((-48))+r11] - pxor xmm15,xmm8 - pxor xmm0,xmm8 - pxor xmm1,xmm8 - pxor xmm2,xmm8 -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,xmm8 - pxor xmm4,xmm8 -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,xmm8 - pxor xmm6,xmm8 -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm5 - psrlq xmm5,1 - movdqa xmm10,xmm3 - psrlq xmm3,1 - pxor xmm5,xmm6 - pxor xmm3,xmm4 - pand xmm5,xmm7 - pand xmm3,xmm7 - pxor xmm6,xmm5 - psllq xmm5,1 - pxor xmm4,xmm3 - psllq xmm3,1 - pxor xmm5,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm1 - psrlq xmm1,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm1,xmm2 - pxor xmm15,xmm0 - pand xmm1,xmm7 - pand xmm15,xmm7 - pxor xmm2,xmm1 - psllq xmm1,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm1,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm4 - psrlq xmm4,2 - movdqa xmm10,xmm3 - psrlq xmm3,2 - pxor xmm4,xmm6 - pxor xmm3,xmm5 - pand xmm4,xmm8 - pand xmm3,xmm8 - pxor xmm6,xmm4 - psllq xmm4,2 - pxor xmm5,xmm3 - psllq xmm3,2 - pxor xmm4,xmm9 - pxor xmm3,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm2 - pxor xmm15,xmm1 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm2,xmm0 - psllq xmm0,2 - pxor xmm1,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm2 - psrlq xmm2,4 - movdqa xmm10,xmm1 - psrlq xmm1,4 - pxor xmm2,xmm6 - pxor xmm1,xmm5 - pand xmm2,xmm7 - pand xmm1,xmm7 - pxor xmm6,xmm2 - psllq xmm2,4 - pxor xmm5,xmm1 - psllq xmm1,4 - pxor xmm2,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm4 - pxor xmm15,xmm3 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm4,xmm0 - psllq xmm0,4 - pxor xmm3,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - dec r10d - jmp NEAR $L$dec_sbox -ALIGN 16 -$L$dec_loop: - pxor xmm15,XMMWORD[rax] - pxor xmm0,XMMWORD[16+rax] - pxor xmm1,XMMWORD[32+rax] - pxor xmm2,XMMWORD[48+rax] -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,XMMWORD[64+rax] - pxor xmm4,XMMWORD[80+rax] -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,XMMWORD[96+rax] - pxor xmm6,XMMWORD[112+rax] -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - lea rax,[128+rax] -$L$dec_sbox: - pxor xmm2,xmm3 - - pxor xmm3,xmm6 - pxor xmm1,xmm6 - pxor xmm5,xmm3 - pxor xmm6,xmm5 - pxor xmm0,xmm6 - - pxor xmm15,xmm0 - pxor xmm1,xmm4 - pxor xmm2,xmm15 - pxor xmm4,xmm15 - pxor xmm0,xmm2 - movdqa xmm10,xmm2 - movdqa xmm9,xmm6 - movdqa xmm8,xmm0 - movdqa xmm12,xmm3 - movdqa xmm11,xmm4 - - pxor xmm10,xmm15 - pxor xmm9,xmm3 - pxor xmm8,xmm5 - movdqa xmm13,xmm10 - pxor xmm12,xmm15 - movdqa xmm7,xmm9 - pxor xmm11,xmm1 - movdqa xmm14,xmm10 - - por xmm9,xmm8 - por xmm10,xmm11 - pxor xmm14,xmm7 - pand xmm13,xmm11 - pxor xmm11,xmm8 - pand xmm7,xmm8 - pand xmm14,xmm11 - movdqa xmm11,xmm5 - pxor xmm11,xmm1 - pand xmm12,xmm11 - pxor xmm10,xmm12 - pxor xmm9,xmm12 - movdqa xmm12,xmm2 - movdqa xmm11,xmm0 - pxor xmm12,xmm6 - pxor xmm11,xmm4 - movdqa xmm8,xmm12 - pand xmm12,xmm11 - por xmm8,xmm11 - pxor xmm7,xmm12 - pxor xmm10,xmm14 - pxor xmm9,xmm13 - pxor xmm8,xmm14 - movdqa xmm11,xmm3 - pxor xmm7,xmm13 - movdqa xmm12,xmm15 - pxor xmm8,xmm13 - movdqa xmm13,xmm6 - pand xmm11,xmm5 - movdqa xmm14,xmm2 - pand xmm12,xmm1 - pand xmm13,xmm0 - por xmm14,xmm4 - pxor xmm10,xmm11 - pxor xmm9,xmm12 - pxor xmm8,xmm13 - pxor xmm7,xmm14 - - - - - - movdqa xmm11,xmm10 - pand xmm10,xmm8 - pxor xmm11,xmm9 - - movdqa xmm13,xmm7 - movdqa xmm14,xmm11 - pxor xmm13,xmm10 - pand xmm14,xmm13 - - movdqa xmm12,xmm8 - pxor xmm14,xmm9 - pxor xmm12,xmm7 - - pxor xmm10,xmm9 - - pand xmm12,xmm10 - - movdqa xmm9,xmm13 - pxor xmm12,xmm7 - - pxor xmm9,xmm12 - pxor xmm8,xmm12 - - pand xmm9,xmm7 - - pxor xmm13,xmm9 - pxor xmm8,xmm9 - - pand xmm13,xmm14 - - pxor xmm13,xmm11 - movdqa xmm11,xmm4 - movdqa xmm7,xmm0 - movdqa xmm9,xmm14 - pxor xmm9,xmm13 - pand xmm9,xmm4 - pxor xmm4,xmm0 - pand xmm0,xmm14 - pand xmm4,xmm13 - pxor xmm4,xmm0 - pxor xmm0,xmm9 - pxor xmm11,xmm1 - pxor xmm7,xmm5 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm1 - pxor xmm11,xmm7 - pxor xmm1,xmm5 - pand xmm7,xmm14 - pand xmm5,xmm12 - pand xmm11,xmm13 - pand xmm1,xmm8 - pxor xmm7,xmm11 - pxor xmm1,xmm5 - pxor xmm11,xmm10 - pxor xmm5,xmm9 - pxor xmm4,xmm11 - pxor xmm1,xmm11 - pxor xmm0,xmm7 - pxor xmm5,xmm7 - - movdqa xmm11,xmm2 - movdqa xmm7,xmm6 - pxor xmm11,xmm15 - pxor xmm7,xmm3 - movdqa xmm10,xmm14 - movdqa xmm9,xmm12 - pxor xmm10,xmm13 - pxor xmm9,xmm8 - pand xmm10,xmm11 - pand xmm9,xmm15 - pxor xmm11,xmm7 - pxor xmm15,xmm3 - pand xmm7,xmm14 - pand xmm3,xmm12 - pand xmm11,xmm13 - pand xmm15,xmm8 - pxor xmm7,xmm11 - pxor xmm15,xmm3 - pxor xmm11,xmm10 - pxor xmm3,xmm9 - pxor xmm14,xmm12 - pxor xmm13,xmm8 - movdqa xmm10,xmm14 - pxor xmm10,xmm13 - pand xmm10,xmm2 - pxor xmm2,xmm6 - pand xmm6,xmm14 - pand xmm2,xmm13 - pxor xmm2,xmm6 - pxor xmm6,xmm10 - pxor xmm2,xmm11 - pxor xmm15,xmm11 - pxor xmm6,xmm7 - pxor xmm3,xmm7 - pxor xmm0,xmm6 - pxor xmm5,xmm4 - - pxor xmm3,xmm0 - pxor xmm1,xmm6 - pxor xmm4,xmm6 - pxor xmm3,xmm1 - pxor xmm6,xmm15 - pxor xmm3,xmm4 - pxor xmm2,xmm5 - pxor xmm5,xmm0 - pxor xmm2,xmm3 - - pxor xmm3,xmm15 - pxor xmm6,xmm2 - dec r10d - jl NEAR $L$dec_done - - pshufd xmm7,xmm15,0x4E - pshufd xmm13,xmm2,0x4E - pxor xmm7,xmm15 - pshufd xmm14,xmm4,0x4E - pxor xmm13,xmm2 - pshufd xmm8,xmm0,0x4E - pxor xmm14,xmm4 - pshufd xmm9,xmm5,0x4E - pxor xmm8,xmm0 - pshufd xmm10,xmm3,0x4E - pxor xmm9,xmm5 - pxor xmm15,xmm13 - pxor xmm0,xmm13 - pshufd xmm11,xmm1,0x4E - pxor xmm10,xmm3 - pxor xmm5,xmm7 - pxor xmm3,xmm8 - pshufd xmm12,xmm6,0x4E - pxor xmm11,xmm1 - pxor xmm0,xmm14 - pxor xmm1,xmm9 - pxor xmm12,xmm6 - - pxor xmm5,xmm14 - pxor xmm3,xmm13 - pxor xmm1,xmm13 - pxor xmm6,xmm10 - pxor xmm2,xmm11 - pxor xmm1,xmm14 - pxor xmm6,xmm14 - pxor xmm4,xmm12 - pshufd xmm7,xmm15,0x93 - pshufd xmm8,xmm0,0x93 - pxor xmm15,xmm7 - pshufd xmm9,xmm5,0x93 - pxor xmm0,xmm8 - pshufd xmm10,xmm3,0x93 - pxor xmm5,xmm9 - pshufd xmm11,xmm1,0x93 - pxor xmm3,xmm10 - pshufd xmm12,xmm6,0x93 - pxor xmm1,xmm11 - pshufd xmm13,xmm2,0x93 - pxor xmm6,xmm12 - pshufd xmm14,xmm4,0x93 - pxor xmm2,xmm13 - pxor xmm4,xmm14 - - pxor xmm8,xmm15 - pxor xmm7,xmm4 - pxor xmm8,xmm4 - pshufd xmm15,xmm15,0x4E - pxor xmm9,xmm0 - pshufd xmm0,xmm0,0x4E - pxor xmm12,xmm1 - pxor xmm15,xmm7 - pxor xmm13,xmm6 - pxor xmm0,xmm8 - pxor xmm11,xmm3 - pshufd xmm7,xmm1,0x4E - pxor xmm14,xmm2 - pshufd xmm8,xmm6,0x4E - pxor xmm10,xmm5 - pshufd xmm1,xmm3,0x4E - pxor xmm10,xmm4 - pshufd xmm6,xmm4,0x4E - pxor xmm11,xmm4 - pshufd xmm3,xmm2,0x4E - pxor xmm7,xmm11 - pshufd xmm2,xmm5,0x4E - pxor xmm8,xmm12 - pxor xmm10,xmm1 - pxor xmm6,xmm14 - pxor xmm13,xmm3 - movdqa xmm3,xmm7 - pxor xmm2,xmm9 - movdqa xmm5,xmm13 - movdqa xmm4,xmm8 - movdqa xmm1,xmm2 - movdqa xmm2,xmm10 - movdqa xmm7,XMMWORD[((-16))+r11] - jnz NEAR $L$dec_loop - movdqa xmm7,XMMWORD[((-32))+r11] - jmp NEAR $L$dec_loop -ALIGN 16 -$L$dec_done: - movdqa xmm7,XMMWORD[r11] - movdqa xmm8,XMMWORD[16+r11] - movdqa xmm9,xmm2 - psrlq xmm2,1 - movdqa xmm10,xmm1 - psrlq xmm1,1 - pxor xmm2,xmm4 - pxor xmm1,xmm6 - pand xmm2,xmm7 - pand xmm1,xmm7 - pxor xmm4,xmm2 - psllq xmm2,1 - pxor xmm6,xmm1 - psllq xmm1,1 - pxor xmm2,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm5 - psrlq xmm5,1 - movdqa xmm10,xmm15 - psrlq xmm15,1 - pxor xmm5,xmm3 - pxor xmm15,xmm0 - pand xmm5,xmm7 - pand xmm15,xmm7 - pxor xmm3,xmm5 - psllq xmm5,1 - pxor xmm0,xmm15 - psllq xmm15,1 - pxor xmm5,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[32+r11] - movdqa xmm9,xmm6 - psrlq xmm6,2 - movdqa xmm10,xmm1 - psrlq xmm1,2 - pxor xmm6,xmm4 - pxor xmm1,xmm2 - pand xmm6,xmm8 - pand xmm1,xmm8 - pxor xmm4,xmm6 - psllq xmm6,2 - pxor xmm2,xmm1 - psllq xmm1,2 - pxor xmm6,xmm9 - pxor xmm1,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,2 - movdqa xmm10,xmm15 - psrlq xmm15,2 - pxor xmm0,xmm3 - pxor xmm15,xmm5 - pand xmm0,xmm8 - pand xmm15,xmm8 - pxor xmm3,xmm0 - psllq xmm0,2 - pxor xmm5,xmm15 - psllq xmm15,2 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm9,xmm3 - psrlq xmm3,4 - movdqa xmm10,xmm5 - psrlq xmm5,4 - pxor xmm3,xmm4 - pxor xmm5,xmm2 - pand xmm3,xmm7 - pand xmm5,xmm7 - pxor xmm4,xmm3 - psllq xmm3,4 - pxor xmm2,xmm5 - psllq xmm5,4 - pxor xmm3,xmm9 - pxor xmm5,xmm10 - movdqa xmm9,xmm0 - psrlq xmm0,4 - movdqa xmm10,xmm15 - psrlq xmm15,4 - pxor xmm0,xmm6 - pxor xmm15,xmm1 - pand xmm0,xmm7 - pand xmm15,xmm7 - pxor xmm6,xmm0 - psllq xmm0,4 - pxor xmm1,xmm15 - psllq xmm15,4 - pxor xmm0,xmm9 - pxor xmm15,xmm10 - movdqa xmm7,XMMWORD[rax] - pxor xmm5,xmm7 - pxor xmm3,xmm7 - pxor xmm1,xmm7 - pxor xmm6,xmm7 - pxor xmm2,xmm7 - pxor xmm4,xmm7 - pxor xmm15,xmm7 - pxor xmm0,xmm7 - DB 0F3h,0C3h ;repret - - - -ALIGN 16 -_bsaes_key_convert: - - lea r11,[$L$masks] - movdqu xmm7,XMMWORD[rcx] - lea rcx,[16+rcx] - movdqa xmm0,XMMWORD[r11] - movdqa xmm1,XMMWORD[16+r11] - movdqa xmm2,XMMWORD[32+r11] - movdqa xmm3,XMMWORD[48+r11] - movdqa xmm4,XMMWORD[64+r11] - pcmpeqd xmm5,xmm5 - - movdqu xmm6,XMMWORD[rcx] - movdqa XMMWORD[rax],xmm7 - lea rax,[16+rax] - dec r10d - jmp NEAR $L$key_loop -ALIGN 16 -$L$key_loop: -DB 102,15,56,0,244 - - movdqa xmm8,xmm0 - movdqa xmm9,xmm1 - - pand xmm8,xmm6 - pand xmm9,xmm6 - movdqa xmm10,xmm2 - pcmpeqb xmm8,xmm0 - psllq xmm0,4 - movdqa xmm11,xmm3 - pcmpeqb xmm9,xmm1 - psllq xmm1,4 - - pand xmm10,xmm6 - pand xmm11,xmm6 - movdqa xmm12,xmm0 - pcmpeqb xmm10,xmm2 - psllq xmm2,4 - movdqa xmm13,xmm1 - pcmpeqb xmm11,xmm3 - psllq xmm3,4 - - movdqa xmm14,xmm2 - movdqa xmm15,xmm3 - pxor xmm8,xmm5 - pxor xmm9,xmm5 - - pand xmm12,xmm6 - pand xmm13,xmm6 - movdqa XMMWORD[rax],xmm8 - pcmpeqb xmm12,xmm0 - psrlq xmm0,4 - movdqa XMMWORD[16+rax],xmm9 - pcmpeqb xmm13,xmm1 - psrlq xmm1,4 - lea rcx,[16+rcx] - - pand xmm14,xmm6 - pand xmm15,xmm6 - movdqa XMMWORD[32+rax],xmm10 - pcmpeqb xmm14,xmm2 - psrlq xmm2,4 - movdqa XMMWORD[48+rax],xmm11 - pcmpeqb xmm15,xmm3 - psrlq xmm3,4 - movdqu xmm6,XMMWORD[rcx] - - pxor xmm13,xmm5 - pxor xmm14,xmm5 - movdqa XMMWORD[64+rax],xmm12 - movdqa XMMWORD[80+rax],xmm13 - movdqa XMMWORD[96+rax],xmm14 - movdqa XMMWORD[112+rax],xmm15 - lea rax,[128+rax] - dec r10d - jnz NEAR $L$key_loop - - movdqa xmm7,XMMWORD[80+r11] - - DB 0F3h,0C3h ;repret - - -EXTERN asm_AES_cbc_encrypt -global bsaes_cbc_encrypt - -ALIGN 16 -bsaes_cbc_encrypt: - - mov r11d,DWORD[48+rsp] - cmp r11d,0 - jne NEAR asm_AES_cbc_encrypt - cmp r8,128 - jb NEAR asm_AES_cbc_encrypt - - mov rax,rsp -$L$cbc_dec_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$cbc_dec_body: - mov rbp,rsp - - mov eax,DWORD[240+r9] - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - mov rbx,r10 - shr r14,4 - - mov edx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,edx - call _bsaes_key_convert - pxor xmm7,XMMWORD[rsp] - movdqa XMMWORD[rax],xmm6 - movdqa XMMWORD[rsp],xmm7 - - movdqu xmm14,XMMWORD[rbx] - sub r14,8 -$L$cbc_dec_loop: - movdqu xmm15,XMMWORD[r12] - movdqu xmm0,XMMWORD[16+r12] - movdqu xmm1,XMMWORD[32+r12] - movdqu xmm2,XMMWORD[48+r12] - movdqu xmm3,XMMWORD[64+r12] - movdqu xmm4,XMMWORD[80+r12] - mov rax,rsp - movdqu xmm5,XMMWORD[96+r12] - mov r10d,edx - movdqu xmm6,XMMWORD[112+r12] - movdqa XMMWORD[32+rbp],xmm14 - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm6,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm2,xmm12 - movdqu xmm14,XMMWORD[112+r12] - pxor xmm4,xmm13 - movdqu XMMWORD[r13],xmm15 - lea r12,[128+r12] - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm2 - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - sub r14,8 - jnc NEAR $L$cbc_dec_loop - - add r14,8 - jz NEAR $L$cbc_dec_done - - movdqu xmm15,XMMWORD[r12] - mov rax,rsp - mov r10d,edx - cmp r14,2 - jb NEAR $L$cbc_dec_one - movdqu xmm0,XMMWORD[16+r12] - je NEAR $L$cbc_dec_two - movdqu xmm1,XMMWORD[32+r12] - cmp r14,4 - jb NEAR $L$cbc_dec_three - movdqu xmm2,XMMWORD[48+r12] - je NEAR $L$cbc_dec_four - movdqu xmm3,XMMWORD[64+r12] - cmp r14,6 - jb NEAR $L$cbc_dec_five - movdqu xmm4,XMMWORD[80+r12] - je NEAR $L$cbc_dec_six - movdqu xmm5,XMMWORD[96+r12] - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm6,xmm11 - movdqu xmm14,XMMWORD[96+r12] - pxor xmm2,xmm12 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm2 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_six: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu xmm14,XMMWORD[80+r12] - pxor xmm6,xmm11 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_five: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu xmm14,XMMWORD[64+r12] - pxor xmm1,xmm10 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_four: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu xmm14,XMMWORD[48+r12] - pxor xmm3,xmm9 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_three: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu xmm14,XMMWORD[32+r12] - pxor xmm5,xmm8 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_two: - movdqa XMMWORD[32+rbp],xmm14 - call _bsaes_decrypt8 - pxor xmm15,XMMWORD[32+rbp] - movdqu xmm7,XMMWORD[r12] - movdqu xmm14,XMMWORD[16+r12] - pxor xmm0,xmm7 - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - jmp NEAR $L$cbc_dec_done -ALIGN 16 -$L$cbc_dec_one: - lea rcx,[r12] - lea rdx,[32+rbp] - lea r8,[r15] - call asm_AES_decrypt - pxor xmm14,XMMWORD[32+rbp] - movdqu XMMWORD[r13],xmm14 - movdqa xmm14,xmm15 - -$L$cbc_dec_done: - movdqu XMMWORD[rbx],xmm14 - lea rax,[rsp] - pxor xmm0,xmm0 -$L$cbc_dec_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$cbc_dec_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$cbc_dec_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$cbc_dec_epilogue: - DB 0F3h,0C3h ;repret - - - -global bsaes_ctr32_encrypt_blocks - -ALIGN 16 -bsaes_ctr32_encrypt_blocks: - - mov rax,rsp -$L$ctr_enc_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$ctr_enc_body: - mov rbp,rsp - - movdqu xmm0,XMMWORD[r10] - mov eax,DWORD[240+r9] - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - movdqa XMMWORD[32+rbp],xmm0 - cmp r8,8 - jb NEAR $L$ctr_enc_short - - mov ebx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,ebx - call _bsaes_key_convert - pxor xmm7,xmm6 - movdqa XMMWORD[rax],xmm7 - - movdqa xmm8,XMMWORD[rsp] - lea r11,[$L$ADD1] - movdqa xmm15,XMMWORD[32+rbp] - movdqa xmm7,XMMWORD[((-32))+r11] -DB 102,68,15,56,0,199 -DB 102,68,15,56,0,255 - movdqa XMMWORD[rsp],xmm8 - jmp NEAR $L$ctr_enc_loop -ALIGN 16 -$L$ctr_enc_loop: - movdqa XMMWORD[32+rbp],xmm15 - movdqa xmm0,xmm15 - movdqa xmm1,xmm15 - paddd xmm0,XMMWORD[r11] - movdqa xmm2,xmm15 - paddd xmm1,XMMWORD[16+r11] - movdqa xmm3,xmm15 - paddd xmm2,XMMWORD[32+r11] - movdqa xmm4,xmm15 - paddd xmm3,XMMWORD[48+r11] - movdqa xmm5,xmm15 - paddd xmm4,XMMWORD[64+r11] - movdqa xmm6,xmm15 - paddd xmm5,XMMWORD[80+r11] - paddd xmm6,XMMWORD[96+r11] - - - - movdqa xmm8,XMMWORD[rsp] - lea rax,[16+rsp] - movdqa xmm7,XMMWORD[((-16))+r11] - pxor xmm15,xmm8 - pxor xmm0,xmm8 - pxor xmm1,xmm8 - pxor xmm2,xmm8 -DB 102,68,15,56,0,255 -DB 102,15,56,0,199 - pxor xmm3,xmm8 - pxor xmm4,xmm8 -DB 102,15,56,0,207 -DB 102,15,56,0,215 - pxor xmm5,xmm8 - pxor xmm6,xmm8 -DB 102,15,56,0,223 -DB 102,15,56,0,231 -DB 102,15,56,0,239 -DB 102,15,56,0,247 - lea r11,[$L$BS0] - mov r10d,ebx - - call _bsaes_encrypt8_bitslice - - sub r14,8 - jc NEAR $L$ctr_enc_loop_done - - movdqu xmm7,XMMWORD[r12] - movdqu xmm8,XMMWORD[16+r12] - movdqu xmm9,XMMWORD[32+r12] - movdqu xmm10,XMMWORD[48+r12] - movdqu xmm11,XMMWORD[64+r12] - movdqu xmm12,XMMWORD[80+r12] - movdqu xmm13,XMMWORD[96+r12] - movdqu xmm14,XMMWORD[112+r12] - lea r12,[128+r12] - pxor xmm7,xmm15 - movdqa xmm15,XMMWORD[32+rbp] - pxor xmm0,xmm8 - movdqu XMMWORD[r13],xmm7 - pxor xmm3,xmm9 - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,xmm10 - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,xmm11 - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,xmm12 - movdqu XMMWORD[64+r13],xmm2 - pxor xmm1,xmm13 - movdqu XMMWORD[80+r13],xmm6 - pxor xmm4,xmm14 - movdqu XMMWORD[96+r13],xmm1 - lea r11,[$L$ADD1] - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - paddd xmm15,XMMWORD[112+r11] - jnz NEAR $L$ctr_enc_loop - - jmp NEAR $L$ctr_enc_done -ALIGN 16 -$L$ctr_enc_loop_done: - add r14,8 - movdqu xmm7,XMMWORD[r12] - pxor xmm15,xmm7 - movdqu XMMWORD[r13],xmm15 - cmp r14,2 - jb NEAR $L$ctr_enc_done - movdqu xmm8,XMMWORD[16+r12] - pxor xmm0,xmm8 - movdqu XMMWORD[16+r13],xmm0 - je NEAR $L$ctr_enc_done - movdqu xmm9,XMMWORD[32+r12] - pxor xmm3,xmm9 - movdqu XMMWORD[32+r13],xmm3 - cmp r14,4 - jb NEAR $L$ctr_enc_done - movdqu xmm10,XMMWORD[48+r12] - pxor xmm5,xmm10 - movdqu XMMWORD[48+r13],xmm5 - je NEAR $L$ctr_enc_done - movdqu xmm11,XMMWORD[64+r12] - pxor xmm2,xmm11 - movdqu XMMWORD[64+r13],xmm2 - cmp r14,6 - jb NEAR $L$ctr_enc_done - movdqu xmm12,XMMWORD[80+r12] - pxor xmm6,xmm12 - movdqu XMMWORD[80+r13],xmm6 - je NEAR $L$ctr_enc_done - movdqu xmm13,XMMWORD[96+r12] - pxor xmm1,xmm13 - movdqu XMMWORD[96+r13],xmm1 - jmp NEAR $L$ctr_enc_done - -ALIGN 16 -$L$ctr_enc_short: - lea rcx,[32+rbp] - lea rdx,[48+rbp] - lea r8,[r15] - call asm_AES_encrypt - movdqu xmm0,XMMWORD[r12] - lea r12,[16+r12] - mov eax,DWORD[44+rbp] - bswap eax - pxor xmm0,XMMWORD[48+rbp] - inc eax - movdqu XMMWORD[r13],xmm0 - bswap eax - lea r13,[16+r13] - mov DWORD[44+rsp],eax - dec r14 - jnz NEAR $L$ctr_enc_short - -$L$ctr_enc_done: - lea rax,[rsp] - pxor xmm0,xmm0 -$L$ctr_enc_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$ctr_enc_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$ctr_enc_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$ctr_enc_epilogue: - DB 0F3h,0C3h ;repret - - -global bsaes_xts_encrypt - -ALIGN 16 -bsaes_xts_encrypt: - - mov rax,rsp -$L$xts_enc_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - mov r11,QWORD[168+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$xts_enc_body: - mov rbp,rsp - - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - - lea rcx,[r11] - lea rdx,[32+rbp] - lea r8,[r10] - call asm_AES_encrypt - - mov eax,DWORD[240+r15] - mov rbx,r14 - - mov edx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,edx - call _bsaes_key_convert - pxor xmm7,xmm6 - movdqa XMMWORD[rax],xmm7 - - and r14,-16 - sub rsp,0x80 - movdqa xmm6,XMMWORD[32+rbp] - - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - - sub r14,0x80 - jc NEAR $L$xts_enc_short - jmp NEAR $L$xts_enc_loop - -ALIGN 16 -$L$xts_enc_loop: - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqu xmm14,XMMWORD[112+r12] - lea r12,[128+r12] - movdqa XMMWORD[112+rsp],xmm6 - pxor xmm5,xmm13 - lea rax,[128+rsp] - pxor xmm6,xmm14 - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm2 - pxor xmm1,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - pxor xmm4,XMMWORD[112+rsp] - movdqu XMMWORD[96+r13],xmm1 - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - - movdqa xmm6,XMMWORD[112+rsp] - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - - sub r14,0x80 - jnc NEAR $L$xts_enc_loop - -$L$xts_enc_short: - add r14,0x80 - jz NEAR $L$xts_enc_done - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - cmp r14,16 - je NEAR $L$xts_enc_1 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - cmp r14,32 - je NEAR $L$xts_enc_2 - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - cmp r14,48 - je NEAR $L$xts_enc_3 - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - cmp r14,64 - je NEAR $L$xts_enc_4 - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - cmp r14,80 - je NEAR $L$xts_enc_5 - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - cmp r14,96 - je NEAR $L$xts_enc_6 - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqa XMMWORD[112+rsp],xmm6 - lea r12,[112+r12] - pxor xmm5,xmm13 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm2 - pxor xmm1,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm1 - lea r13,[112+r13] - - movdqa xmm6,XMMWORD[112+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_6: - pxor xmm3,xmm11 - lea r12,[96+r12] - pxor xmm4,xmm12 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm2 - movdqu XMMWORD[80+r13],xmm6 - lea r13,[96+r13] - - movdqa xmm6,XMMWORD[96+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_5: - pxor xmm2,xmm10 - lea r12,[80+r12] - pxor xmm3,xmm11 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - pxor xmm2,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm5 - movdqu XMMWORD[64+r13],xmm2 - lea r13,[80+r13] - - movdqa xmm6,XMMWORD[80+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_4: - pxor xmm1,xmm9 - lea r12,[64+r12] - pxor xmm2,xmm10 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm5,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm3 - movdqu XMMWORD[48+r13],xmm5 - lea r13,[64+r13] - - movdqa xmm6,XMMWORD[64+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_3: - pxor xmm0,xmm8 - lea r12,[48+r12] - pxor xmm1,xmm9 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm3,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm3 - lea r13,[48+r13] - - movdqa xmm6,XMMWORD[48+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_2: - pxor xmm15,xmm7 - lea r12,[32+r12] - pxor xmm0,xmm8 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_encrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - lea r13,[32+r13] - - movdqa xmm6,XMMWORD[32+rsp] - jmp NEAR $L$xts_enc_done -ALIGN 16 -$L$xts_enc_1: - pxor xmm7,xmm15 - lea r12,[16+r12] - movdqa XMMWORD[32+rbp],xmm7 - lea rcx,[32+rbp] - lea rdx,[32+rbp] - lea r8,[r15] - call asm_AES_encrypt - pxor xmm15,XMMWORD[32+rbp] - - - - - - movdqu XMMWORD[r13],xmm15 - lea r13,[16+r13] - - movdqa xmm6,XMMWORD[16+rsp] - -$L$xts_enc_done: - and ebx,15 - jz NEAR $L$xts_enc_ret - mov rdx,r13 - -$L$xts_enc_steal: - movzx eax,BYTE[r12] - movzx ecx,BYTE[((-16))+rdx] - lea r12,[1+r12] - mov BYTE[((-16))+rdx],al - mov BYTE[rdx],cl - lea rdx,[1+rdx] - sub ebx,1 - jnz NEAR $L$xts_enc_steal - - movdqu xmm15,XMMWORD[((-16))+r13] - lea rcx,[32+rbp] - pxor xmm15,xmm6 - lea rdx,[32+rbp] - movdqa XMMWORD[32+rbp],xmm15 - lea r8,[r15] - call asm_AES_encrypt - pxor xmm6,XMMWORD[32+rbp] - movdqu XMMWORD[(-16)+r13],xmm6 - -$L$xts_enc_ret: - lea rax,[rsp] - pxor xmm0,xmm0 -$L$xts_enc_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$xts_enc_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$xts_enc_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$xts_enc_epilogue: - DB 0F3h,0C3h ;repret - - - -global bsaes_xts_decrypt - -ALIGN 16 -bsaes_xts_decrypt: - - mov rax,rsp -$L$xts_dec_prologue: - push rbp - - push rbx - - push r12 - - push r13 - - push r14 - - push r15 - - lea rsp,[((-72))+rsp] - - mov r10,QWORD[160+rsp] - mov r11,QWORD[168+rsp] - lea rsp,[((-160))+rsp] - movaps XMMWORD[64+rsp],xmm6 - movaps XMMWORD[80+rsp],xmm7 - movaps XMMWORD[96+rsp],xmm8 - movaps XMMWORD[112+rsp],xmm9 - movaps XMMWORD[128+rsp],xmm10 - movaps XMMWORD[144+rsp],xmm11 - movaps XMMWORD[160+rsp],xmm12 - movaps XMMWORD[176+rsp],xmm13 - movaps XMMWORD[192+rsp],xmm14 - movaps XMMWORD[208+rsp],xmm15 -$L$xts_dec_body: - mov rbp,rsp - mov r12,rcx - mov r13,rdx - mov r14,r8 - mov r15,r9 - - lea rcx,[r11] - lea rdx,[32+rbp] - lea r8,[r10] - call asm_AES_encrypt - - mov eax,DWORD[240+r15] - mov rbx,r14 - - mov edx,eax - shl rax,7 - sub rax,96 - sub rsp,rax - - mov rax,rsp - mov rcx,r15 - mov r10d,edx - call _bsaes_key_convert - pxor xmm7,XMMWORD[rsp] - movdqa XMMWORD[rax],xmm6 - movdqa XMMWORD[rsp],xmm7 - - xor eax,eax - and r14,-16 - test ebx,15 - setnz al - shl rax,4 - sub r14,rax - - sub rsp,0x80 - movdqa xmm6,XMMWORD[32+rbp] - - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - - sub r14,0x80 - jc NEAR $L$xts_dec_short - jmp NEAR $L$xts_dec_loop - -ALIGN 16 -$L$xts_dec_loop: - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqu xmm14,XMMWORD[112+r12] - lea r12,[128+r12] - movdqa XMMWORD[112+rsp],xmm6 - pxor xmm5,xmm13 - lea rax,[128+rsp] - pxor xmm6,xmm14 - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm1 - pxor xmm2,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - pxor xmm4,XMMWORD[112+rsp] - movdqu XMMWORD[96+r13],xmm2 - movdqu XMMWORD[112+r13],xmm4 - lea r13,[128+r13] - - movdqa xmm6,XMMWORD[112+rsp] - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - - sub r14,0x80 - jnc NEAR $L$xts_dec_loop - -$L$xts_dec_short: - add r14,0x80 - jz NEAR $L$xts_dec_done - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm15,xmm6 - movdqa XMMWORD[rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm0,xmm6 - movdqa XMMWORD[16+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm7,XMMWORD[r12] - cmp r14,16 - je NEAR $L$xts_dec_1 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm1,xmm6 - movdqa XMMWORD[32+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm8,XMMWORD[16+r12] - cmp r14,32 - je NEAR $L$xts_dec_2 - pxor xmm15,xmm7 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm2,xmm6 - movdqa XMMWORD[48+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm9,XMMWORD[32+r12] - cmp r14,48 - je NEAR $L$xts_dec_3 - pxor xmm0,xmm8 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm3,xmm6 - movdqa XMMWORD[64+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm10,XMMWORD[48+r12] - cmp r14,64 - je NEAR $L$xts_dec_4 - pxor xmm1,xmm9 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm4,xmm6 - movdqa XMMWORD[80+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm11,XMMWORD[64+r12] - cmp r14,80 - je NEAR $L$xts_dec_5 - pxor xmm2,xmm10 - pshufd xmm13,xmm14,0x13 - pxor xmm14,xmm14 - movdqa xmm5,xmm6 - movdqa XMMWORD[96+rsp],xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - pcmpgtd xmm14,xmm6 - pxor xmm6,xmm13 - movdqu xmm12,XMMWORD[80+r12] - cmp r14,96 - je NEAR $L$xts_dec_6 - pxor xmm3,xmm11 - movdqu xmm13,XMMWORD[96+r12] - pxor xmm4,xmm12 - movdqa XMMWORD[112+rsp],xmm6 - lea r12,[112+r12] - pxor xmm5,xmm13 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm1 - pxor xmm2,XMMWORD[96+rsp] - movdqu XMMWORD[80+r13],xmm6 - movdqu XMMWORD[96+r13],xmm2 - lea r13,[112+r13] - - movdqa xmm6,XMMWORD[112+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_6: - pxor xmm3,xmm11 - lea r12,[96+r12] - pxor xmm4,xmm12 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - pxor xmm6,XMMWORD[80+rsp] - movdqu XMMWORD[64+r13],xmm1 - movdqu XMMWORD[80+r13],xmm6 - lea r13,[96+r13] - - movdqa xmm6,XMMWORD[96+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_5: - pxor xmm2,xmm10 - lea r12,[80+r12] - pxor xmm3,xmm11 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - pxor xmm1,XMMWORD[64+rsp] - movdqu XMMWORD[48+r13],xmm3 - movdqu XMMWORD[64+r13],xmm1 - lea r13,[80+r13] - - movdqa xmm6,XMMWORD[80+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_4: - pxor xmm1,xmm9 - lea r12,[64+r12] - pxor xmm2,xmm10 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - pxor xmm3,XMMWORD[48+rsp] - movdqu XMMWORD[32+r13],xmm5 - movdqu XMMWORD[48+r13],xmm3 - lea r13,[64+r13] - - movdqa xmm6,XMMWORD[64+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_3: - pxor xmm0,xmm8 - lea r12,[48+r12] - pxor xmm1,xmm9 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - pxor xmm5,XMMWORD[32+rsp] - movdqu XMMWORD[16+r13],xmm0 - movdqu XMMWORD[32+r13],xmm5 - lea r13,[48+r13] - - movdqa xmm6,XMMWORD[48+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_2: - pxor xmm15,xmm7 - lea r12,[32+r12] - pxor xmm0,xmm8 - lea rax,[128+rsp] - mov r10d,edx - - call _bsaes_decrypt8 - - pxor xmm15,XMMWORD[rsp] - pxor xmm0,XMMWORD[16+rsp] - movdqu XMMWORD[r13],xmm15 - movdqu XMMWORD[16+r13],xmm0 - lea r13,[32+r13] - - movdqa xmm6,XMMWORD[32+rsp] - jmp NEAR $L$xts_dec_done -ALIGN 16 -$L$xts_dec_1: - pxor xmm7,xmm15 - lea r12,[16+r12] - movdqa XMMWORD[32+rbp],xmm7 - lea rcx,[32+rbp] - lea rdx,[32+rbp] - lea r8,[r15] - call asm_AES_decrypt - pxor xmm15,XMMWORD[32+rbp] - - - - - - movdqu XMMWORD[r13],xmm15 - lea r13,[16+r13] - - movdqa xmm6,XMMWORD[16+rsp] - -$L$xts_dec_done: - and ebx,15 - jz NEAR $L$xts_dec_ret - - pxor xmm14,xmm14 - movdqa xmm12,XMMWORD[$L$xts_magic] - pcmpgtd xmm14,xmm6 - pshufd xmm13,xmm14,0x13 - movdqa xmm5,xmm6 - paddq xmm6,xmm6 - pand xmm13,xmm12 - movdqu xmm15,XMMWORD[r12] - pxor xmm6,xmm13 - - lea rcx,[32+rbp] - pxor xmm15,xmm6 - lea rdx,[32+rbp] - movdqa XMMWORD[32+rbp],xmm15 - lea r8,[r15] - call asm_AES_decrypt - pxor xmm6,XMMWORD[32+rbp] - mov rdx,r13 - movdqu XMMWORD[r13],xmm6 - -$L$xts_dec_steal: - movzx eax,BYTE[16+r12] - movzx ecx,BYTE[rdx] - lea r12,[1+r12] - mov BYTE[rdx],al - mov BYTE[16+rdx],cl - lea rdx,[1+rdx] - sub ebx,1 - jnz NEAR $L$xts_dec_steal - - movdqu xmm15,XMMWORD[r13] - lea rcx,[32+rbp] - pxor xmm15,xmm5 - lea rdx,[32+rbp] - movdqa XMMWORD[32+rbp],xmm15 - lea r8,[r15] - call asm_AES_decrypt - pxor xmm5,XMMWORD[32+rbp] - movdqu XMMWORD[r13],xmm5 - -$L$xts_dec_ret: - lea rax,[rsp] - pxor xmm0,xmm0 -$L$xts_dec_bzero: - movdqa XMMWORD[rax],xmm0 - movdqa XMMWORD[16+rax],xmm0 - lea rax,[32+rax] - cmp rbp,rax - ja NEAR $L$xts_dec_bzero - - lea rax,[120+rbp] - - movaps xmm6,XMMWORD[64+rbp] - movaps xmm7,XMMWORD[80+rbp] - movaps xmm8,XMMWORD[96+rbp] - movaps xmm9,XMMWORD[112+rbp] - movaps xmm10,XMMWORD[128+rbp] - movaps xmm11,XMMWORD[144+rbp] - movaps xmm12,XMMWORD[160+rbp] - movaps xmm13,XMMWORD[176+rbp] - movaps xmm14,XMMWORD[192+rbp] - movaps xmm15,XMMWORD[208+rbp] - lea rax,[160+rax] -$L$xts_dec_tail: - mov r15,QWORD[((-48))+rax] - - mov r14,QWORD[((-40))+rax] - - mov r13,QWORD[((-32))+rax] - - mov r12,QWORD[((-24))+rax] - - mov rbx,QWORD[((-16))+rax] - - mov rbp,QWORD[((-8))+rax] - - lea rsp,[rax] - -$L$xts_dec_epilogue: - DB 0F3h,0C3h ;repret - - - -ALIGN 64 -_bsaes_const: -$L$M0ISR: - DQ 0x0a0e0206070b0f03,0x0004080c0d010509 -$L$ISRM0: - DQ 0x01040b0e0205080f,0x0306090c00070a0d -$L$ISR: - DQ 0x0504070602010003,0x0f0e0d0c080b0a09 -$L$BS0: - DQ 0x5555555555555555,0x5555555555555555 -$L$BS1: - DQ 0x3333333333333333,0x3333333333333333 -$L$BS2: - DQ 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f -$L$SR: - DQ 0x0504070600030201,0x0f0e0d0c0a09080b -$L$SRM0: - DQ 0x0304090e00050a0f,0x01060b0c0207080d -$L$M0SR: - DQ 0x0a0e02060f03070b,0x0004080c05090d01 -$L$SWPUP: - DQ 0x0706050403020100,0x0c0d0e0f0b0a0908 -$L$SWPUPM0SR: - DQ 0x0a0d02060c03070b,0x0004080f05090e01 -$L$ADD1: - DQ 0x0000000000000000,0x0000000100000000 -$L$ADD2: - DQ 0x0000000000000000,0x0000000200000000 -$L$ADD3: - DQ 0x0000000000000000,0x0000000300000000 -$L$ADD4: - DQ 0x0000000000000000,0x0000000400000000 -$L$ADD5: - DQ 0x0000000000000000,0x0000000500000000 -$L$ADD6: - DQ 0x0000000000000000,0x0000000600000000 -$L$ADD7: - DQ 0x0000000000000000,0x0000000700000000 -$L$ADD8: - DQ 0x0000000000000000,0x0000000800000000 -$L$xts_magic: - DD 0x87,0,1,0 -$L$masks: - DQ 0x0101010101010101,0x0101010101010101 - DQ 0x0202020202020202,0x0202020202020202 - DQ 0x0404040404040404,0x0404040404040404 - DQ 0x0808080808080808,0x0808080808080808 -$L$M0: - DQ 0x02060a0e03070b0f,0x0004080c0105090d -$L$63: - DQ 0x6363636363636363,0x6363636363636363 -DB 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102 -DB 111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44 -DB 32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44 -DB 32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32 -DB 65,110,100,121,32,80,111,108,121,97,107,111,118,0 -ALIGN 64 - -EXTERN __imp_RtlVirtualUnwind - -ALIGN 16 -se_handler: - push rsi - push rdi - push rbx - push rbp - push r12 - push r13 - push r14 - push r15 - pushfq - sub rsp,64 - - mov rax,QWORD[120+r8] - mov rbx,QWORD[248+r8] - - mov rsi,QWORD[8+r9] - mov r11,QWORD[56+r9] - - mov r10d,DWORD[r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jbe NEAR $L$in_prologue - - mov r10d,DWORD[4+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_prologue - - mov r10d,DWORD[8+r11] - lea r10,[r10*1+rsi] - cmp rbx,r10 - jae NEAR $L$in_tail - - mov rax,QWORD[160+r8] - - lea rsi,[64+rax] - lea rdi,[512+r8] - mov ecx,20 - DD 0xa548f3fc - lea rax,[((160+120))+rax] - -$L$in_tail: - mov rbp,QWORD[((-48))+rax] - mov rbx,QWORD[((-40))+rax] - mov r12,QWORD[((-32))+rax] - mov r13,QWORD[((-24))+rax] - mov r14,QWORD[((-16))+rax] - mov r15,QWORD[((-8))+rax] - mov QWORD[144+r8],rbx - mov QWORD[160+r8],rbp - mov QWORD[216+r8],r12 - mov QWORD[224+r8],r13 - mov QWORD[232+r8],r14 - mov QWORD[240+r8],r15 - -$L$in_prologue: - mov QWORD[152+r8],rax - - mov rdi,QWORD[40+r9] - mov rsi,r8 - mov ecx,154 - DD 0xa548f3fc - - mov rsi,r9 - xor rcx,rcx - mov rdx,QWORD[8+rsi] - mov r8,QWORD[rsi] - mov r9,QWORD[16+rsi] - mov r10,QWORD[40+rsi] - lea r11,[56+rsi] - lea r12,[24+rsi] - mov QWORD[32+rsp],r10 - mov QWORD[40+rsp],r11 - mov QWORD[48+rsp],r12 - mov QWORD[56+rsp],rcx - call QWORD[__imp_RtlVirtualUnwind] - - mov eax,1 - add rsp,64 - popfq - pop r15 - pop r14 - pop r13 - pop r12 - pop rbp - pop rbx - pop rdi - pop rsi - DB 0F3h,0C3h ;repret - - -section .pdata rdata align=4 -ALIGN 4 - DD $L$cbc_dec_prologue wrt ..imagebase - DD $L$cbc_dec_epilogue wrt ..imagebase - DD $L$cbc_dec_info wrt ..imagebase - - DD $L$ctr_enc_prologue wrt ..imagebase - DD $L$ctr_enc_epilogue wrt ..imagebase - DD $L$ctr_enc_info wrt ..imagebase - - DD $L$xts_enc_prologue wrt ..imagebase - DD $L$xts_enc_epilogue wrt ..imagebase - DD $L$xts_enc_info wrt ..imagebase - - DD $L$xts_dec_prologue wrt ..imagebase - DD $L$xts_dec_epilogue wrt ..imagebase - DD $L$xts_dec_info wrt ..imagebase - -section .xdata rdata align=8 -ALIGN 8 -$L$cbc_dec_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$cbc_dec_body wrt ..imagebase,$L$cbc_dec_epilogue wrt ..imagebase - DD $L$cbc_dec_tail wrt ..imagebase - DD 0 -$L$ctr_enc_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$ctr_enc_body wrt ..imagebase,$L$ctr_enc_epilogue wrt ..imagebase - DD $L$ctr_enc_tail wrt ..imagebase - DD 0 -$L$xts_enc_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$xts_enc_body wrt ..imagebase,$L$xts_enc_epilogue wrt ..imagebase - DD $L$xts_enc_tail wrt ..imagebase - DD 0 -$L$xts_dec_info: -DB 9,0,0,0 - DD se_handler wrt ..imagebase - DD $L$xts_dec_body wrt ..imagebase,$L$xts_dec_epilogue wrt ..imagebase - DD $L$xts_dec_tail wrt ..imagebase - DD 0 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm index 603a8d17b870ab..a474c5d9a68c9f 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm @@ -39,7 +39,7 @@ $L$SEH_begin_rsaz_512_sqr: sub rsp,128+24 $L$sqr_body: - mov rbp,rdx +DB 102,72,15,110,202 mov rdx,QWORD[rsi] mov rax,QWORD[8+rsi] mov QWORD[128+rsp],rcx @@ -54,6 +54,7 @@ $L$oop_sqr: mov DWORD[((128+8))+rsp],r8d mov rbx,rdx + mov rbp,rax mul rdx mov r8,rax mov rax,QWORD[16+rsi] @@ -92,31 +93,29 @@ $L$oop_sqr: mul rbx add r14,rax mov rax,rbx - mov r15,rdx - adc r15,0 + adc rdx,0 + xor rcx,rcx add r8,r8 - mov rcx,r9 - adc r9,r9 + mov r15,rdx + adc rcx,0 mul rax - mov QWORD[rsp],rax - add r8,rdx - adc r9,0 + add rdx,r8 + adc rcx,0 - mov QWORD[8+rsp],r8 - shr rcx,63 + mov QWORD[rsp],rax + mov QWORD[8+rsp],rdx - mov r8,QWORD[8+rsi] mov rax,QWORD[16+rsi] - mul r8 + mul rbp add r10,rax mov rax,QWORD[24+rsi] mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r11,rax mov rax,QWORD[32+rsi] adc rdx,0 @@ -124,7 +123,7 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r12,rax mov rax,QWORD[40+rsi] adc rdx,0 @@ -132,7 +131,7 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r13,rax mov rax,QWORD[48+rsi] adc rdx,0 @@ -140,7 +139,7 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r14,rax mov rax,QWORD[56+rsi] adc rdx,0 @@ -148,39 +147,39 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 - mul r8 + mul rbp add r15,rax - mov rax,r8 + mov rax,rbp adc rdx,0 add r15,rbx - mov r8,rdx - mov rdx,r10 - adc r8,0 + adc rdx,0 - add rdx,rdx - lea r10,[r10*2+rcx] - mov rbx,r11 - adc r11,r11 + xor rbx,rbx + add r9,r9 + mov r8,rdx + adc r10,r10 + adc rbx,0 mul rax + + add rax,rcx + mov rbp,QWORD[16+rsi] add r9,rax + mov rax,QWORD[24+rsi] adc r10,rdx - adc r11,0 + adc rbx,0 mov QWORD[16+rsp],r9 mov QWORD[24+rsp],r10 - shr rbx,63 - mov r9,QWORD[16+rsi] - mov rax,QWORD[24+rsi] - mul r9 + mul rbp add r12,rax mov rax,QWORD[32+rsi] mov rcx,rdx adc rcx,0 - mul r9 + mul rbp add r13,rax mov rax,QWORD[40+rsi] adc rdx,0 @@ -188,7 +187,7 @@ $L$oop_sqr: mov rcx,rdx adc rcx,0 - mul r9 + mul rbp add r14,rax mov rax,QWORD[48+rsi] adc rdx,0 @@ -196,9 +195,7 @@ $L$oop_sqr: mov rcx,rdx adc rcx,0 - mul r9 - mov r10,r12 - lea r12,[r12*2+rbx] + mul rbp add r15,rax mov rax,QWORD[56+rsi] adc rdx,0 @@ -206,36 +203,40 @@ $L$oop_sqr: mov rcx,rdx adc rcx,0 - mul r9 - shr r10,63 + mul rbp add r8,rax - mov rax,r9 + mov rax,rbp adc rdx,0 add r8,rcx - mov r9,rdx - adc r9,0 + adc rdx,0 - mov rcx,r13 - lea r13,[r13*2+r10] + xor rcx,rcx + add r11,r11 + mov r9,rdx + adc r12,r12 + adc rcx,0 mul rax + + add rax,rbx + mov r10,QWORD[24+rsi] add r11,rax + mov rax,QWORD[32+rsi] adc r12,rdx - adc r13,0 + adc rcx,0 mov QWORD[32+rsp],r11 mov QWORD[40+rsp],r12 - shr rcx,63 - mov r10,QWORD[24+rsi] - mov rax,QWORD[32+rsi] + mov r11,rax mul r10 add r14,rax mov rax,QWORD[40+rsi] mov rbx,rdx adc rbx,0 + mov r12,rax mul r10 add r15,rax mov rax,QWORD[48+rsi] @@ -244,9 +245,8 @@ $L$oop_sqr: mov rbx,rdx adc rbx,0 + mov rbp,rax mul r10 - mov r12,r14 - lea r14,[r14*2+rcx] add r8,rax mov rax,QWORD[56+rsi] adc rdx,0 @@ -255,32 +255,33 @@ $L$oop_sqr: adc rbx,0 mul r10 - shr r12,63 add r9,rax mov rax,r10 adc rdx,0 add r9,rbx - mov r10,rdx - adc r10,0 + adc rdx,0 - mov rbx,r15 - lea r15,[r15*2+r12] + xor rbx,rbx + add r13,r13 + mov r10,rdx + adc r14,r14 + adc rbx,0 mul rax + + add rax,rcx add r13,rax + mov rax,r12 adc r14,rdx - adc r15,0 + adc rbx,0 mov QWORD[48+rsp],r13 mov QWORD[56+rsp],r14 - shr rbx,63 - mov r11,QWORD[32+rsi] - mov rax,QWORD[40+rsi] mul r11 add r8,rax - mov rax,QWORD[48+rsi] + mov rax,rbp mov rcx,rdx adc rcx,0 @@ -288,97 +289,99 @@ $L$oop_sqr: add r9,rax mov rax,QWORD[56+rsi] adc rdx,0 - mov r12,r8 - lea r8,[r8*2+rbx] add r9,rcx mov rcx,rdx adc rcx,0 + mov r14,rax mul r11 - shr r12,63 add r10,rax mov rax,r11 adc rdx,0 add r10,rcx - mov r11,rdx - adc r11,0 + adc rdx,0 - mov rcx,r9 - lea r9,[r9*2+r12] + xor rcx,rcx + add r15,r15 + mov r11,rdx + adc r8,r8 + adc rcx,0 mul rax + + add rax,rbx add r15,rax + mov rax,rbp adc r8,rdx - adc r9,0 + adc rcx,0 mov QWORD[64+rsp],r15 mov QWORD[72+rsp],r8 - shr rcx,63 - mov r12,QWORD[40+rsi] - mov rax,QWORD[48+rsi] mul r12 add r10,rax - mov rax,QWORD[56+rsi] + mov rax,r14 mov rbx,rdx adc rbx,0 mul r12 add r11,rax mov rax,r12 - mov r15,r10 - lea r10,[r10*2+rcx] adc rdx,0 - shr r15,63 add r11,rbx - mov r12,rdx - adc r12,0 + adc rdx,0 - mov rbx,r11 - lea r11,[r11*2+r15] + xor rbx,rbx + add r9,r9 + mov r12,rdx + adc r10,r10 + adc rbx,0 mul rax + + add rax,rcx add r9,rax + mov rax,r14 adc r10,rdx - adc r11,0 + adc rbx,0 mov QWORD[80+rsp],r9 mov QWORD[88+rsp],r10 - mov r13,QWORD[48+rsi] - mov rax,QWORD[56+rsi] - mul r13 + mul rbp add r12,rax - mov rax,r13 - mov r13,rdx - adc r13,0 + mov rax,rbp + adc rdx,0 - xor r14,r14 - shl rbx,1 + xor rcx,rcx + add r11,r11 + mov r13,rdx adc r12,r12 - adc r13,r13 - adc r14,r14 + adc rcx,0 mul rax + + add rax,rbx add r11,rax + mov rax,r14 adc r12,rdx - adc r13,0 + adc rcx,0 mov QWORD[96+rsp],r11 mov QWORD[104+rsp],r12 - mov rax,QWORD[56+rsi] - mul rax - add r13,rax - adc rdx,0 + xor rbx,rbx + add r13,r13 + adc rbx,0 - add r14,rdx + mul rax - mov QWORD[112+rsp],r13 - mov QWORD[120+rsp],r14 + add rax,rcx + add rax,r13 + adc rdx,rbx mov r8,QWORD[rsp] mov r9,QWORD[8+rsp] @@ -388,6 +391,10 @@ $L$oop_sqr: mov r13,QWORD[40+rsp] mov r14,QWORD[48+rsp] mov r15,QWORD[56+rsp] +DB 102,72,15,126,205 + + mov QWORD[112+rsp],rax + mov QWORD[120+rsp],rdx call __rsaz_512_reduce @@ -416,9 +423,9 @@ ALIGN 32 $L$oop_sqrx: mov DWORD[((128+8))+rsp],r8d DB 102,72,15,110,199 -DB 102,72,15,110,205 mulx r9,r8,rax + mov rbx,rax mulx r10,rcx,QWORD[16+rsi] xor rbp,rbp @@ -426,40 +433,39 @@ DB 102,72,15,110,205 mulx r11,rax,QWORD[24+rsi] adcx r9,rcx - mulx r12,rcx,QWORD[32+rsi] +DB 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcx r10,rax - mulx r13,rax,QWORD[40+rsi] +DB 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcx r11,rcx -DB 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulx r14,rcx,QWORD[48+rsi] adcx r12,rax adcx r13,rcx -DB 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulx r15,rax,QWORD[56+rsi] adcx r14,rax adcx r15,rbp - mov rcx,r9 - shld r9,r8,1 - shl r8,1 - - xor ebp,ebp - mulx rdx,rax,rdx - adcx r8,rdx - mov rdx,QWORD[8+rsi] - adcx r9,rbp + mulx rdi,rax,rdx + mov rdx,rbx + xor rcx,rcx + adox r8,r8 + adcx r8,rdi + adox rcx,rbp + adcx rcx,rbp mov QWORD[rsp],rax mov QWORD[8+rsp],r8 - mulx rbx,rax,QWORD[16+rsi] +DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adox r10,rax adcx r11,rbx -DB 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulx r8,rdi,QWORD[24+rsi] adox r11,rdi +DB 0x66 adcx r12,r8 mulx rbx,rax,QWORD[32+rsi] @@ -477,24 +483,25 @@ DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00 DB 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adox r15,rdi adcx r8,rbp + mulx rdi,rax,rdx adox r8,rbp +DB 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - mov rbx,r11 - shld r11,r10,1 - shld r10,rcx,1 + xor rbx,rbx + adox r9,r9 - xor ebp,ebp - mulx rcx,rax,rdx - mov rdx,QWORD[16+rsi] + adcx rax,rcx + adox r10,r10 adcx r9,rax - adcx r10,rcx - adcx r11,rbp + adox rbx,rbp + adcx r10,rdi + adcx rbx,rbp mov QWORD[16+rsp],r9 DB 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -DB 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulx r9,rdi,QWORD[24+rsi] adox r12,rdi adcx r13,r9 @@ -502,7 +509,7 @@ DB 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 adox r13,rax adcx r14,rcx - mulx r9,rdi,QWORD[40+rsi] +DB 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adox r14,rdi adcx r15,r9 @@ -510,27 +517,28 @@ DB 0xc4,0xe2,0xfb,0xf6,0x8e,0x30,0x00,0x00,0x00 adox r15,rax adcx r8,rcx -DB 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulx r9,rdi,QWORD[56+rsi] adox r8,rdi adcx r9,rbp + mulx rdi,rax,rdx adox r9,rbp + mov rdx,QWORD[24+rsi] - mov rcx,r13 - shld r13,r12,1 - shld r12,rbx,1 + xor rcx,rcx + adox r11,r11 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rbx + adox r12,r12 adcx r11,rax - adcx r12,rdx - mov rdx,QWORD[24+rsi] - adcx r13,rbp + adox rcx,rbp + adcx r12,rdi + adcx rcx,rbp mov QWORD[32+rsp],r11 -DB 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + mov QWORD[40+rsp],r12 -DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulx rbx,rax,QWORD[32+rsi] adox r14,rax adcx r15,rbx @@ -545,25 +553,25 @@ DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 mulx r10,rdi,QWORD[56+rsi] adox r9,rdi adcx r10,rbp + mulx rdi,rax,rdx adox r10,rbp + mov rdx,QWORD[32+rsi] -DB 0x66 - mov rbx,r15 - shld r15,r14,1 - shld r14,rcx,1 + xor rbx,rbx + adox r13,r13 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rcx + adox r14,r14 adcx r13,rax - adcx r14,rdx - mov rdx,QWORD[32+rsi] - adcx r15,rbp + adox rbx,rbp + adcx r14,rdi + adcx rbx,rbp mov QWORD[48+rsp],r13 mov QWORD[56+rsp],r14 -DB 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulx r11,rdi,QWORD[40+rsi] adox r8,rdi adcx r9,r11 @@ -574,18 +582,19 @@ DB 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 mulx r11,rdi,QWORD[56+rsi] adox r10,rdi adcx r11,rbp + mulx rdi,rax,rdx + mov rdx,QWORD[40+rsi] adox r11,rbp - mov rcx,r9 - shld r9,r8,1 - shld r8,rbx,1 + xor rcx,rcx + adox r15,r15 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rbx + adox r8,r8 adcx r15,rax - adcx r8,rdx - mov rdx,QWORD[40+rsi] - adcx r9,rbp + adox rcx,rbp + adcx r8,rdi + adcx rcx,rbp mov QWORD[64+rsp],r15 mov QWORD[72+rsp],r8 @@ -598,18 +607,19 @@ DB 0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00 DB 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adox r11,rdi adcx r12,rbp + mulx rdi,rax,rdx adox r12,rbp + mov rdx,QWORD[48+rsi] - mov rbx,r11 - shld r11,r10,1 - shld r10,rcx,1 + xor rbx,rbx + adox r9,r9 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rcx + adox r10,r10 adcx r9,rax - adcx r10,rdx - mov rdx,QWORD[48+rsi] - adcx r11,rbp + adcx r10,rdi + adox rbx,rbp + adcx rbx,rbp mov QWORD[80+rsp],r9 mov QWORD[88+rsp],r10 @@ -619,31 +629,31 @@ DB 0xc4,0x62,0xfb,0xf6,0xae,0x38,0x00,0x00,0x00 adox r12,rax adox r13,rbp - xor r14,r14 - shld r14,r13,1 - shld r13,r12,1 - shld r12,rbx,1 + mulx rdi,rax,rdx + xor rcx,rcx + mov rdx,QWORD[56+rsi] + adox r11,r11 - xor ebp,ebp - mulx rdx,rax,rdx + adcx rax,rbx + adox r12,r12 adcx r11,rax - adcx r12,rdx - mov rdx,QWORD[56+rsi] - adcx r13,rbp + adox rcx,rbp + adcx r12,rdi + adcx rcx,rbp DB 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 DB 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulx rdx,rax,rdx - adox r13,rax - adox rdx,rbp + xor rbx,rbx + adox r13,r13 -DB 0x66 - add r14,rdx + adcx rax,rcx + adox rbx,rbp + adcx rax,r13 + adcx rbx,rdx - mov QWORD[112+rsp],r13 - mov QWORD[120+rsp],r14 DB 102,72,15,126,199 DB 102,72,15,126,205 @@ -657,6 +667,9 @@ DB 102,72,15,126,205 mov r14,QWORD[48+rsp] mov r15,QWORD[56+rsp] + mov QWORD[112+rsp],rax + mov QWORD[120+rsp],rbx + call __rsaz_512_reducex add r8,QWORD[64+rsp] @@ -1502,6 +1515,7 @@ $L$SEH_end_rsaz_512_mul_by_one: ALIGN 32 __rsaz_512_reduce: + mov rbx,r8 imul rbx,QWORD[((128+8))+rsp] mov rax,QWORD[rbp] @@ -1583,9 +1597,11 @@ $L$reduction_loop: DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_reducex: + imul rdx,r8 xor rsi,rsi mov ecx,8 @@ -1639,8 +1655,10 @@ DB 0xc4,0x62,0xfb,0xf6,0xb5,0x30,0x00,0x00,0x00 DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_subtract: + mov QWORD[rdi],r8 mov QWORD[8+rdi],r9 mov QWORD[16+rdi],r10 @@ -1696,8 +1714,10 @@ __rsaz_512_subtract: DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_mul: + lea rdi,[8+rsp] mov rax,QWORD[rsi] @@ -1838,8 +1858,10 @@ $L$oop_mul: DB 0F3h,0C3h ;repret + ALIGN 32 __rsaz_512_mulx: + mulx r8,rbx,QWORD[rsi] mov rcx,-6 @@ -1957,10 +1979,12 @@ DB 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 DB 0F3h,0C3h ;repret + global rsaz_512_scatter4 ALIGN 16 rsaz_512_scatter4: + lea rcx,[r8*8+rcx] mov r9d,8 jmp NEAR $L$oop_scatter @@ -1975,10 +1999,12 @@ $L$oop_scatter: DB 0F3h,0C3h ;repret + global rsaz_512_gather4 ALIGN 16 rsaz_512_gather4: + $L$SEH_begin_rsaz_512_gather4: DB 0x48,0x81,0xec,0xa8,0x00,0x00,0x00 DB 0x0f,0x29,0x34,0x24 @@ -2067,6 +2093,7 @@ $L$oop_gather: $L$SEH_end_rsaz_512_gather4: + ALIGN 64 $L$inc: DD 0,0,1,1 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm index 81570ab2060e9b..0756714904eaad 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm @@ -583,6 +583,7 @@ $L$SEH_end_bn_mul4x_mont_gather5: ALIGN 32 mul4x_internal: + shl r9,5 movd xmm5,DWORD[56+rax] lea rax,[$L$inc] @@ -1105,6 +1106,7 @@ $L$inner4x: mov r15,QWORD[24+rbp] jmp NEAR $L$sqr4x_sub_entry + global bn_power5 ALIGN 32 @@ -1331,6 +1333,7 @@ __bn_sqr8x_internal: + lea rbp,[32+r10] @@ -2036,8 +2039,10 @@ DB 102,73,15,126,217 DB 0F3h,0C3h ;repret + ALIGN 32 __bn_post4x_internal: + mov r12,QWORD[rbp] lea rbx,[r9*1+rdi] mov rcx,r9 @@ -2089,10 +2094,12 @@ $L$sqr4x_sub_entry: neg r9 DB 0F3h,0C3h ;repret + global bn_from_montgomery ALIGN 32 bn_from_montgomery: + test DWORD[48+rsp],7 jz NEAR bn_from_mont8x xor eax,eax @@ -2100,6 +2107,7 @@ bn_from_montgomery: + ALIGN 32 bn_from_mont8x: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -2408,6 +2416,7 @@ $L$SEH_end_bn_mulx4x_mont_gather5: ALIGN 32 mulx4x_internal: + mov QWORD[8+rsp],r9 mov r10,r9 neg r9 @@ -2828,6 +2837,7 @@ $L$mulx4x_inner: jmp NEAR $L$sqrx4x_sub_entry + ALIGN 32 bn_powerx5: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -3598,6 +3608,7 @@ DB 102,72,15,126,213 ALIGN 32 __bn_postx4x_internal: + mov r12,QWORD[rbp] mov r10,rcx mov r9,rcx @@ -3646,10 +3657,12 @@ $L$sqrx4x_sub_entry: DB 0F3h,0C3h ;repret + global bn_get_bits5 ALIGN 16 bn_get_bits5: + lea r10,[rcx] lea r11,[1+rcx] mov ecx,edx @@ -3665,10 +3678,12 @@ bn_get_bits5: DB 0F3h,0C3h ;repret + global bn_scatter5 ALIGN 16 bn_scatter5: + cmp edx,0 jz NEAR $L$scatter_epilogue lea r8,[r9*8+r8] @@ -3683,12 +3698,14 @@ $L$scatter_epilogue: DB 0F3h,0C3h ;repret + global bn_gather5 ALIGN 32 bn_gather5: $L$SEH_begin_bn_gather5: + DB 0x4c,0x8d,0x14,0x24 DB 0x48,0x81,0xec,0x08,0x01,0x00,0x00 lea rax,[$L$inc] @@ -3846,6 +3863,7 @@ $L$gather: DB 0F3h,0C3h ;repret $L$SEH_end_bn_gather5: + ALIGN 64 $L$inc: DD 0,0,1,1 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h index 8b7c50ce9a5416..59f6aefb5a0ecf 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Fri Sep 13 16:03:14 2019 UTC" +#define DATE "built on: Wed Mar 18 21:10:39 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm index 7a0f351e51fc54..4cf1d322acc9d1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm @@ -10,6 +10,7 @@ global Camellia_EncryptBlock ALIGN 16 Camellia_EncryptBlock: + mov eax,128 sub eax,ecx mov ecx,3 @@ -17,6 +18,7 @@ Camellia_EncryptBlock: jmp NEAR $L$enc_rounds + global Camellia_EncryptBlock_Rounds ALIGN 16 @@ -95,6 +97,7 @@ $L$SEH_end_Camellia_EncryptBlock_Rounds: ALIGN 16 _x86_64_Camellia_encrypt: + xor r9d,DWORD[r14] xor r8d,DWORD[4+r14] xor r11d,DWORD[8+r14] @@ -300,10 +303,12 @@ DB 0xf3,0xc3 + global Camellia_DecryptBlock ALIGN 16 Camellia_DecryptBlock: + mov eax,128 sub eax,ecx mov ecx,3 @@ -311,6 +316,7 @@ Camellia_DecryptBlock: jmp NEAR $L$dec_rounds + global Camellia_DecryptBlock_Rounds ALIGN 16 @@ -389,6 +395,7 @@ $L$SEH_end_Camellia_DecryptBlock_Rounds: ALIGN 16 _x86_64_Camellia_decrypt: + xor r9d,DWORD[r14] xor r8d,DWORD[4+r14] xor r11d,DWORD[8+r14] @@ -593,6 +600,7 @@ $L$ddone: DB 0xf3,0xc3 + global Camellia_Ekeygen ALIGN 16 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm index c87f73a8aaee06..9930dadce66880 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm @@ -3958,10 +3958,12 @@ $L$SEH_begin_ecp_nistz256_to_mont: mov rsi,rdx + mov ecx,0x80100 and ecx,DWORD[((OPENSSL_ia32cap_P+8))] lea rdx,[$L$RR] jmp NEAR $L$mul_mont + $L$SEH_end_ecp_nistz256_to_mont: @@ -4922,6 +4924,7 @@ global ecp_nistz256_scatter_w5 ALIGN 32 ecp_nistz256_scatter_w5: + lea r8d,[((-3))+r8*2+r8] movdqa xmm0,XMMWORD[rdx] shl r8d,5 @@ -4942,6 +4945,7 @@ ecp_nistz256_scatter_w5: + global ecp_nistz256_gather_w5 ALIGN 32 @@ -5035,6 +5039,7 @@ global ecp_nistz256_scatter_w7 ALIGN 32 ecp_nistz256_scatter_w7: + movdqu xmm0,XMMWORD[rdx] shl r8d,6 movdqu xmm1,XMMWORD[16+rdx] @@ -5050,6 +5055,7 @@ ecp_nistz256_scatter_w7: + global ecp_nistz256_gather_w7 ALIGN 32 @@ -5861,26 +5867,16 @@ DB 102,73,15,110,220 or r12,r8 or r12,r9 -DB 0x3e - jnz NEAR $L$add_proceedq DB 102,73,15,126,208 DB 102,73,15,126,217 - test r8,r8 - jnz NEAR $L$add_proceedq - test r9,r9 - jz NEAR $L$add_doubleq -DB 102,72,15,126,199 - pxor xmm0,xmm0 - movdqu XMMWORD[rdi],xmm0 - movdqu XMMWORD[16+rdi],xmm0 - movdqu XMMWORD[32+rdi],xmm0 - movdqu XMMWORD[48+rdi],xmm0 - movdqu XMMWORD[64+rdi],xmm0 - movdqu XMMWORD[80+rdi],xmm0 - jmp NEAR $L$add_doneq + or r12,r8 + or r12,r9 + + +DB 0x3e + jnz NEAR $L$add_proceedq -ALIGN 32 $L$add_doubleq: DB 102,72,15,126,206 DB 102,72,15,126,199 @@ -6994,26 +6990,16 @@ DB 102,73,15,110,220 or r12,r8 or r12,r9 -DB 0x3e - jnz NEAR $L$add_proceedx DB 102,73,15,126,208 DB 102,73,15,126,217 - test r8,r8 - jnz NEAR $L$add_proceedx - test r9,r9 - jz NEAR $L$add_doublex -DB 102,72,15,126,199 - pxor xmm0,xmm0 - movdqu XMMWORD[rdi],xmm0 - movdqu XMMWORD[16+rdi],xmm0 - movdqu XMMWORD[32+rdi],xmm0 - movdqu XMMWORD[48+rdi],xmm0 - movdqu XMMWORD[64+rdi],xmm0 - movdqu XMMWORD[80+rdi],xmm0 - jmp NEAR $L$add_donex + or r12,r8 + or r12,r9 + + +DB 0x3e + jnz NEAR $L$add_proceedx -ALIGN 32 $L$add_doublex: DB 102,72,15,126,206 DB 102,72,15,126,199 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm index 84d55134ac746b..d6c6312363e0fc 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm @@ -414,6 +414,7 @@ global x25519_fe64_eligible ALIGN 32 x25519_fe64_eligible: + mov ecx,DWORD[((OPENSSL_ia32cap_P+8))] xor eax,eax and ecx,0x80100 @@ -422,6 +423,7 @@ x25519_fe64_eligible: DB 0F3h,0C3h ;repret + global x25519_fe64_mul ALIGN 32 @@ -675,6 +677,7 @@ $L$SEH_begin_x25519_fe64_mul121666: $L$fe64_mul121666_body: + mov edx,121666 mulx rcx,r8,QWORD[rsi] mulx rax,r9,QWORD[8+rsi] @@ -705,6 +708,7 @@ $L$fe64_mul121666_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_mul121666: global x25519_fe64_add @@ -721,6 +725,7 @@ $L$SEH_begin_x25519_fe64_add: $L$fe64_add_body: + mov r8,QWORD[rsi] mov r9,QWORD[8+rsi] mov r10,QWORD[16+rsi] @@ -751,6 +756,7 @@ $L$fe64_add_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_add: global x25519_fe64_sub @@ -767,6 +773,7 @@ $L$SEH_begin_x25519_fe64_sub: $L$fe64_sub_body: + mov r8,QWORD[rsi] mov r9,QWORD[8+rsi] mov r10,QWORD[16+rsi] @@ -797,6 +804,7 @@ $L$fe64_sub_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_sub: global x25519_fe64_tobytes @@ -812,6 +820,7 @@ $L$SEH_begin_x25519_fe64_tobytes: $L$fe64_to_body: + mov r8,QWORD[rsi] mov r9,QWORD[8+rsi] mov r10,QWORD[16+rsi] @@ -849,6 +858,7 @@ $L$fe64_to_epilogue: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_x25519_fe64_tobytes: DB 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101 DB 115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h index d803b518584f2e..dab67d1b37ae72 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h index c3b41df01e40a3..0c96ce73633dac 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_WIN32 # define DSO_EXTENSION ".dll" #endif diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm index b1d83324575b69..9fba32b883a6ba 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm @@ -8,6 +8,7 @@ section .text code align=64 ALIGN 32 _aesni_ctr32_ghash_6x: + vmovdqu xmm2,XMMWORD[32+r11] sub rdx,6 vpxor xmm4,xmm4,xmm4 @@ -316,6 +317,7 @@ $L$6x_done: DB 0F3h,0C3h ;repret + global aesni_gcm_decrypt ALIGN 32 @@ -457,6 +459,7 @@ $L$SEH_end_aesni_gcm_decrypt: ALIGN 32 _aesni_ctr32_6x: + vmovdqu xmm4,XMMWORD[((0-128))+rcx] vmovdqu xmm2,XMMWORD[32+r11] lea r13,[((-1))+rbp] @@ -545,6 +548,7 @@ $L$handle_ctr32_2: jmp NEAR $L$oop_ctr32 + global aesni_gcm_encrypt ALIGN 32 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm index 5717654508c112..6f688b63e0990a 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm @@ -26,6 +26,7 @@ $L$SEH_begin_poly1305_init: mov rdx,r8 + xor rax,rax mov QWORD[rdi],rax mov QWORD[8+rdi],rax @@ -63,6 +64,7 @@ $L$no_key: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_init: @@ -198,6 +200,7 @@ $L$SEH_begin_poly1305_emit: mov rdx,r8 + $L$emit: mov r8,QWORD[rdi] mov r9,QWORD[8+rdi] @@ -220,10 +223,12 @@ $L$emit: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_emit: ALIGN 32 __poly1305_block: + mul r14 mov r9,rax mov rax,r11 @@ -266,8 +271,10 @@ __poly1305_block: + ALIGN 32 __poly1305_init_avx: + mov r14,r11 mov rbx,r12 xor rbp,rbp @@ -428,6 +435,7 @@ __poly1305_init_avx: + ALIGN 32 poly1305_blocks_avx: mov QWORD[8+rsp],rdi ;WIN64 prologue @@ -1296,6 +1304,7 @@ $L$SEH_begin_poly1305_emit_avx: mov rdx,r8 + cmp DWORD[20+rdi],0 je NEAR $L$emit @@ -1348,6 +1357,7 @@ $L$SEH_begin_poly1305_emit_avx: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_emit_avx: ALIGN 32 @@ -2607,6 +2617,7 @@ $L$SEH_begin_poly1305_init_base2_44: mov rdx,r8 + xor rax,rax mov QWORD[rdi],rax mov QWORD[8+rdi],rax @@ -2642,6 +2653,7 @@ $L$init_base2_44: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_init_base2_44: ALIGN 32 @@ -2656,6 +2668,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52: mov rcx,r9 + shr rdx,4 jz NEAR $L$no_data_vpmadd52 @@ -2764,6 +2777,7 @@ $L$no_data_vpmadd52: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_blocks_vpmadd52: ALIGN 32 @@ -2778,6 +2792,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_4x: mov rcx,r9 + shr rdx,4 jz NEAR $L$no_data_vpmadd52_4x @@ -3204,6 +3219,7 @@ $L$no_data_vpmadd52_4x: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_blocks_vpmadd52_4x: ALIGN 32 @@ -3218,6 +3234,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_8x: mov rcx,r9 + shr rdx,4 jz NEAR $L$no_data_vpmadd52_8x @@ -3560,6 +3577,7 @@ $L$no_data_vpmadd52_8x: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_blocks_vpmadd52_8x: ALIGN 32 @@ -3573,6 +3591,7 @@ $L$SEH_begin_poly1305_emit_base2_44: mov rdx,r8 + mov r8,QWORD[rdi] mov r9,QWORD[8+rdi] mov r10,QWORD[16+rdi] @@ -3605,6 +3624,7 @@ $L$SEH_begin_poly1305_emit_base2_44: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_poly1305_emit_base2_44: ALIGN 64 $L$const: @@ -3646,6 +3666,7 @@ global xor128_encrypt_n_pad ALIGN 16 xor128_encrypt_n_pad: + sub rdx,r8 sub rcx,r8 mov r10,r9 @@ -3689,10 +3710,12 @@ $L$done_enc: DB 0F3h,0C3h ;repret + global xor128_decrypt_n_pad ALIGN 16 xor128_decrypt_n_pad: + sub rdx,r8 sub rcx,r8 mov r10,r9 @@ -3739,6 +3762,7 @@ $L$done_dec: mov rax,r8 DB 0F3h,0C3h ;repret + EXTERN __imp_RtlVirtualUnwind ALIGN 16 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm index 5732b40ed64f3f..edbcc06e34b673 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm @@ -19,13 +19,14 @@ $L$SEH_begin_RC4: mov rdx,r8 mov rcx,r9 + + or rsi,rsi jne NEAR $L$entry mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret $L$entry: - push rbx push r12 @@ -558,6 +559,7 @@ $L$SEH_begin_RC4_set_key: mov rdx,r8 + lea rdi,[8+rdi] lea rdx,[rsi*1+rdx] neg rsi @@ -626,12 +628,14 @@ $L$exit_key: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_RC4_set_key: global RC4_options ALIGN 16 RC4_options: + lea rax,[$L$opts] mov edx,DWORD[OPENSSL_ia32cap_P] bt edx,20 @@ -644,6 +648,7 @@ $L$8xchar: add rax,12 $L$done: DB 0F3h,0C3h ;repret + ALIGN 64 $L$opts: DB 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm index d0471cb3b3e8c0..fdab35d95c2f29 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm @@ -8,6 +8,7 @@ section .text code align=64 ALIGN 32 __KeccakF1600: + mov rax,QWORD[60+rdi] mov rbx,QWORD[68+rdi] mov rcx,QWORD[76+rdi] @@ -263,6 +264,7 @@ $L$oop: + ALIGN 32 KeccakF1600: diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm index d796380ae8e82e..1b60a7ce75cae0 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm @@ -1458,10 +1458,10 @@ DB 102,15,56,0,251 movaps xmm9,XMMWORD[((-8-16))+rax] mov rsp,rax $L$epilogue_shaext: - mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_sha1_block_data_order_shaext: ALIGN 16 diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm index fc102444ff49ff..9ff3cbb92b5df1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm @@ -1804,6 +1804,7 @@ $L$SEH_begin_sha256_block_data_order_shaext: _shaext_shortcut: + lea rsp,[((-88))+rsp] movaps XMMWORD[(-8-80)+rax],xmm6 movaps XMMWORD[(-8-64)+rax],xmm7 @@ -2022,6 +2023,7 @@ $L$epilogue_shaext: mov rdi,QWORD[8+rsp] ;WIN64 epilogue mov rsi,QWORD[16+rsp] DB 0F3h,0C3h ;repret + $L$SEH_end_sha256_block_data_order_shaext: ALIGN 64 @@ -5476,6 +5478,8 @@ $L$ower_avx2: lea rsp,[448+rsp] + + add eax,DWORD[rdi] add ebx,DWORD[4+rdi] add ecx,DWORD[8+rdi] @@ -5501,15 +5505,17 @@ $L$ower_avx2: jbe NEAR $L$oop_avx2 lea rbp,[rsp] + + + $L$done_avx2: - lea rsp,[rbp] - mov rsi,QWORD[88+rsp] + mov rsi,QWORD[88+rbp] vzeroupper - movaps xmm6,XMMWORD[((64+32))+rsp] - movaps xmm7,XMMWORD[((64+48))+rsp] - movaps xmm8,XMMWORD[((64+64))+rsp] - movaps xmm9,XMMWORD[((64+80))+rsp] + movaps xmm6,XMMWORD[((64+32))+rbp] + movaps xmm7,XMMWORD[((64+48))+rbp] + movaps xmm8,XMMWORD[((64+64))+rbp] + movaps xmm9,XMMWORD[((64+80))+rbp] mov r15,QWORD[((-48))+rsi] mov r14,QWORD[((-40))+rsi] diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm index 1a9935d7b6ffc2..fc2269c8435930 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm @@ -5468,6 +5468,8 @@ $L$ower_avx2: lea rsp,[1152+rsp] + + add rax,QWORD[rdi] add rbx,QWORD[8+rdi] add rcx,QWORD[16+rdi] @@ -5493,17 +5495,19 @@ $L$ower_avx2: jbe NEAR $L$oop_avx2 lea rbp,[rsp] + + + $L$done_avx2: - lea rsp,[rbp] - mov rsi,QWORD[152+rsp] + mov rsi,QWORD[152+rbp] vzeroupper - movaps xmm6,XMMWORD[((128+32))+rsp] - movaps xmm7,XMMWORD[((128+48))+rsp] - movaps xmm8,XMMWORD[((128+64))+rsp] - movaps xmm9,XMMWORD[((128+80))+rsp] - movaps xmm10,XMMWORD[((128+96))+rsp] - movaps xmm11,XMMWORD[((128+112))+rsp] + movaps xmm6,XMMWORD[((128+32))+rbp] + movaps xmm7,XMMWORD[((128+48))+rbp] + movaps xmm8,XMMWORD[((128+64))+rbp] + movaps xmm9,XMMWORD[((128+80))+rbp] + movaps xmm10,XMMWORD[((128+96))+rbp] + movaps xmm11,XMMWORD[((128+112))+rbp] mov r15,QWORD[((-48))+rsi] mov r14,QWORD[((-40))+rsi] diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm index e2fec12d2211bf..f57d3210fc935f 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm @@ -17,6 +17,7 @@ global OPENSSL_atomic_add ALIGN 16 OPENSSL_atomic_add: + mov eax,DWORD[rcx] $L$spin: lea r8,[rax*1+rdx] DB 0xf0 @@ -27,16 +28,19 @@ DB 0x48,0x98 DB 0F3h,0C3h ;repret + global OPENSSL_rdtsc ALIGN 16 OPENSSL_rdtsc: + rdtsc shl rdx,32 or rax,rdx DB 0F3h,0C3h ;repret + global OPENSSL_ia32_cpuid ALIGN 16 @@ -219,6 +223,7 @@ global OPENSSL_cleanse ALIGN 16 OPENSSL_cleanse: + xor rax,rax cmp rdx,15 jae NEAR $L$ot @@ -250,10 +255,12 @@ $L$aligned: DB 0F3h,0C3h ;repret + global CRYPTO_memcmp ALIGN 16 CRYPTO_memcmp: + xor rax,rax xor r10,r10 cmp r8,0 @@ -283,6 +290,7 @@ $L$oop_cmp: $L$no_data: DB 0F3h,0C3h ;repret + global OPENSSL_wipe_cpu ALIGN 16 @@ -306,6 +314,7 @@ global OPENSSL_instrument_bus ALIGN 16 OPENSSL_instrument_bus: + mov r10,rcx mov rcx,rdx mov r11,rdx @@ -334,10 +343,12 @@ DB 0xf0 DB 0F3h,0C3h ;repret + global OPENSSL_instrument_bus2 ALIGN 16 OPENSSL_instrument_bus2: + mov r10,rcx mov rcx,rdx mov r11,r8 @@ -381,10 +392,12 @@ $L$done2: sub rax,rcx DB 0F3h,0C3h ;repret + global OPENSSL_ia32_rdrand_bytes ALIGN 16 OPENSSL_ia32_rdrand_bytes: + xor rax,rax cmp rdx,0 je NEAR $L$done_rdrand_bytes @@ -422,10 +435,12 @@ $L$done_rdrand_bytes: xor r10,r10 DB 0F3h,0C3h ;repret + global OPENSSL_ia32_rdseed_bytes ALIGN 16 OPENSSL_ia32_rdseed_bytes: + xor rax,rax cmp rdx,0 je NEAR $L$done_rdseed_bytes diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h index c4bc935b0a25d2..de662de12be0f1 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi index 2d20ac387916a0..91ad847952bcc6 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi @@ -20,6 +20,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi index 53d15ad06c0ecb..b70224fd8bd70c 100644 --- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi @@ -727,6 +727,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm index fdebb6f709d6b6..0091b95296b8f9 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm @@ -59,7 +59,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_WIN64A" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -115,8 +115,8 @@ our %config = ( sourcedir => ".", target => "VC-WIN64A", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -132,7 +132,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x557a48128d28)", + RANLIB => "CODE(0x557c73be49d8)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c", @@ -256,6 +256,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -374,8 +375,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -643,14 +644,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -726,6 +719,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1523,6 +1524,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3241,7 +3248,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3249,6 +3255,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3742,14 +3749,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4190,6 +4189,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4899,49 +4906,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4963,7 +4962,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4977,613 +4975,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5601,188 +5497,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5812,13 +5677,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5828,43 +5691,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5874,31 +5730,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5916,278 +5767,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6197,301 +6002,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6254,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,7 +6261,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6515,7 +6268,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6523,7 +6275,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6531,7 +6282,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6539,163 +6289,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6713,223 +6436,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6937,21 +6623,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6959,13 +6642,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6973,81 +6654,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7055,328 +6723,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7386,85 +6993,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7487,361 +7080,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7863,259 +7396,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8125,31 +7615,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8159,7 +7644,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8185,13 +7669,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8217,7 +7699,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8243,709 +7724,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8996,6 +8359,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9240,7 +8611,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9566,7 +8936,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9612,7 +8981,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9678,7 +9046,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9703,7 +9070,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9801,7 +9167,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9851,18 +9216,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9873,6 +9235,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9936,10 +9302,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9968,6 +9330,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10232,6 +9598,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15100,7 +14467,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15108,6 +14474,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15335,6 +14702,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15437,10 +14812,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15469,6 +14840,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h index fae2f1183e9277..00baa0f8636963 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: " -#define DATE "built on: Fri Sep 13 16:03:30 2019 UTC" +#define DATE "built on: Wed Mar 18 21:10:56 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h index d803b518584f2e..dab67d1b37ae72 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h index c3b41df01e40a3..0c96ce73633dac 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_WIN32 # define DSO_EXTENSION ".dll" #endif diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h index a89654ac77918c..0122f2c30dd818 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h @@ -102,9 +102,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h +++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm index b79cebd14c344b..7dc4c54dd0fe4c 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_AIX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "aix-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -353,8 +354,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -622,14 +623,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -705,6 +698,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1502,6 +1503,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3233,7 +3240,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3241,6 +3247,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3739,14 +3746,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4187,6 +4186,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4873,7 +4880,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4887,49 +4893,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4939,7 +4937,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4957,13 +4954,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4977,613 +4972,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5601,188 +5494,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5792,7 +5654,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5818,13 +5679,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5834,43 +5693,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5880,31 +5732,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5918,7 +5765,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5928,272 +5774,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6203,301 +6004,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6505,7 +6256,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6513,7 +6263,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6521,7 +6270,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6529,7 +6277,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6537,7 +6284,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6545,163 +6291,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6719,223 +6438,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6943,21 +6625,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6965,13 +6644,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6979,81 +6656,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7061,328 +6725,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7392,79 +6995,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7483,7 +7073,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7493,361 +7082,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7865,13 +7394,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7881,271 +7408,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8155,31 +7637,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8189,7 +7666,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8207,7 +7683,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8221,13 +7696,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8245,7 +7718,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8259,13 +7731,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8283,7 +7753,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8297,715 +7766,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9056,6 +8406,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9300,7 +8658,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9626,7 +8983,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9672,7 +9028,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9738,7 +9093,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9763,7 +9117,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9861,7 +9214,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9911,18 +9263,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9933,6 +9282,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9996,10 +9349,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10028,6 +9377,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10292,6 +9645,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15247,7 +14601,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15255,6 +14608,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15482,6 +14836,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15584,10 +14946,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15616,6 +14974,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s deleted file mode 100644 index 1506bcc03aae10..00000000000000 --- a/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s +++ /dev/null @@ -1,968 +0,0 @@ -.machine "any" -.csect .text[PR],7 - -.globl .bn_mul_mont_fpu64 -.align 5 -.bn_mul_mont_fpu64: - cmpwi 8,6 - mr 9,3 - li 3,0 - bclr 14,0 - andi. 0,8,3 - bclr 6,2 - - slwi 8,8,2 - li 12,-4096 - slwi 10,8,2 - add 10,10,8 - addi 10,10,488 - subf 10,10,1 - and 10,10,12 - subf 10,1,10 - mr 12,1 - stwux 1,1,10 - - stw 19,-148(12) - stw 20,-144(12) - stw 21,-140(12) - stw 22,-136(12) - stw 23,-132(12) - stw 24,-128(12) - stw 25,-124(12) - stw 26,-120(12) - stw 27,-116(12) - stw 28,-112(12) - stw 29,-108(12) - stw 30,-104(12) - stw 31,-100(12) - stfd 20,-96(12) - stfd 21,-88(12) - stfd 22,-80(12) - stfd 23,-72(12) - stfd 24,-64(12) - stfd 25,-56(12) - stfd 26,-48(12) - stfd 27,-40(12) - stfd 28,-32(12) - stfd 29,-24(12) - stfd 30,-16(12) - stfd 31,-8(12) - - addi 10,1,264 - li 12,-64 - add 22,10,8 - and 22,22,12 - - addi 22,22,-8 - srwi 11,8,4 - addi 11,11,-1 - addi 10,1,184 - li 0,0 - mtctr 11 - lwz 23,0(4) - mr 20,7 - lwz 21,4(4) - li 19,0 - lwz 25,0(5) - lwz 27,4(5) - lwz 7,0(20) - lwz 20,4(20) - - mullw 28,23,25 - mulhwu 29,23,25 - mullw 30,21,25 - mullw 31,23,27 - add 29,29,30 - add 29,29,31 - - extrwi 24,25,16,16 - extrwi 25,25,16,0 - extrwi 26,27,16,16 - extrwi 27,27,16,0 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mullw 24,28,7 - mulhwu 25,28,7 - mullw 26,29,7 - mullw 27,28,20 - add 25,25,26 - add 25,25,27 - - extrwi 28,24,16,16 - extrwi 29,24,16,0 - extrwi 30,25,16,16 - extrwi 31,25,16,0 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - - mr 24,23 - mr 25,21 - lwz 26,8(4) - lwz 27,12(4) - lwz 28,0(6) - lwz 29,4(6) - lwz 30,8(6) - lwz 31,12(6) - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 28,12,0 - fmul 29,12,1 - stfd 12,24(22) - stfd 13,32(22) - fmul 30,13,0 - fmul 31,13,1 - stfd 20,40(22) - stfd 21,48(22) - fmul 24,10,0 - fmul 25,10,1 - stfd 22,56(22) - stfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -L1st: - lwz 24,0(4) - lwz 25,4(4) - lwz 26,8(4) - lwz 27,12(4) - lwz 28,0(6) - lwz 29,4(6) - lwz 30,8(6) - lwz 31,12(6) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - lwz 25,64(1) - lwz 24,68(1) - lwz 27,72(1) - lwz 26,76(1) - lwz 29,80(1) - lwz 28,84(1) - lwz 31,88(1) - lwz 30,92(1) - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - stfd 12,24(22) - stfd 13,32(22) - fmadd 26,10,2,26 - fmadd 27,10,3,27 - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - stfd 20,40(22) - stfd 21,48(22) - srwi 19,25,16 - insrwi 0,25,16,0 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - fmul 8,13,2 - fmul 9,13,3 - stfd 22,56(22) - stfdu 23,64(22) - insrwi 24,26,16,0 - srwi 19,27,16 - insrwi 0,27,16,0 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lwz 27,96(1) - lwz 26,100(1) - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - srwi 19,29,16 - insrwi 0,29,16,0 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - insrwi 28,30,16,0 - srwi 19,31,16 - insrwi 0,31,16,0 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - lwz 31,104(1) - lwz 30,108(1) - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - stw 24,12(10) - stw 28,8(10) - srwi 19,27,16 - insrwi 0,27,16,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - lwz 25,112(1) - lwz 24,116(1) - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - insrwi 26,30,16,0 - srwi 19,31,16 - insrwi 0,31,16,0 - - fctid 24,24 - fctid 25,25 - lwz 29,120(1) - lwz 28,124(1) - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - fctid 26,26 - fctid 27,27 - srwi 19,25,16 - insrwi 0,25,16,0 - fctid 28,28 - fctid 29,29 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - fctid 30,30 - fctid 31,31 - insrwi 24,28,16,0 - srwi 19,29,16 - insrwi 0,29,16,0 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - stw 26,20(10) - stwu 24,16(10) - bc 16,0,L1st - - fctid 8,8 - fctid 9,9 - lwz 25,64(1) - lwz 24,68(1) - lwz 27,72(1) - lwz 26,76(1) - lwz 29,80(1) - lwz 28,84(1) - lwz 31,88(1) - lwz 30,92(1) - stfd 8,128(1) - stfd 9,136(1) - - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 24,26,16,0 - insrwi 0,27,16,0 - srwi 19,27,16 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 0,29,16,0 - srwi 19,29,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 28,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - stw 24,12(10) - stw 28,8(10) - - lwz 27,96(1) - lwz 26,100(1) - lwz 31,104(1) - lwz 30,108(1) - lwz 25,112(1) - lwz 24,116(1) - lwz 29,120(1) - lwz 28,124(1) - - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 0,27,16,0 - srwi 19,27,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 26,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 24,28,16,0 - insrwi 0,29,16,0 - srwi 19,29,16 - stw 26,20(10) - stwu 24,16(10) - - lwz 31,128(1) - lwz 30,132(1) - lwz 29,136(1) - lwz 28,140(1) - - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 0,31,16,0 - srwi 19,31,16 - addc 28,28,0 - adde 29,29,19 - - insrwi 30,28,16,0 - srwi 28,28,16 - insrwi 28,29,16,0 - srwi 3,29,16 - stw 30,12(10) - stw 28,8(10) - slwi 31,8,2 - subf 22,31,22 - - li 12,8 -.align 5 -Louter: - addi 10,1,192 - li 0,0 - mtctr 11 - add 24,5,12 - li 19,0 - lwz 25,0(24) - lwz 27,4(24) - - mullw 28,23,25 - lwz 24,204(1) - mulhwu 29,23,25 - lwz 26,200(1) - mullw 30,21,25 - mullw 31,23,27 - add 29,29,30 - add 29,29,31 - addc 28,28,24 - adde 29,29,26 - - extrwi 24,25,16,16 - extrwi 25,25,16,0 - extrwi 26,27,16,16 - extrwi 27,27,16,0 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mullw 24,28,7 - mulhwu 25,28,7 - mullw 26,29,7 - mullw 27,28,20 - add 25,25,26 - add 25,25,27 - - extrwi 28,24,16,16 - extrwi 29,24,16,0 - extrwi 30,25,16,16 - extrwi 31,25,16,0 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - lfd 10,8(22) - lfd 11,16(22) - lfd 12,24(22) - lfd 13,32(22) - lfd 20,40(22) - lfd 21,48(22) - lfd 22,56(22) - lfdu 23,64(22) - - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - fmul 30,13,0 - fmul 31,13,1 - fmul 24,10,0 - fmul 25,10,1 - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lfd 10,8(22) - lfd 11,16(22) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - lfd 12,24(22) - lfd 13,32(22) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -Linner: - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - lfd 20,40(22) - lfd 21,48(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - lfd 22,56(22) - lfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - lfd 10,8(22) - lfd 11,16(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - lfd 12,24(22) - lfd 13,32(22) - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lwz 25,64(1) - lwz 24,68(1) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - lwz 27,72(1) - lwz 26,76(1) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - lwz 29,80(1) - lwz 28,84(1) - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - lwz 31,88(1) - lwz 30,92(1) - srwi 19,25,16 - insrwi 0,25,16,0 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - insrwi 24,26,16,0 - srwi 19,27,16 - insrwi 0,27,16,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - lwz 26,12(10) - lwz 27,8(10) - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - srwi 19,29,16 - insrwi 0,29,16,0 - - fctid 24,24 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - fctid 25,25 - insrwi 28,30,16,0 - srwi 19,31,16 - insrwi 0,31,16,0 - fctid 26,26 - addc 24,24,26 - adde 28,28,27 - lwz 27,96(1) - lwz 26,100(1) - fctid 27,27 - addze 0,0 - addze 19,19 - stw 24,4(10) - stw 28,0(10) - fctid 28,28 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - lwz 31,104(1) - lwz 30,108(1) - fctid 29,29 - srwi 19,27,16 - insrwi 0,27,16,0 - lwz 25,112(1) - lwz 24,116(1) - fctid 30,30 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - lwz 29,120(1) - lwz 28,124(1) - fctid 31,31 - - insrwi 26,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - lwz 30,20(10) - lwzu 31,16(10) - addc 24,24,0 - stfd 24,64(1) - adde 25,25,19 - srwi 0,24,16 - stfd 25,72(1) - insrwi 0,25,16,0 - srwi 19,25,16 - addc 28,28,0 - stfd 26,80(1) - adde 29,29,19 - srwi 0,28,16 - insrwi 24,28,16,0 - stfd 27,88(1) - insrwi 0,29,16,0 - srwi 19,29,16 - - addc 26,26,30 - stfd 28,96(1) - adde 24,24,31 - stfd 29,104(1) - addze 0,0 - stfd 30,112(1) - addze 19,19 - stfd 31,120(1) - stw 26,-4(10) - stw 24,-8(10) - bc 16,0,Linner - - fctid 8,8 - fctid 9,9 - lwz 25,64(1) - lwz 24,68(1) - lwz 27,72(1) - lwz 26,76(1) - lwz 29,80(1) - lwz 28,84(1) - lwz 31,88(1) - lwz 30,92(1) - stfd 8,128(1) - stfd 9,136(1) - - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 24,26,16,0 - lwz 26,12(10) - insrwi 0,27,16,0 - srwi 19,27,16 - lwz 27,8(10) - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 0,29,16,0 - srwi 19,29,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 28,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - - addc 24,24,26 - adde 28,28,27 - addze 0,0 - addze 19,19 - stw 24,4(10) - stw 28,0(10) - - lwz 27,96(1) - lwz 26,100(1) - lwz 31,104(1) - lwz 30,108(1) - lwz 25,112(1) - lwz 24,116(1) - lwz 29,120(1) - lwz 28,124(1) - - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 0,27,16,0 - srwi 19,27,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 26,30,16,0 - lwz 30,20(10) - insrwi 0,31,16,0 - srwi 19,31,16 - lwzu 31,16(10) - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 24,28,16,0 - insrwi 0,29,16,0 - srwi 19,29,16 - - addc 26,26,30 - adde 24,24,31 - lwz 31,128(1) - lwz 30,132(1) - addze 0,0 - addze 19,19 - lwz 29,136(1) - lwz 28,140(1) - - addc 30,30,0 - adde 31,31,19 - stw 26,-4(10) - stw 24,-8(10) - addc 30,30,3 - addze 31,31 - srwi 0,30,16 - insrwi 0,31,16,0 - srwi 19,31,16 - addc 28,28,0 - adde 29,29,19 - - insrwi 30,28,16,0 - srwi 28,28,16 - insrwi 28,29,16,0 - srwi 3,29,16 - stw 30,4(10) - stw 28,0(10) - slwi 31,8,2 - addi 12,12,8 - subf 22,31,22 - cmpw 12,8 - blt- Louter - subf 6,8,6 - addi 11,11,1 - subfc 12,12,12 - addi 10,1,192 - addi 6,6,-4 - addi 9,9,-4 - addi 4,1,196 - mtctr 11 - -.align 4 -Lsub: lwz 24,12(10) - lwz 25,8(10) - lwz 26,20(10) - lwzu 27,16(10) - lwz 28,4(6) - lwz 29,8(6) - lwz 30,12(6) - lwzu 31,16(6) - subfe 28,28,24 - stw 24,4(4) - subfe 29,29,25 - stw 25,8(4) - subfe 30,30,26 - stw 26,12(4) - subfe 31,31,27 - stwu 27,16(4) - stw 28,4(9) - stw 29,8(9) - stw 30,12(9) - stwu 31,16(9) - bc 16,0,Lsub - - li 12,0 - subfe 3,12,3 - addi 4,1,196 - subf 9,8,9 - addi 10,1,192 - mtctr 11 - -.align 4 -Lcopy: - lwz 24,4(4) - lwz 25,8(4) - lwz 26,12(4) - lwzu 27,16(4) - lwz 28,4(9) - lwz 29,8(9) - lwz 30,12(9) - lwz 31,16(9) - std 12,8(22) - std 12,16(22) - std 12,24(22) - std 12,32(22) - std 12,40(22) - std 12,48(22) - std 12,56(22) - stdu 12,64(22) - and 24,24,3 - and 25,25,3 - and 26,26,3 - and 27,27,3 - andc 28,28,3 - andc 29,29,3 - andc 30,30,3 - andc 31,31,3 - or 24,24,28 - or 25,25,29 - or 26,26,30 - or 27,27,31 - stw 24,4(9) - stw 25,8(9) - stw 26,12(9) - stwu 27,16(9) - std 12,8(10) - stdu 12,16(10) - bc 16,0,Lcopy - lwz 12,0(1) - li 3,1 - lwz 19,-148(12) - lwz 20,-144(12) - lwz 21,-140(12) - lwz 22,-136(12) - lwz 23,-132(12) - lwz 24,-128(12) - lwz 25,-124(12) - lwz 26,-120(12) - lwz 27,-116(12) - lwz 28,-112(12) - lwz 29,-108(12) - lwz 30,-104(12) - lwz 31,-100(12) - lfd 20,-96(12) - lfd 21,-88(12) - lfd 22,-80(12) - lfd 23,-72(12) - lfd 24,-64(12) - lfd 25,-56(12) - lfd 26,-48(12) - lfd 27,-40(12) - lfd 28,-32(12) - lfd 29,-24(12) - lfd 30,-16(12) - lfd 31,-8(12) - mr 1,12 - blr -.long 0 -.byte 0,12,4,0,0x8c,13,6,0 -.long 0 - - -.byte 77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 2 diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h index 23bf3c386089ea..39bc5ba3c4b295 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Fri Sep 13 15:56:47 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:29 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h index 683c468946348b..9028305bd22cc1 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/progs.h b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm index 52c1848ab07914..2308e3e39b6966 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_AIX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "aix-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -353,8 +354,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -622,14 +623,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -705,6 +698,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1502,6 +1503,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3233,7 +3240,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3241,6 +3247,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3739,14 +3746,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4187,6 +4186,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4873,7 +4880,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4887,49 +4893,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4939,7 +4937,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4957,13 +4954,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4977,613 +4972,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5601,188 +5494,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5792,7 +5654,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5818,13 +5679,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5834,43 +5693,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5880,31 +5732,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5918,7 +5765,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5928,272 +5774,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6203,301 +6004,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6505,7 +6256,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6513,7 +6263,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6521,7 +6270,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6529,7 +6277,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6537,7 +6284,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6545,163 +6291,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6719,223 +6438,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6943,21 +6625,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6965,13 +6644,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6979,81 +6656,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7061,328 +6725,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7392,79 +6995,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7483,7 +7073,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7493,361 +7082,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7865,13 +7394,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7881,271 +7408,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8155,31 +7637,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8189,7 +7666,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8207,7 +7683,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8221,13 +7696,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8245,7 +7718,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8259,13 +7731,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8283,7 +7753,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8297,715 +7766,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9056,6 +8406,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9300,7 +8658,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9626,7 +8983,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9672,7 +9028,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9738,7 +9093,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9763,7 +9117,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9861,7 +9214,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9911,18 +9263,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9933,6 +9282,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9996,10 +9349,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10028,6 +9377,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10292,6 +9645,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15247,7 +14601,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15255,6 +14608,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15482,6 +14836,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15584,10 +14946,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15616,6 +14974,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h index 553eaaf94c54aa..eadeff3e4417da 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Fri Sep 13 15:56:53 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:33 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h index 683c468946348b..9028305bd22cc1 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm index 48bc45df709b75..401c0fa7dc230a 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_AIX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "aix-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -234,6 +234,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1501,6 +1502,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3219,7 +3226,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3227,6 +3233,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3725,14 +3732,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4173,6 +4172,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4867,49 +4874,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4931,7 +4930,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4945,613 +4943,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5569,188 +5465,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5780,13 +5645,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5796,43 +5659,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5842,31 +5698,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5884,278 +5735,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6165,301 +5970,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6467,7 +6222,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6475,7 +6229,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6483,7 +6236,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6491,7 +6243,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6250,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,163 +6257,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6681,223 +6404,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6905,21 +6591,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6927,13 +6610,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6941,81 +6622,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7023,328 +6691,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7354,85 +6961,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7455,361 +7048,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7831,259 +7364,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8093,31 +7583,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8127,7 +7612,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8153,13 +7637,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8185,7 +7667,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8211,709 +7692,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8964,6 +8327,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9208,7 +8579,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9534,7 +8904,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9580,7 +8949,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9646,7 +9014,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9671,7 +9038,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9769,7 +9135,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9819,18 +9184,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9841,6 +9203,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9904,10 +9270,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9936,6 +9298,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10200,6 +9566,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15090,7 +14457,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15098,6 +14464,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15325,6 +14692,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15427,10 +14802,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15459,6 +14830,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h index a3c2c5a66f7e4e..5a597aebe4a3eb 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Fri Sep 13 15:56:58 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:36 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h index 882ae5789d8a2c..5b3831705c7454 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h @@ -102,9 +102,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm index a91a3c0878db81..11958ce68b9186 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_AIX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "aix64-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -353,8 +354,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -622,14 +623,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -705,6 +698,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1502,6 +1503,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3236,7 +3243,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3244,6 +3250,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3742,14 +3749,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4190,6 +4189,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4876,7 +4883,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4890,49 +4896,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4942,7 +4940,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4960,13 +4957,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4980,613 +4975,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5604,188 +5497,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5795,7 +5657,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5821,13 +5682,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5837,43 +5696,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5883,31 +5735,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5921,7 +5768,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5931,272 +5777,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6206,301 +6007,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6508,7 +6259,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6516,7 +6266,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6524,7 +6273,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6532,7 +6280,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6540,7 +6287,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6548,163 +6294,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6718,7 +6437,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-sparcv9.o" => @@ -6728,235 +6446,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6964,21 +6643,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6986,13 +6662,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7000,81 +6674,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7082,328 +6743,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7413,79 +7013,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7504,7 +7091,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7514,361 +7100,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7886,13 +7412,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7902,271 +7426,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8176,31 +7655,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8210,7 +7684,6 @@ our %unified_info = ( "crypto/sha/keccak1600-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8228,7 +7701,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8242,13 +7714,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8266,7 +7736,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8280,13 +7749,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8304,7 +7771,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8318,715 +7784,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9077,6 +8424,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9321,7 +8676,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9647,7 +9001,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9693,7 +9046,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9759,7 +9111,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9784,7 +9135,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9882,7 +9232,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9932,18 +9281,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9954,6 +9300,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10017,10 +9367,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10049,6 +9395,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10313,6 +9663,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15283,7 +14634,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15291,6 +14641,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15518,6 +14869,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15620,10 +14979,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15652,6 +15007,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s deleted file mode 100644 index 96ef2a9ea7b6ba..00000000000000 --- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s +++ /dev/null @@ -1,745 +0,0 @@ -.machine "any" -.csect .text[PR],7 - -.globl .bn_mul_mont_fpu64 -.align 5 -.bn_mul_mont_fpu64: - cmpwi 8,3 - mr 9,3 - li 3,0 - bclr 14,0 - andi. 0,8,1 - bclr 6,2 - - slwi 8,8,3 - li 12,-4096 - slwi 10,8,2 - add 10,10,8 - addi 10,10,552 - subf 10,10,1 - and 10,10,12 - subf 10,1,10 - mr 12,1 - stdux 1,1,10 - - std 19,-200(12) - std 20,-192(12) - std 21,-184(12) - std 22,-176(12) - std 23,-168(12) - std 24,-160(12) - std 25,-152(12) - std 26,-144(12) - std 27,-136(12) - std 28,-128(12) - std 29,-120(12) - std 30,-112(12) - std 31,-104(12) - stfd 20,-96(12) - stfd 21,-88(12) - stfd 22,-80(12) - stfd 23,-72(12) - stfd 24,-64(12) - stfd 25,-56(12) - stfd 26,-48(12) - stfd 27,-40(12) - stfd 28,-32(12) - stfd 29,-24(12) - stfd 30,-16(12) - stfd 31,-8(12) - - addi 10,1,264 - li 12,-64 - add 22,10,8 - and 22,22,12 - - addi 22,22,-8 - srwi 11,8,4 - addi 11,11,-1 - addi 10,1,184 - li 0,0 - mtctr 11 - ld 23,0(4) - ld 27,0(5) - ld 7,0(7) - - mulld 31,23,27 - - rldicl 24,27,0,48 - rldicl 25,27,48,48 - rldicl 26,27,32,48 - rldicl 27,27,16,48 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mulld 31,31,7 - - rldicl 28,31,0,48 - rldicl 29,31,48,48 - rldicl 30,31,32,48 - rldicl 31,31,16,48 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - - rldicl 24,23,0,32 - rldicl 25,23,32,32 - lwz 26,12(4) - lwz 27,8(4) - lwz 28,4(6) - lwz 29,0(6) - lwz 30,12(6) - lwz 31,8(6) - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 28,12,0 - fmul 29,12,1 - stfd 12,24(22) - stfd 13,32(22) - fmul 30,13,0 - fmul 31,13,1 - stfd 20,40(22) - stfd 21,48(22) - fmul 24,10,0 - fmul 25,10,1 - stfd 22,56(22) - stfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -L1st: - lwz 24,4(4) - lwz 25,0(4) - lwz 26,12(4) - lwz 27,8(4) - lwz 28,4(6) - lwz 29,0(6) - lwz 30,12(6) - lwz 31,8(6) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - stfd 12,24(22) - stfd 13,32(22) - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - stfd 20,40(22) - stfd 21,48(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - add 24,24,0 - fmul 8,13,2 - fmul 9,13,3 - stfd 22,56(22) - stfdu 23,64(22) - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - insrdi 24,25,16,32 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - add 26,26,0 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - srdi 0,26,16 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - insrdi 24,26,16,16 - add 27,27,0 - srdi 0,27,16 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - insrdi 24,27,16,0 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - add 28,28,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - srdi 0,28,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - - fctid 24,24 - fctid 25,25 - add 30,30,0 - fctid 26,26 - fctid 27,27 - srdi 0,30,16 - fctid 28,28 - fctid 29,29 - insrdi 28,30,16,16 - fctid 30,30 - fctid 31,31 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - std 24,8(10) - stdu 28,16(10) - bc 16,0,L1st - - fctid 8,8 - fctid 9,9 - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - stfd 8,128(1) - stfd 9,136(1) - - add 24,24,0 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - insrdi 24,25,16,32 - add 26,26,0 - srdi 0,26,16 - insrdi 24,26,16,16 - add 27,27,0 - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - srdi 0,28,16 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - ld 30,128(1) - ld 31,136(1) - - std 24,8(10) - stdu 28,16(10) - - add 30,30,0 - srdi 0,30,16 - add 31,31,0 - insrdi 30,31,48,0 - srdi 3,31,48 - std 30,8(10) - slwi 31,8,2 - subf 22,31,22 - - li 12,8 -.align 5 -Louter: - addi 10,1,192 - li 0,0 - mtctr 11 - ldx 27,5,12 - - ld 30,200(1) - mulld 31,23,27 - add 31,31,30 - - rldicl 24,27,0,48 - rldicl 25,27,48,48 - rldicl 26,27,32,48 - rldicl 27,27,16,48 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mulld 31,31,7 - - rldicl 28,31,0,48 - rldicl 29,31,48,48 - rldicl 30,31,32,48 - rldicl 31,31,16,48 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - lfd 10,8(22) - lfd 11,16(22) - lfd 12,24(22) - lfd 13,32(22) - lfd 20,40(22) - lfd 21,48(22) - lfd 22,56(22) - lfdu 23,64(22) - - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - fmul 30,13,0 - fmul 31,13,1 - fmul 24,10,0 - fmul 25,10,1 - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lfd 10,8(22) - lfd 11,16(22) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - lfd 12,24(22) - lfd 13,32(22) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -Linner: - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - lfd 20,40(22) - lfd 21,48(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - lfd 22,56(22) - lfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - lfd 10,8(22) - lfd 11,16(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - lfd 12,24(22) - lfd 13,32(22) - fmadd 26,21,4,26 - fmadd 27,21,5,27 - ld 24,64(1) - ld 25,72(1) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - ld 26,80(1) - ld 27,88(1) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - add 24,24,0 - ld 28,96(1) - ld 29,104(1) - fmadd 24,20,4,24 - fmadd 25,20,5,25 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - ld 30,112(1) - ld 31,120(1) - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - insrdi 24,25,16,32 - ld 25,8(10) - fmadd 28,21,6,28 - fmadd 29,21,7,29 - add 26,26,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - srdi 0,26,16 - insrdi 24,26,16,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - add 27,27,0 - ldu 26,16(10) - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - - fctid 24,24 - fctid 25,25 - srdi 0,28,16 - fctid 26,26 - fctid 27,27 - add 29,29,0 - fctid 28,28 - fctid 29,29 - srdi 0,29,16 - insrdi 28,29,16,32 - fctid 30,30 - fctid 31,31 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - - stfd 24,64(1) - stfd 25,72(1) - add 31,31,0 - addc 27,24,25 - stfd 26,80(1) - stfd 27,88(1) - insrdi 28,31,16,0 - srdi 0,31,16 - stfd 28,96(1) - stfd 29,104(1) - adde 29,28,26 - stfd 30,112(1) - stfd 31,120(1) - addze 0,0 - std 27,-16(10) - std 29,-8(10) - bc 16,0,Linner - - fctid 8,8 - fctid 9,9 - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - stfd 8,128(1) - stfd 9,136(1) - - add 24,24,0 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - insrdi 24,25,16,32 - add 26,26,0 - ld 25,8(10) - srdi 0,26,16 - insrdi 24,26,16,16 - add 27,27,0 - ldu 26,16(10) - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - srdi 0,28,16 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - ld 30,128(1) - ld 31,136(1) - - addc 27,24,25 - adde 29,28,26 - addze 0,0 - - std 27,-16(10) - std 29,-8(10) - - add 0,0,3 - add 30,30,0 - srdi 0,30,16 - add 31,31,0 - insrdi 30,31,48,0 - srdi 3,31,48 - std 30,0(10) - slwi 31,8,2 - addi 12,12,8 - subf 22,31,22 - cmpw 12,8 - blt- Louter - subf 6,8,6 - addi 11,11,1 - subfc 12,12,12 - addi 10,1,200 - addi 28,1,208 - addi 29,6,8 - addi 30,9,8 - mtctr 11 - -.align 4 -Lsub: ldx 24,10,12 - ldx 25,6,12 - ldx 26,28,12 - ldx 27,29,12 - subfe 24,25,24 - subfe 26,27,26 - stdx 24,9,12 - stdx 26,30,12 - addi 12,12,16 - bc 16,0,Lsub - - li 12,0 - subfe 3,12,3 - mtctr 11 - -.align 4 -Lcopy: - ldx 24,10,12 - ldx 25,28,12 - ldx 26,9,12 - ldx 27,30,12 - std 12,8(22) - std 12,16(22) - std 12,24(22) - std 12,32(22) - std 12,40(22) - std 12,48(22) - std 12,56(22) - stdu 12,64(22) - and 24,24,3 - and 25,25,3 - andc 26,26,3 - andc 27,27,3 - or 24,24,26 - or 25,25,27 - stdx 24,9,12 - stdx 25,30,12 - stdx 12,10,12 - stdx 12,28,12 - addi 12,12,16 - bc 16,0,Lcopy - ld 12,0(1) - li 3,1 - ld 19,-200(12) - ld 20,-192(12) - ld 21,-184(12) - ld 22,-176(12) - ld 23,-168(12) - ld 24,-160(12) - ld 25,-152(12) - ld 26,-144(12) - ld 27,-136(12) - ld 28,-128(12) - ld 29,-120(12) - ld 30,-112(12) - ld 31,-104(12) - lfd 20,-96(12) - lfd 21,-88(12) - lfd 22,-80(12) - lfd 23,-72(12) - lfd 24,-64(12) - lfd 25,-56(12) - lfd 26,-48(12) - lfd 27,-40(12) - lfd 28,-32(12) - lfd 29,-24(12) - lfd 30,-16(12) - lfd 31,-8(12) - mr 1,12 - blr -.long 0 -.byte 0,12,4,0,0x8c,13,6,0 -.long 0 - - -.byte 77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 2 diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h index 4ec1ec8283c301..a994547d9f6878 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc" -#define DATE "built on: Fri Sep 13 15:57:01 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:38 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h index 23ac57c116ac27..2ab0cdb917d5e3 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm index 56f615362d9a45..ce4e06798c4b0e 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_AIX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "aix64-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -353,8 +354,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -622,14 +623,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -705,6 +698,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1502,6 +1503,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3236,7 +3243,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3244,6 +3250,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3742,14 +3749,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4190,6 +4189,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4876,7 +4883,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4890,49 +4896,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4942,7 +4940,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4960,13 +4957,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4980,613 +4975,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5604,188 +5497,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5795,7 +5657,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5821,13 +5682,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5837,43 +5696,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5883,31 +5735,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5921,7 +5768,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5931,272 +5777,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6206,301 +6007,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6508,7 +6259,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6516,7 +6266,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6524,7 +6273,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6532,7 +6280,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6540,7 +6287,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6548,163 +6294,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6718,7 +6437,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-sparcv9.o" => @@ -6728,235 +6446,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6964,21 +6643,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6986,13 +6662,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7000,81 +6674,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7082,328 +6743,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7413,79 +7013,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7504,7 +7091,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7514,361 +7100,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7886,13 +7412,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7902,271 +7426,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8176,31 +7655,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8210,7 +7684,6 @@ our %unified_info = ( "crypto/sha/keccak1600-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8228,7 +7701,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8242,13 +7714,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8266,7 +7736,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8280,13 +7749,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8304,7 +7771,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8318,715 +7784,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9077,6 +8424,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9321,7 +8676,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9647,7 +9001,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9693,7 +9046,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9759,7 +9111,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9784,7 +9135,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9882,7 +9232,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9932,18 +9281,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9954,6 +9300,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10017,10 +9367,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10049,6 +9395,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10313,6 +9663,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15283,7 +14634,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15291,6 +14641,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15518,6 +14869,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15620,10 +14979,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15652,6 +15007,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h index fe20db38c0347d..c53f28b67b46ab 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc" -#define DATE "built on: Fri Sep 13 15:57:07 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:42 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h index 23ac57c116ac27..2ab0cdb917d5e3 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm index d37f8ad8b04179..e5164e6d11a314 100644 --- a/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_AIX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "aix64-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -234,6 +234,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1501,6 +1502,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3219,7 +3226,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3227,6 +3233,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3725,14 +3732,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4173,6 +4172,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4867,49 +4874,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4931,7 +4930,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4945,613 +4943,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5569,188 +5465,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5780,13 +5645,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5796,43 +5659,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5842,31 +5698,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5884,278 +5735,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6165,301 +5970,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6467,7 +6222,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6475,7 +6229,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6483,7 +6236,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6491,7 +6243,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6250,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,163 +6257,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6681,223 +6404,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6905,21 +6591,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6927,13 +6610,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6941,81 +6622,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7023,328 +6691,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7354,85 +6961,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7455,361 +7048,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7831,259 +7364,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8093,31 +7583,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8127,7 +7612,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8153,13 +7637,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8185,7 +7667,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8211,709 +7692,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8964,6 +8327,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9208,7 +8579,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9534,7 +8904,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9580,7 +8949,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9646,7 +9014,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9671,7 +9038,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9769,7 +9135,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9819,18 +9184,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9841,6 +9203,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9904,10 +9270,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9936,6 +9298,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10200,6 +9566,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15090,7 +14457,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15098,6 +14464,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15325,6 +14692,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15427,10 +14802,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15459,6 +14830,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h index 533bf0b9e3e4a7..eca0e52e0aa6ff 100644 --- a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix64-gcc" -#define DATE "built on: Fri Sep 13 15:57:13 2019 UTC" +#define DATE "built on: Wed Mar 18 21:04:46 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h index c118ab6b899d5b..267f47f523ab26 100644 --- a/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h @@ -102,9 +102,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm index d9ceb02bb7bc17..e7607607e41f66 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "darwin-i386-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -235,6 +235,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1493,6 +1494,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3224,7 +3231,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3232,6 +3238,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3730,14 +3737,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4178,6 +4177,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4860,49 +4867,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4912,7 +4911,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4930,13 +4928,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4950,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5570,7 +5464,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5580,188 +5473,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5791,25 +5653,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5819,31 +5677,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5853,31 +5706,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5895,284 +5743,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6182,295 +5983,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6230,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6237,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6244,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6251,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,7 +6258,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6518,163 +6265,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6692,235 +6412,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6928,21 +6609,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6950,13 +6628,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6964,81 +6640,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7046,334 +6709,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7383,79 +6984,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7474,7 +7062,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7484,361 +7071,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7860,265 +7387,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8128,31 +7611,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8162,13 +7640,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8194,19 +7670,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8232,13 +7705,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8264,727 +7735,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9035,6 +8385,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9279,7 +8637,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9605,7 +8962,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9651,7 +9007,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9717,7 +9072,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9742,7 +9096,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9840,7 +9193,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9890,18 +9242,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9912,6 +9261,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9975,10 +9328,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10007,6 +9356,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10271,6 +9624,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15226,7 +14580,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15234,6 +14587,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15461,6 +14815,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15563,10 +14925,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15595,6 +14953,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.s b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.s deleted file mode 100644 index 5e231470937c9d..00000000000000 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.s +++ /dev/null @@ -1,3207 +0,0 @@ -.text -.align 4 -__x86_AES_encrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L000loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ecx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ecx,%edi - xorl %esi,%ecx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ecx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%ecx - andl %edx,%ebp - leal (%edx,%edx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %edx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %edx,%edi - xorl %esi,%edx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%edx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%edx - andl %eax,%ebp - leal (%eax,%eax,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %eax,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %eax,%edi - xorl %esi,%eax - rorl $24,%edi - xorl %ebp,%esi - roll $24,%eax - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%eax - andl %ebx,%ebp - leal (%ebx,%ebx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ebx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ebx,%edi - xorl %esi,%ebx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ebx - xorl %edi,%esi - xorl %esi,%ebx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L000loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.align 4 -__sse_AES_encrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L001loop: - pshufw $8,%mm0,%mm1 - pshufw $13,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $13,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $8,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $8,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - movd %mm2,%eax - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - movd %mm6,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $8,%esi - shrl $16,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shrl $16,%eax - movd %ecx,%mm1 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - andl $255,%eax - orl %esi,%ecx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - andl $255,%ebx - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%ecx - shll $16,%eax - movzbl -128(%ebp,%edi,1),%esi - orl %eax,%edx - shll $8,%esi - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - orl %ebx,%edx - movl 20(%esp),%edi - movd %ecx,%mm4 - movd %edx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L002out - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - movq %mm0,%mm1 - movq %mm4,%mm5 - pcmpgtb %mm0,%mm3 - pcmpgtb %mm4,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - pshufw $177,%mm0,%mm2 - pshufw $177,%mm4,%mm6 - paddb %mm0,%mm0 - paddb %mm4,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pshufw $177,%mm2,%mm3 - pshufw $177,%mm6,%mm7 - pxor %mm0,%mm1 - pxor %mm4,%mm5 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm3,%mm2 - movq %mm7,%mm6 - pslld $8,%mm3 - pslld $8,%mm7 - psrld $24,%mm2 - psrld $24,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - psrld $8,%mm1 - psrld $8,%mm5 - movl -128(%ebp),%eax - pslld $24,%mm3 - pslld $24,%mm7 - movl -64(%ebp),%ebx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl (%ebp),%ecx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl 64(%ebp),%edx - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L001loop -.align 4,0x90 -L002out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.align 4 -__x86_AES_encrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L003loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl (%ebp,%esi,8),%esi - movzbl %ch,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movzbl %bh,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - movl (%ebp,%edx,8),%edx - movzbl %ah,%eax - xorl 3(%ebp,%eax,8),%edx - movl 4(%esp),%eax - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - xorl 1(%ebp,%ecx,8),%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L003loop - movl %eax,%esi - andl $255,%esi - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %bh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %ch,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %dh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movzbl %bh,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movl 2(%ebp,%edx,8),%edx - andl $255,%edx - movzbl %ah,%eax - movl (%ebp,%eax,8),%eax - andl $65280,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movl (%ebp,%ebx,8),%ebx - andl $16711680,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movl 2(%ebp,%ecx,8),%ecx - andl $4278190080,%ecx - xorl %ecx,%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Te: -.long 2774754246,2774754246 -.long 2222750968,2222750968 -.long 2574743534,2574743534 -.long 2373680118,2373680118 -.long 234025727,234025727 -.long 3177933782,3177933782 -.long 2976870366,2976870366 -.long 1422247313,1422247313 -.long 1345335392,1345335392 -.long 50397442,50397442 -.long 2842126286,2842126286 -.long 2099981142,2099981142 -.long 436141799,436141799 -.long 1658312629,1658312629 -.long 3870010189,3870010189 -.long 2591454956,2591454956 -.long 1170918031,1170918031 -.long 2642575903,2642575903 -.long 1086966153,1086966153 -.long 2273148410,2273148410 -.long 368769775,368769775 -.long 3948501426,3948501426 -.long 3376891790,3376891790 -.long 200339707,200339707 -.long 3970805057,3970805057 -.long 1742001331,1742001331 -.long 4255294047,4255294047 -.long 3937382213,3937382213 -.long 3214711843,3214711843 -.long 4154762323,4154762323 -.long 2524082916,2524082916 -.long 1539358875,1539358875 -.long 3266819957,3266819957 -.long 486407649,486407649 -.long 2928907069,2928907069 -.long 1780885068,1780885068 -.long 1513502316,1513502316 -.long 1094664062,1094664062 -.long 49805301,49805301 -.long 1338821763,1338821763 -.long 1546925160,1546925160 -.long 4104496465,4104496465 -.long 887481809,887481809 -.long 150073849,150073849 -.long 2473685474,2473685474 -.long 1943591083,1943591083 -.long 1395732834,1395732834 -.long 1058346282,1058346282 -.long 201589768,201589768 -.long 1388824469,1388824469 -.long 1696801606,1696801606 -.long 1589887901,1589887901 -.long 672667696,672667696 -.long 2711000631,2711000631 -.long 251987210,251987210 -.long 3046808111,3046808111 -.long 151455502,151455502 -.long 907153956,907153956 -.long 2608889883,2608889883 -.long 1038279391,1038279391 -.long 652995533,652995533 -.long 1764173646,1764173646 -.long 3451040383,3451040383 -.long 2675275242,2675275242 -.long 453576978,453576978 -.long 2659418909,2659418909 -.long 1949051992,1949051992 -.long 773462580,773462580 -.long 756751158,756751158 -.long 2993581788,2993581788 -.long 3998898868,3998898868 -.long 4221608027,4221608027 -.long 4132590244,4132590244 -.long 1295727478,1295727478 -.long 1641469623,1641469623 -.long 3467883389,3467883389 -.long 2066295122,2066295122 -.long 1055122397,1055122397 -.long 1898917726,1898917726 -.long 2542044179,2542044179 -.long 4115878822,4115878822 -.long 1758581177,1758581177 -.long 0,0 -.long 753790401,753790401 -.long 1612718144,1612718144 -.long 536673507,536673507 -.long 3367088505,3367088505 -.long 3982187446,3982187446 -.long 3194645204,3194645204 -.long 1187761037,1187761037 -.long 3653156455,3653156455 -.long 1262041458,1262041458 -.long 3729410708,3729410708 -.long 3561770136,3561770136 -.long 3898103984,3898103984 -.long 1255133061,1255133061 -.long 1808847035,1808847035 -.long 720367557,720367557 -.long 3853167183,3853167183 -.long 385612781,385612781 -.long 3309519750,3309519750 -.long 3612167578,3612167578 -.long 1429418854,1429418854 -.long 2491778321,2491778321 -.long 3477423498,3477423498 -.long 284817897,284817897 -.long 100794884,100794884 -.long 2172616702,2172616702 -.long 4031795360,4031795360 -.long 1144798328,1144798328 -.long 3131023141,3131023141 -.long 3819481163,3819481163 -.long 4082192802,4082192802 -.long 4272137053,4272137053 -.long 3225436288,3225436288 -.long 2324664069,2324664069 -.long 2912064063,2912064063 -.long 3164445985,3164445985 -.long 1211644016,1211644016 -.long 83228145,83228145 -.long 3753688163,3753688163 -.long 3249976951,3249976951 -.long 1977277103,1977277103 -.long 1663115586,1663115586 -.long 806359072,806359072 -.long 452984805,452984805 -.long 250868733,250868733 -.long 1842533055,1842533055 -.long 1288555905,1288555905 -.long 336333848,336333848 -.long 890442534,890442534 -.long 804056259,804056259 -.long 3781124030,3781124030 -.long 2727843637,2727843637 -.long 3427026056,3427026056 -.long 957814574,957814574 -.long 1472513171,1472513171 -.long 4071073621,4071073621 -.long 2189328124,2189328124 -.long 1195195770,1195195770 -.long 2892260552,2892260552 -.long 3881655738,3881655738 -.long 723065138,723065138 -.long 2507371494,2507371494 -.long 2690670784,2690670784 -.long 2558624025,2558624025 -.long 3511635870,3511635870 -.long 2145180835,2145180835 -.long 1713513028,1713513028 -.long 2116692564,2116692564 -.long 2878378043,2878378043 -.long 2206763019,2206763019 -.long 3393603212,3393603212 -.long 703524551,703524551 -.long 3552098411,3552098411 -.long 1007948840,1007948840 -.long 2044649127,2044649127 -.long 3797835452,3797835452 -.long 487262998,487262998 -.long 1994120109,1994120109 -.long 1004593371,1004593371 -.long 1446130276,1446130276 -.long 1312438900,1312438900 -.long 503974420,503974420 -.long 3679013266,3679013266 -.long 168166924,168166924 -.long 1814307912,1814307912 -.long 3831258296,3831258296 -.long 1573044895,1573044895 -.long 1859376061,1859376061 -.long 4021070915,4021070915 -.long 2791465668,2791465668 -.long 2828112185,2828112185 -.long 2761266481,2761266481 -.long 937747667,937747667 -.long 2339994098,2339994098 -.long 854058965,854058965 -.long 1137232011,1137232011 -.long 1496790894,1496790894 -.long 3077402074,3077402074 -.long 2358086913,2358086913 -.long 1691735473,1691735473 -.long 3528347292,3528347292 -.long 3769215305,3769215305 -.long 3027004632,3027004632 -.long 4199962284,4199962284 -.long 133494003,133494003 -.long 636152527,636152527 -.long 2942657994,2942657994 -.long 2390391540,2390391540 -.long 3920539207,3920539207 -.long 403179536,403179536 -.long 3585784431,3585784431 -.long 2289596656,2289596656 -.long 1864705354,1864705354 -.long 1915629148,1915629148 -.long 605822008,605822008 -.long 4054230615,4054230615 -.long 3350508659,3350508659 -.long 1371981463,1371981463 -.long 602466507,602466507 -.long 2094914977,2094914977 -.long 2624877800,2624877800 -.long 555687742,555687742 -.long 3712699286,3712699286 -.long 3703422305,3703422305 -.long 2257292045,2257292045 -.long 2240449039,2240449039 -.long 2423288032,2423288032 -.long 1111375484,1111375484 -.long 3300242801,3300242801 -.long 2858837708,2858837708 -.long 3628615824,3628615824 -.long 84083462,84083462 -.long 32962295,32962295 -.long 302911004,302911004 -.long 2741068226,2741068226 -.long 1597322602,1597322602 -.long 4183250862,4183250862 -.long 3501832553,3501832553 -.long 2441512471,2441512471 -.long 1489093017,1489093017 -.long 656219450,656219450 -.long 3114180135,3114180135 -.long 954327513,954327513 -.long 335083755,335083755 -.long 3013122091,3013122091 -.long 856756514,856756514 -.long 3144247762,3144247762 -.long 1893325225,1893325225 -.long 2307821063,2307821063 -.long 2811532339,2811532339 -.long 3063651117,3063651117 -.long 572399164,572399164 -.long 2458355477,2458355477 -.long 552200649,552200649 -.long 1238290055,1238290055 -.long 4283782570,4283782570 -.long 2015897680,2015897680 -.long 2061492133,2061492133 -.long 2408352771,2408352771 -.long 4171342169,4171342169 -.long 2156497161,2156497161 -.long 386731290,386731290 -.long 3669999461,3669999461 -.long 837215959,837215959 -.long 3326231172,3326231172 -.long 3093850320,3093850320 -.long 3275833730,3275833730 -.long 2962856233,2962856233 -.long 1999449434,1999449434 -.long 286199582,286199582 -.long 3417354363,3417354363 -.long 4233385128,4233385128 -.long 3602627437,3602627437 -.long 974525996,974525996 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.long 1,2,4,8 -.long 16,32,64,128 -.long 27,54,0,0 -.long 0,0,0,0 -.globl _AES_encrypt -.align 4 -_AES_encrypt: -L_AES_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L004pic_point -L004pic_point: - popl %ebp - movl L_OPENSSL_ia32cap_P$non_lazy_ptr-L004pic_point(%ebp),%eax - leal LAES_Te-L004pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L005x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L005x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4 -__x86_AES_decrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L006loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%eax - subl %edi,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %ecx,%eax - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ecx,%ebx - roll $8,%ecx - xorl %esi,%ebp - xorl %eax,%ecx - xorl %ebp,%eax - xorl %ebx,%ecx - xorl %ebp,%ebx - roll $24,%eax - xorl %ebp,%ecx - roll $16,%ebx - xorl %eax,%ecx - roll $8,%ebp - xorl %ebx,%ecx - movl 4(%esp),%eax - xorl %ebp,%ecx - movl %ecx,12(%esp) - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %edx,%ebx - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %edx,%ecx - roll $8,%edx - xorl %esi,%ebp - xorl %ebx,%edx - xorl %ebp,%ebx - xorl %ecx,%edx - xorl %ebp,%ecx - roll $24,%ebx - xorl %ebp,%edx - roll $16,%ecx - xorl %ebx,%edx - roll $8,%ebp - xorl %ecx,%edx - movl 8(%esp),%ebx - xorl %ebp,%edx - movl %edx,16(%esp) - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %eax,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %eax,%edx - roll $8,%eax - xorl %esi,%ebp - xorl %ecx,%eax - xorl %ebp,%ecx - xorl %edx,%eax - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%eax - roll $16,%edx - xorl %ecx,%eax - roll $8,%ebp - xorl %edx,%eax - xorl %ebp,%eax - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ebx,%edx - roll $8,%ebx - xorl %esi,%ebp - xorl %ecx,%ebx - xorl %ebp,%ecx - xorl %edx,%ebx - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%ebp - xorl %edx,%ebx - movl 12(%esp),%ecx - xorl %ebp,%ebx - movl 16(%esp),%edx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L006loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.align 4 -__sse_AES_decrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L007loop: - pshufw $12,%mm0,%mm1 - pshufw $9,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $6,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $3,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movd %mm2,%eax - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $16,%esi - movd %mm6,%ebx - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %al,%edi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $16,%esi - shrl $16,%eax - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shrl $16,%ebx - shll $8,%esi - movd %edx,%mm1 - movzbl -128(%ebp,%edi,1),%edx - movzbl %bh,%edi - shll $24,%edx - andl $255,%ebx - orl %esi,%edx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movzbl %ah,%eax - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - orl %ebx,%edx - shll $16,%esi - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%edx - shll $24,%eax - orl %eax,%ecx - movl 20(%esp),%edi - movd %edx,%mm4 - movd %ecx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L008out - movq %mm0,%mm3 - movq %mm4,%mm7 - pshufw $228,%mm0,%mm2 - pshufw $228,%mm4,%mm6 - movq %mm0,%mm1 - movq %mm4,%mm5 - pshufw $177,%mm0,%mm0 - pshufw $177,%mm4,%mm4 - pslld $8,%mm2 - pslld $8,%mm6 - psrld $8,%mm3 - psrld $8,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pslld $16,%mm2 - pslld $16,%mm6 - psrld $16,%mm3 - psrld $16,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movq 8(%esp),%mm3 - pxor %mm2,%mm2 - pxor %mm6,%mm6 - pcmpgtb %mm1,%mm2 - pcmpgtb %mm5,%mm6 - pand %mm3,%mm2 - pand %mm3,%mm6 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm2,%mm1 - pxor %mm6,%mm5 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq %mm1,%mm2 - movq %mm5,%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pslld $24,%mm3 - pslld $24,%mm7 - psrld $8,%mm2 - psrld $8,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pshufw $177,%mm1,%mm3 - pshufw $177,%mm5,%mm7 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - pshufw $177,%mm1,%mm2 - pshufw $177,%mm5,%mm6 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pslld $8,%mm1 - pslld $8,%mm5 - psrld $8,%mm3 - psrld $8,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl -128(%ebp),%eax - pslld $16,%mm1 - pslld $16,%mm5 - movl -64(%ebp),%ebx - psrld $16,%mm3 - psrld $16,%mm7 - movl (%ebp),%ecx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl 64(%ebp),%edx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L007loop -.align 4,0x90 -L008out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.align 4 -__x86_AES_decrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L009loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ebx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %ah,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - andl $255,%edx - movl (%ebp,%edx,8),%edx - movzbl %ch,%ecx - xorl 3(%ebp,%ecx,8),%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - shrl $24,%eax - xorl 1(%ebp,%eax,8),%edx - movl 4(%esp),%eax - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L009loop - leal 2176(%ebp),%ebp - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi - leal -128(%ebp),%ebp - movl %eax,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl (%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl (%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl (%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl (%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - leal -2048(%ebp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Td: -.long 1353184337,1353184337 -.long 1399144830,1399144830 -.long 3282310938,3282310938 -.long 2522752826,2522752826 -.long 3412831035,3412831035 -.long 4047871263,4047871263 -.long 2874735276,2874735276 -.long 2466505547,2466505547 -.long 1442459680,1442459680 -.long 4134368941,4134368941 -.long 2440481928,2440481928 -.long 625738485,625738485 -.long 4242007375,4242007375 -.long 3620416197,3620416197 -.long 2151953702,2151953702 -.long 2409849525,2409849525 -.long 1230680542,1230680542 -.long 1729870373,1729870373 -.long 2551114309,2551114309 -.long 3787521629,3787521629 -.long 41234371,41234371 -.long 317738113,317738113 -.long 2744600205,2744600205 -.long 3338261355,3338261355 -.long 3881799427,3881799427 -.long 2510066197,2510066197 -.long 3950669247,3950669247 -.long 3663286933,3663286933 -.long 763608788,763608788 -.long 3542185048,3542185048 -.long 694804553,694804553 -.long 1154009486,1154009486 -.long 1787413109,1787413109 -.long 2021232372,2021232372 -.long 1799248025,1799248025 -.long 3715217703,3715217703 -.long 3058688446,3058688446 -.long 397248752,397248752 -.long 1722556617,1722556617 -.long 3023752829,3023752829 -.long 407560035,407560035 -.long 2184256229,2184256229 -.long 1613975959,1613975959 -.long 1165972322,1165972322 -.long 3765920945,3765920945 -.long 2226023355,2226023355 -.long 480281086,480281086 -.long 2485848313,2485848313 -.long 1483229296,1483229296 -.long 436028815,436028815 -.long 2272059028,2272059028 -.long 3086515026,3086515026 -.long 601060267,601060267 -.long 3791801202,3791801202 -.long 1468997603,1468997603 -.long 715871590,715871590 -.long 120122290,120122290 -.long 63092015,63092015 -.long 2591802758,2591802758 -.long 2768779219,2768779219 -.long 4068943920,4068943920 -.long 2997206819,2997206819 -.long 3127509762,3127509762 -.long 1552029421,1552029421 -.long 723308426,723308426 -.long 2461301159,2461301159 -.long 4042393587,4042393587 -.long 2715969870,2715969870 -.long 3455375973,3455375973 -.long 3586000134,3586000134 -.long 526529745,526529745 -.long 2331944644,2331944644 -.long 2639474228,2639474228 -.long 2689987490,2689987490 -.long 853641733,853641733 -.long 1978398372,1978398372 -.long 971801355,971801355 -.long 2867814464,2867814464 -.long 111112542,111112542 -.long 1360031421,1360031421 -.long 4186579262,4186579262 -.long 1023860118,1023860118 -.long 2919579357,2919579357 -.long 1186850381,1186850381 -.long 3045938321,3045938321 -.long 90031217,90031217 -.long 1876166148,1876166148 -.long 4279586912,4279586912 -.long 620468249,620468249 -.long 2548678102,2548678102 -.long 3426959497,3426959497 -.long 2006899047,2006899047 -.long 3175278768,3175278768 -.long 2290845959,2290845959 -.long 945494503,945494503 -.long 3689859193,3689859193 -.long 1191869601,1191869601 -.long 3910091388,3910091388 -.long 3374220536,3374220536 -.long 0,0 -.long 2206629897,2206629897 -.long 1223502642,1223502642 -.long 2893025566,2893025566 -.long 1316117100,1316117100 -.long 4227796733,4227796733 -.long 1446544655,1446544655 -.long 517320253,517320253 -.long 658058550,658058550 -.long 1691946762,1691946762 -.long 564550760,564550760 -.long 3511966619,3511966619 -.long 976107044,976107044 -.long 2976320012,2976320012 -.long 266819475,266819475 -.long 3533106868,3533106868 -.long 2660342555,2660342555 -.long 1338359936,1338359936 -.long 2720062561,2720062561 -.long 1766553434,1766553434 -.long 370807324,370807324 -.long 179999714,179999714 -.long 3844776128,3844776128 -.long 1138762300,1138762300 -.long 488053522,488053522 -.long 185403662,185403662 -.long 2915535858,2915535858 -.long 3114841645,3114841645 -.long 3366526484,3366526484 -.long 2233069911,2233069911 -.long 1275557295,1275557295 -.long 3151862254,3151862254 -.long 4250959779,4250959779 -.long 2670068215,2670068215 -.long 3170202204,3170202204 -.long 3309004356,3309004356 -.long 880737115,880737115 -.long 1982415755,1982415755 -.long 3703972811,3703972811 -.long 1761406390,1761406390 -.long 1676797112,1676797112 -.long 3403428311,3403428311 -.long 277177154,277177154 -.long 1076008723,1076008723 -.long 538035844,538035844 -.long 2099530373,2099530373 -.long 4164795346,4164795346 -.long 288553390,288553390 -.long 1839278535,1839278535 -.long 1261411869,1261411869 -.long 4080055004,4080055004 -.long 3964831245,3964831245 -.long 3504587127,3504587127 -.long 1813426987,1813426987 -.long 2579067049,2579067049 -.long 4199060497,4199060497 -.long 577038663,577038663 -.long 3297574056,3297574056 -.long 440397984,440397984 -.long 3626794326,3626794326 -.long 4019204898,4019204898 -.long 3343796615,3343796615 -.long 3251714265,3251714265 -.long 4272081548,4272081548 -.long 906744984,906744984 -.long 3481400742,3481400742 -.long 685669029,685669029 -.long 646887386,646887386 -.long 2764025151,2764025151 -.long 3835509292,3835509292 -.long 227702864,227702864 -.long 2613862250,2613862250 -.long 1648787028,1648787028 -.long 3256061430,3256061430 -.long 3904428176,3904428176 -.long 1593260334,1593260334 -.long 4121936770,4121936770 -.long 3196083615,3196083615 -.long 2090061929,2090061929 -.long 2838353263,2838353263 -.long 3004310991,3004310991 -.long 999926984,999926984 -.long 2809993232,2809993232 -.long 1852021992,1852021992 -.long 2075868123,2075868123 -.long 158869197,158869197 -.long 4095236462,4095236462 -.long 28809964,28809964 -.long 2828685187,2828685187 -.long 1701746150,1701746150 -.long 2129067946,2129067946 -.long 147831841,147831841 -.long 3873969647,3873969647 -.long 3650873274,3650873274 -.long 3459673930,3459673930 -.long 3557400554,3557400554 -.long 3598495785,3598495785 -.long 2947720241,2947720241 -.long 824393514,824393514 -.long 815048134,815048134 -.long 3227951669,3227951669 -.long 935087732,935087732 -.long 2798289660,2798289660 -.long 2966458592,2966458592 -.long 366520115,366520115 -.long 1251476721,1251476721 -.long 4158319681,4158319681 -.long 240176511,240176511 -.long 804688151,804688151 -.long 2379631990,2379631990 -.long 1303441219,1303441219 -.long 1414376140,1414376140 -.long 3741619940,3741619940 -.long 3820343710,3820343710 -.long 461924940,461924940 -.long 3089050817,3089050817 -.long 2136040774,2136040774 -.long 82468509,82468509 -.long 1563790337,1563790337 -.long 1937016826,1937016826 -.long 776014843,776014843 -.long 1511876531,1511876531 -.long 1389550482,1389550482 -.long 861278441,861278441 -.long 323475053,323475053 -.long 2355222426,2355222426 -.long 2047648055,2047648055 -.long 2383738969,2383738969 -.long 2302415851,2302415851 -.long 3995576782,3995576782 -.long 902390199,902390199 -.long 3991215329,3991215329 -.long 1018251130,1018251130 -.long 1507840668,1507840668 -.long 1064563285,1064563285 -.long 2043548696,2043548696 -.long 3208103795,3208103795 -.long 3939366739,3939366739 -.long 1537932639,1537932639 -.long 342834655,342834655 -.long 2262516856,2262516856 -.long 2180231114,2180231114 -.long 1053059257,1053059257 -.long 741614648,741614648 -.long 1598071746,1598071746 -.long 1925389590,1925389590 -.long 203809468,203809468 -.long 2336832552,2336832552 -.long 1100287487,1100287487 -.long 1895934009,1895934009 -.long 3736275976,3736275976 -.long 2632234200,2632234200 -.long 2428589668,2428589668 -.long 1636092795,1636092795 -.long 1890988757,1890988757 -.long 1952214088,1952214088 -.long 1113045200,1113045200 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.globl _AES_decrypt -.align 4 -_AES_decrypt: -L_AES_decrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L010pic_point -L010pic_point: - popl %ebp - movl L_OPENSSL_ia32cap_P$non_lazy_ptr-L010pic_point(%ebp),%eax - leal LAES_Td-L010pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L011x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L011x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_cbc_encrypt -.align 4 -_AES_cbc_encrypt: -L_AES_cbc_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%ecx - cmpl $0,%ecx - je L012drop_out - call L013pic_point -L013pic_point: - popl %ebp - movl L_OPENSSL_ia32cap_P$non_lazy_ptr-L013pic_point(%ebp),%eax - cmpl $0,40(%esp) - leal LAES_Te-L013pic_point(%ebp),%ebp - jne L014picked_te - leal LAES_Td-LAES_Te(%ebp),%ebp -L014picked_te: - pushfl - cld - cmpl $512,%ecx - jb L015slow_way - testl $15,%ecx - jnz L015slow_way - btl $28,(%eax) - jc L015slow_way - leal -324(%esp),%esi - andl $-64,%esi - movl %ebp,%eax - leal 2304(%ebp),%ebx - movl %esi,%edx - andl $4095,%eax - andl $4095,%ebx - andl $4095,%edx - cmpl %ebx,%edx - jb L016tbl_break_out - subl %ebx,%edx - subl %edx,%esi - jmp L017tbl_ok -.align 2,0x90 -L016tbl_break_out: - subl %eax,%edx - andl $4095,%edx - addl $384,%edx - subl %edx,%esi -.align 2,0x90 -L017tbl_ok: - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 12(%edx),%edi - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl $0,316(%esp) - movl %edi,%ebx - movl $61,%ecx - subl %ebp,%ebx - movl %edi,%esi - andl $4095,%ebx - leal 76(%esp),%edi - cmpl $2304,%ebx - jb L018do_copy - cmpl $3852,%ebx - jb L019skip_copy -.align 2,0x90 -L018do_copy: - movl %edi,44(%esp) -.long 2784229001 -L019skip_copy: - movl $16,%edi -.align 2,0x90 -L020prefetch_tbl: - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%esi - leal 128(%ebp),%ebp - subl $1,%edi - jnz L020prefetch_tbl - subl $2048,%ebp - movl 32(%esp),%esi - movl 48(%esp),%edi - cmpl $0,%edx - je L021fast_decrypt - movl (%edi),%eax - movl 4(%edi),%ebx -.align 4,0x90 -L022fast_enc_loop: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - leal 16(%esi),%esi - movl 40(%esp),%ecx - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L022fast_enc_loop - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L023skip_ezero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L023skip_ezero: - movl 28(%esp),%esp - popfl -L012drop_out: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L021fast_decrypt: - cmpl 36(%esp),%esi - je L024fast_dec_in_place - movl %edi,52(%esp) -.align 2,0x90 -.align 4,0x90 -L025fast_dec_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 52(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 36(%esp),%edi - movl 32(%esp),%esi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl %esi,52(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edi - movl %edi,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L025fast_dec_loop - movl 52(%esp),%edi - movl 48(%esp),%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - jmp L026fast_dec_out -.align 4,0x90 -L024fast_dec_in_place: -L027fast_dec_in_place_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 48(%esp),%edi - movl 36(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L027fast_dec_in_place_loop -.align 2,0x90 -L026fast_dec_out: - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L028skip_dzero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L028skip_dzero: - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L015slow_way: - movl (%eax),%eax - movl 36(%esp),%edi - leal -80(%esp),%esi - andl $-64,%esi - leal -143(%edi),%ebx - subl %esi,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esi - leal 768(%esi),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl %eax,52(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl %esi,%edi - movl %eax,%esi - cmpl $0,%edx - je L029slow_decrypt - cmpl $16,%ecx - movl %ebx,%edx - jb L030slow_enc_tail - btl $25,52(%esp) - jnc L031slow_enc_x86 - movq (%edi),%mm0 - movq 8(%edi),%mm4 -.align 4,0x90 -L032slow_enc_loop_sse: - pxor (%esi),%mm0 - pxor 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl 40(%esp),%ecx - movq %mm0,(%edi) - movq %mm4,8(%edi) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L032slow_enc_loop_sse - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L031slow_enc_x86: - movl (%edi),%eax - movl 4(%edi),%ebx -.align 2,0x90 -L033slow_enc_loop_x86: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L033slow_enc_loop_x86 - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L030slow_enc_tail: - emms - movl %edx,%edi - movl $16,%ebx - subl %ecx,%ebx - cmpl %esi,%edi - je L034enc_in_place -.align 2,0x90 -.long 2767451785 - jmp L035enc_skip_in_place -L034enc_in_place: - leal (%edi,%ecx,1),%edi -L035enc_skip_in_place: - movl %ebx,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2868115081 - movl 48(%esp),%edi - movl %edx,%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl $16,40(%esp) - jmp L033slow_enc_loop_x86 -.align 4,0x90 -L029slow_decrypt: - btl $25,52(%esp) - jnc L036slow_dec_loop_x86 -.align 2,0x90 -L037slow_dec_loop_sse: - movq (%esi),%mm0 - movq 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_decrypt_compact - movl 32(%esp),%esi - leal 60(%esp),%eax - movl 36(%esp),%ebx - movl 40(%esp),%ecx - movl 48(%esp),%edi - movq (%esi),%mm1 - movq 8(%esi),%mm5 - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movq %mm1,(%edi) - movq %mm5,8(%edi) - subl $16,%ecx - jc L038slow_dec_partial_sse - movq %mm0,(%ebx) - movq %mm4,8(%ebx) - leal 16(%ebx),%ebx - movl %ebx,36(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - movl %ecx,40(%esp) - jnz L037slow_dec_loop_sse - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L038slow_dec_partial_sse: - movq %mm0,(%eax) - movq %mm4,8(%eax) - emms - addl $16,%ecx - movl %ebx,%edi - movl %eax,%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L036slow_dec_loop_x86: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt_compact - movl 48(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - subl $16,%esi - jc L039slow_dec_partial_x86 - movl %esi,40(%esp) - movl 36(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - leal 16(%esi),%esi - movl %esi,32(%esp) - jnz L036slow_dec_loop_x86 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L039slow_dec_partial_x86: - leal 60(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 32(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl 36(%esp),%edi - leal 60(%esp),%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4 -__x86_AES_set_encrypt_key: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 24(%esp),%esi - movl 32(%esp),%edi - testl $-1,%esi - jz L040badpointer - testl $-1,%edi - jz L040badpointer - call L041pic_point -L041pic_point: - popl %ebp - leal LAES_Te-L041pic_point(%ebp),%ebp - leal 2176(%ebp),%ebp - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx - movl 28(%esp),%ecx - cmpl $128,%ecx - je L04210rounds - cmpl $192,%ecx - je L04312rounds - cmpl $256,%ecx - je L04414rounds - movl $-2,%eax - jmp L045exit -L04210rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - xorl %ecx,%ecx - jmp L04610shortcut -.align 2,0x90 -L04710loop: - movl (%edi),%eax - movl 12(%edi),%edx -L04610shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,16(%edi) - xorl 4(%edi),%eax - movl %eax,20(%edi) - xorl 8(%edi),%eax - movl %eax,24(%edi) - xorl 12(%edi),%eax - movl %eax,28(%edi) - incl %ecx - addl $16,%edi - cmpl $10,%ecx - jl L04710loop - movl $10,80(%edi) - xorl %eax,%eax - jmp L045exit -L04312rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%ecx - movl 20(%esi),%edx - movl %ecx,16(%edi) - movl %edx,20(%edi) - xorl %ecx,%ecx - jmp L04812shortcut -.align 2,0x90 -L04912loop: - movl (%edi),%eax - movl 20(%edi),%edx -L04812shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,24(%edi) - xorl 4(%edi),%eax - movl %eax,28(%edi) - xorl 8(%edi),%eax - movl %eax,32(%edi) - xorl 12(%edi),%eax - movl %eax,36(%edi) - cmpl $7,%ecx - je L05012break - incl %ecx - xorl 16(%edi),%eax - movl %eax,40(%edi) - xorl 20(%edi),%eax - movl %eax,44(%edi) - addl $24,%edi - jmp L04912loop -L05012break: - movl $12,72(%edi) - xorl %eax,%eax - jmp L045exit -L04414rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%eax - movl 20(%esi),%ebx - movl 24(%esi),%ecx - movl 28(%esi),%edx - movl %eax,16(%edi) - movl %ebx,20(%edi) - movl %ecx,24(%edi) - movl %edx,28(%edi) - xorl %ecx,%ecx - jmp L05114shortcut -.align 2,0x90 -L05214loop: - movl 28(%edi),%edx -L05114shortcut: - movl (%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,32(%edi) - xorl 4(%edi),%eax - movl %eax,36(%edi) - xorl 8(%edi),%eax - movl %eax,40(%edi) - xorl 12(%edi),%eax - movl %eax,44(%edi) - cmpl $6,%ecx - je L05314break - incl %ecx - movl %eax,%edx - movl 16(%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - movl %eax,48(%edi) - xorl 20(%edi),%eax - movl %eax,52(%edi) - xorl 24(%edi),%eax - movl %eax,56(%edi) - xorl 28(%edi),%eax - movl %eax,60(%edi) - addl $32,%edi - jmp L05214loop -L05314break: - movl $14,48(%edi) - xorl %eax,%eax - jmp L045exit -L040badpointer: - movl $-1,%eax -L045exit: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_set_encrypt_key -.align 4 -_AES_set_encrypt_key: -L_AES_set_encrypt_key_begin: - call __x86_AES_set_encrypt_key - ret -.globl _AES_set_decrypt_key -.align 4 -_AES_set_decrypt_key: -L_AES_set_decrypt_key_begin: - call __x86_AES_set_encrypt_key - cmpl $0,%eax - je L054proceed - ret -L054proceed: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%esi - movl 240(%esi),%ecx - leal (,%ecx,4),%ecx - leal (%esi,%ecx,4),%edi -.align 2,0x90 -L055invert: - movl (%esi),%eax - movl 4(%esi),%ebx - movl (%edi),%ecx - movl 4(%edi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,(%esi) - movl %edx,4(%esi) - movl 8(%esi),%eax - movl 12(%esi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,8(%edi) - movl %ebx,12(%edi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - addl $16,%esi - subl $16,%edi - cmpl %edi,%esi - jne L055invert - movl 28(%esp),%edi - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,28(%esp) - movl 16(%edi),%eax -.align 2,0x90 -L056permute: - addl $16,%edi - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %eax,%ebx - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - xorl %eax,%ecx - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - roll $8,%eax - xorl %esi,%edx - movl 4(%edi),%ebp - xorl %ebx,%eax - xorl %edx,%ebx - xorl %ecx,%eax - roll $24,%ebx - xorl %edx,%ecx - xorl %edx,%eax - roll $16,%ecx - xorl %ebx,%eax - roll $8,%edx - xorl %ecx,%eax - movl %ebp,%ebx - xorl %edx,%eax - movl %eax,(%edi) - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - xorl %ebx,%edx - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - roll $8,%ebx - xorl %esi,%eax - movl 8(%edi),%ebp - xorl %ecx,%ebx - xorl %eax,%ecx - xorl %edx,%ebx - roll $24,%ecx - xorl %eax,%edx - xorl %eax,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%eax - xorl %edx,%ebx - movl %ebp,%ecx - xorl %eax,%ebx - movl %ebx,4(%edi) - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %ecx,%edx - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - xorl %ecx,%eax - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - roll $8,%ecx - xorl %esi,%ebx - movl 12(%edi),%ebp - xorl %edx,%ecx - xorl %ebx,%edx - xorl %eax,%ecx - roll $24,%edx - xorl %ebx,%eax - xorl %ebx,%ecx - roll $16,%eax - xorl %edx,%ecx - roll $8,%ebx - xorl %eax,%ecx - movl %ebp,%edx - xorl %ebx,%ecx - movl %ecx,8(%edi) - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %edx,%eax - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - xorl %edx,%ebx - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - roll $8,%edx - xorl %esi,%ecx - movl 16(%edi),%ebp - xorl %eax,%edx - xorl %ecx,%eax - xorl %ebx,%edx - roll $24,%eax - xorl %ecx,%ebx - xorl %ecx,%edx - roll $16,%ebx - xorl %eax,%edx - roll $8,%ecx - xorl %ebx,%edx - movl %ebp,%eax - xorl %ecx,%edx - movl %edx,12(%edi) - cmpl 28(%esp),%edi - jb L056permute - xorl %eax,%eax - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.byte 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -.byte 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -.byte 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.section __IMPORT,__pointers,non_lazy_symbol_pointers -L_OPENSSL_ia32cap_P$non_lazy_ptr: -.indirect_symbol _OPENSSL_ia32cap_P -.long 0 -.comm _OPENSSL_ia32cap_P,16,2 diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h index abd541341f17ee..c577b784d27053 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Fri Sep 13 15:58:40 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:40 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -36,11 +36,12 @@ static const char compiler_flags[] = { 'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A', '5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S', 'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M', - 'D','1','6','0','_','A','S','M',' ','-','D','V','P','A','E','S', - '_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L', - '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M', - ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_', - 'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A', - 'S','M',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ', - '-','D','N','D','E','B','U','G','\0' + 'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','N','I', + '_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M', + ' ','-','D','W','H','I','R','L','P','O','O','L','_','A','S','M', + ' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E', + 'C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ', + '-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-', + 'D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D', + 'E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s index a6736904f3f974..891647b7edf847 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s @@ -4378,19 +4378,15 @@ L009pic: orl 4(%edi),%eax orl 8(%edi),%eax orl 12(%edi),%eax + movl 576(%esp),%ebx + notl %ebx + orl %ebx,%eax + movl 580(%esp),%ebx + notl %ebx + orl %ebx,%eax + orl 584(%esp),%eax .byte 62 jnz L010add_proceed - movl 576(%esp),%eax - andl 580(%esp),%eax - movl 584(%esp),%ebx - jz L010add_proceed - testl %ebx,%ebx - jz L011add_double - movl 616(%esp),%edi - xorl %eax,%eax - movl $24,%ecx -.byte 252,243,171 - jmp L012add_done .align 4,0x90 L011add_double: movl 620(%esp),%esi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h index a69309195ed634..e2d05cdbf49656 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".dylib" diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h index 77a271f9955a27..7602fb815ac093 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi index 35d5734b533f73..aa3222e6e6e745 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi @@ -15,6 +15,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi index 38d1fdcc00e68c..5ff6a9e193ded2 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi @@ -712,6 +712,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm index e6aed64bed36d2..a35bca92f08a0d 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "darwin-i386-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -235,6 +235,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1493,6 +1494,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3224,7 +3231,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3232,6 +3238,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3730,14 +3737,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4178,6 +4177,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4860,49 +4867,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4912,7 +4911,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4930,13 +4928,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4950,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5570,7 +5464,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5580,188 +5473,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5791,25 +5653,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5819,31 +5677,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5853,31 +5706,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5895,284 +5743,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6182,295 +5983,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6230,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6237,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6244,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6251,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,7 +6258,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6518,163 +6265,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6692,235 +6412,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6928,21 +6609,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6950,13 +6628,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6964,81 +6640,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7046,334 +6709,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7383,79 +6984,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7474,7 +7062,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7484,361 +7071,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7860,265 +7387,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8128,31 +7611,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8162,13 +7640,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8194,19 +7670,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8232,13 +7705,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8264,727 +7735,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9035,6 +8385,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9279,7 +8637,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9605,7 +8962,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9651,7 +9007,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9717,7 +9072,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9742,7 +9096,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9840,7 +9193,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9890,18 +9242,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9912,6 +9261,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9975,10 +9328,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10007,6 +9356,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10271,6 +9624,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15226,7 +14580,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15234,6 +14587,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15461,6 +14815,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15563,10 +14925,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15595,6 +14953,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.s b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.s deleted file mode 100644 index 5e231470937c9d..00000000000000 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.s +++ /dev/null @@ -1,3207 +0,0 @@ -.text -.align 4 -__x86_AES_encrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L000loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ecx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ecx,%edi - xorl %esi,%ecx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ecx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%ecx - andl %edx,%ebp - leal (%edx,%edx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %edx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %edx,%edi - xorl %esi,%edx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%edx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%edx - andl %eax,%ebp - leal (%eax,%eax,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %eax,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %eax,%edi - xorl %esi,%eax - rorl $24,%edi - xorl %ebp,%esi - roll $24,%eax - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%eax - andl %ebx,%ebp - leal (%ebx,%ebx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ebx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ebx,%edi - xorl %esi,%ebx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ebx - xorl %edi,%esi - xorl %esi,%ebx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L000loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.align 4 -__sse_AES_encrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L001loop: - pshufw $8,%mm0,%mm1 - pshufw $13,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $13,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $8,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $8,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - movd %mm2,%eax - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - movd %mm6,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $8,%esi - shrl $16,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shrl $16,%eax - movd %ecx,%mm1 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - andl $255,%eax - orl %esi,%ecx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - andl $255,%ebx - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%ecx - shll $16,%eax - movzbl -128(%ebp,%edi,1),%esi - orl %eax,%edx - shll $8,%esi - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - orl %ebx,%edx - movl 20(%esp),%edi - movd %ecx,%mm4 - movd %edx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L002out - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - movq %mm0,%mm1 - movq %mm4,%mm5 - pcmpgtb %mm0,%mm3 - pcmpgtb %mm4,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - pshufw $177,%mm0,%mm2 - pshufw $177,%mm4,%mm6 - paddb %mm0,%mm0 - paddb %mm4,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pshufw $177,%mm2,%mm3 - pshufw $177,%mm6,%mm7 - pxor %mm0,%mm1 - pxor %mm4,%mm5 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm3,%mm2 - movq %mm7,%mm6 - pslld $8,%mm3 - pslld $8,%mm7 - psrld $24,%mm2 - psrld $24,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - psrld $8,%mm1 - psrld $8,%mm5 - movl -128(%ebp),%eax - pslld $24,%mm3 - pslld $24,%mm7 - movl -64(%ebp),%ebx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl (%ebp),%ecx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl 64(%ebp),%edx - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L001loop -.align 4,0x90 -L002out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.align 4 -__x86_AES_encrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L003loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl (%ebp,%esi,8),%esi - movzbl %ch,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movzbl %bh,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - movl (%ebp,%edx,8),%edx - movzbl %ah,%eax - xorl 3(%ebp,%eax,8),%edx - movl 4(%esp),%eax - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - xorl 1(%ebp,%ecx,8),%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L003loop - movl %eax,%esi - andl $255,%esi - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %bh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %ch,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %dh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movzbl %bh,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movl 2(%ebp,%edx,8),%edx - andl $255,%edx - movzbl %ah,%eax - movl (%ebp,%eax,8),%eax - andl $65280,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movl (%ebp,%ebx,8),%ebx - andl $16711680,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movl 2(%ebp,%ecx,8),%ecx - andl $4278190080,%ecx - xorl %ecx,%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Te: -.long 2774754246,2774754246 -.long 2222750968,2222750968 -.long 2574743534,2574743534 -.long 2373680118,2373680118 -.long 234025727,234025727 -.long 3177933782,3177933782 -.long 2976870366,2976870366 -.long 1422247313,1422247313 -.long 1345335392,1345335392 -.long 50397442,50397442 -.long 2842126286,2842126286 -.long 2099981142,2099981142 -.long 436141799,436141799 -.long 1658312629,1658312629 -.long 3870010189,3870010189 -.long 2591454956,2591454956 -.long 1170918031,1170918031 -.long 2642575903,2642575903 -.long 1086966153,1086966153 -.long 2273148410,2273148410 -.long 368769775,368769775 -.long 3948501426,3948501426 -.long 3376891790,3376891790 -.long 200339707,200339707 -.long 3970805057,3970805057 -.long 1742001331,1742001331 -.long 4255294047,4255294047 -.long 3937382213,3937382213 -.long 3214711843,3214711843 -.long 4154762323,4154762323 -.long 2524082916,2524082916 -.long 1539358875,1539358875 -.long 3266819957,3266819957 -.long 486407649,486407649 -.long 2928907069,2928907069 -.long 1780885068,1780885068 -.long 1513502316,1513502316 -.long 1094664062,1094664062 -.long 49805301,49805301 -.long 1338821763,1338821763 -.long 1546925160,1546925160 -.long 4104496465,4104496465 -.long 887481809,887481809 -.long 150073849,150073849 -.long 2473685474,2473685474 -.long 1943591083,1943591083 -.long 1395732834,1395732834 -.long 1058346282,1058346282 -.long 201589768,201589768 -.long 1388824469,1388824469 -.long 1696801606,1696801606 -.long 1589887901,1589887901 -.long 672667696,672667696 -.long 2711000631,2711000631 -.long 251987210,251987210 -.long 3046808111,3046808111 -.long 151455502,151455502 -.long 907153956,907153956 -.long 2608889883,2608889883 -.long 1038279391,1038279391 -.long 652995533,652995533 -.long 1764173646,1764173646 -.long 3451040383,3451040383 -.long 2675275242,2675275242 -.long 453576978,453576978 -.long 2659418909,2659418909 -.long 1949051992,1949051992 -.long 773462580,773462580 -.long 756751158,756751158 -.long 2993581788,2993581788 -.long 3998898868,3998898868 -.long 4221608027,4221608027 -.long 4132590244,4132590244 -.long 1295727478,1295727478 -.long 1641469623,1641469623 -.long 3467883389,3467883389 -.long 2066295122,2066295122 -.long 1055122397,1055122397 -.long 1898917726,1898917726 -.long 2542044179,2542044179 -.long 4115878822,4115878822 -.long 1758581177,1758581177 -.long 0,0 -.long 753790401,753790401 -.long 1612718144,1612718144 -.long 536673507,536673507 -.long 3367088505,3367088505 -.long 3982187446,3982187446 -.long 3194645204,3194645204 -.long 1187761037,1187761037 -.long 3653156455,3653156455 -.long 1262041458,1262041458 -.long 3729410708,3729410708 -.long 3561770136,3561770136 -.long 3898103984,3898103984 -.long 1255133061,1255133061 -.long 1808847035,1808847035 -.long 720367557,720367557 -.long 3853167183,3853167183 -.long 385612781,385612781 -.long 3309519750,3309519750 -.long 3612167578,3612167578 -.long 1429418854,1429418854 -.long 2491778321,2491778321 -.long 3477423498,3477423498 -.long 284817897,284817897 -.long 100794884,100794884 -.long 2172616702,2172616702 -.long 4031795360,4031795360 -.long 1144798328,1144798328 -.long 3131023141,3131023141 -.long 3819481163,3819481163 -.long 4082192802,4082192802 -.long 4272137053,4272137053 -.long 3225436288,3225436288 -.long 2324664069,2324664069 -.long 2912064063,2912064063 -.long 3164445985,3164445985 -.long 1211644016,1211644016 -.long 83228145,83228145 -.long 3753688163,3753688163 -.long 3249976951,3249976951 -.long 1977277103,1977277103 -.long 1663115586,1663115586 -.long 806359072,806359072 -.long 452984805,452984805 -.long 250868733,250868733 -.long 1842533055,1842533055 -.long 1288555905,1288555905 -.long 336333848,336333848 -.long 890442534,890442534 -.long 804056259,804056259 -.long 3781124030,3781124030 -.long 2727843637,2727843637 -.long 3427026056,3427026056 -.long 957814574,957814574 -.long 1472513171,1472513171 -.long 4071073621,4071073621 -.long 2189328124,2189328124 -.long 1195195770,1195195770 -.long 2892260552,2892260552 -.long 3881655738,3881655738 -.long 723065138,723065138 -.long 2507371494,2507371494 -.long 2690670784,2690670784 -.long 2558624025,2558624025 -.long 3511635870,3511635870 -.long 2145180835,2145180835 -.long 1713513028,1713513028 -.long 2116692564,2116692564 -.long 2878378043,2878378043 -.long 2206763019,2206763019 -.long 3393603212,3393603212 -.long 703524551,703524551 -.long 3552098411,3552098411 -.long 1007948840,1007948840 -.long 2044649127,2044649127 -.long 3797835452,3797835452 -.long 487262998,487262998 -.long 1994120109,1994120109 -.long 1004593371,1004593371 -.long 1446130276,1446130276 -.long 1312438900,1312438900 -.long 503974420,503974420 -.long 3679013266,3679013266 -.long 168166924,168166924 -.long 1814307912,1814307912 -.long 3831258296,3831258296 -.long 1573044895,1573044895 -.long 1859376061,1859376061 -.long 4021070915,4021070915 -.long 2791465668,2791465668 -.long 2828112185,2828112185 -.long 2761266481,2761266481 -.long 937747667,937747667 -.long 2339994098,2339994098 -.long 854058965,854058965 -.long 1137232011,1137232011 -.long 1496790894,1496790894 -.long 3077402074,3077402074 -.long 2358086913,2358086913 -.long 1691735473,1691735473 -.long 3528347292,3528347292 -.long 3769215305,3769215305 -.long 3027004632,3027004632 -.long 4199962284,4199962284 -.long 133494003,133494003 -.long 636152527,636152527 -.long 2942657994,2942657994 -.long 2390391540,2390391540 -.long 3920539207,3920539207 -.long 403179536,403179536 -.long 3585784431,3585784431 -.long 2289596656,2289596656 -.long 1864705354,1864705354 -.long 1915629148,1915629148 -.long 605822008,605822008 -.long 4054230615,4054230615 -.long 3350508659,3350508659 -.long 1371981463,1371981463 -.long 602466507,602466507 -.long 2094914977,2094914977 -.long 2624877800,2624877800 -.long 555687742,555687742 -.long 3712699286,3712699286 -.long 3703422305,3703422305 -.long 2257292045,2257292045 -.long 2240449039,2240449039 -.long 2423288032,2423288032 -.long 1111375484,1111375484 -.long 3300242801,3300242801 -.long 2858837708,2858837708 -.long 3628615824,3628615824 -.long 84083462,84083462 -.long 32962295,32962295 -.long 302911004,302911004 -.long 2741068226,2741068226 -.long 1597322602,1597322602 -.long 4183250862,4183250862 -.long 3501832553,3501832553 -.long 2441512471,2441512471 -.long 1489093017,1489093017 -.long 656219450,656219450 -.long 3114180135,3114180135 -.long 954327513,954327513 -.long 335083755,335083755 -.long 3013122091,3013122091 -.long 856756514,856756514 -.long 3144247762,3144247762 -.long 1893325225,1893325225 -.long 2307821063,2307821063 -.long 2811532339,2811532339 -.long 3063651117,3063651117 -.long 572399164,572399164 -.long 2458355477,2458355477 -.long 552200649,552200649 -.long 1238290055,1238290055 -.long 4283782570,4283782570 -.long 2015897680,2015897680 -.long 2061492133,2061492133 -.long 2408352771,2408352771 -.long 4171342169,4171342169 -.long 2156497161,2156497161 -.long 386731290,386731290 -.long 3669999461,3669999461 -.long 837215959,837215959 -.long 3326231172,3326231172 -.long 3093850320,3093850320 -.long 3275833730,3275833730 -.long 2962856233,2962856233 -.long 1999449434,1999449434 -.long 286199582,286199582 -.long 3417354363,3417354363 -.long 4233385128,4233385128 -.long 3602627437,3602627437 -.long 974525996,974525996 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.long 1,2,4,8 -.long 16,32,64,128 -.long 27,54,0,0 -.long 0,0,0,0 -.globl _AES_encrypt -.align 4 -_AES_encrypt: -L_AES_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L004pic_point -L004pic_point: - popl %ebp - movl L_OPENSSL_ia32cap_P$non_lazy_ptr-L004pic_point(%ebp),%eax - leal LAES_Te-L004pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L005x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L005x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4 -__x86_AES_decrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 4,0x90 -L006loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%eax - subl %edi,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %ecx,%eax - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ecx,%ebx - roll $8,%ecx - xorl %esi,%ebp - xorl %eax,%ecx - xorl %ebp,%eax - xorl %ebx,%ecx - xorl %ebp,%ebx - roll $24,%eax - xorl %ebp,%ecx - roll $16,%ebx - xorl %eax,%ecx - roll $8,%ebp - xorl %ebx,%ecx - movl 4(%esp),%eax - xorl %ebp,%ecx - movl %ecx,12(%esp) - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %edx,%ebx - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %edx,%ecx - roll $8,%edx - xorl %esi,%ebp - xorl %ebx,%edx - xorl %ebp,%ebx - xorl %ecx,%edx - xorl %ebp,%ecx - roll $24,%ebx - xorl %ebp,%edx - roll $16,%ecx - xorl %ebx,%edx - roll $8,%ebp - xorl %ecx,%edx - movl 8(%esp),%ebx - xorl %ebp,%edx - movl %edx,16(%esp) - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %eax,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %eax,%edx - roll $8,%eax - xorl %esi,%ebp - xorl %ecx,%eax - xorl %ebp,%ecx - xorl %edx,%eax - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%eax - roll $16,%edx - xorl %ecx,%eax - roll $8,%ebp - xorl %edx,%eax - xorl %ebp,%eax - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ebx,%edx - roll $8,%ebx - xorl %esi,%ebp - xorl %ecx,%ebx - xorl %ebp,%ecx - xorl %edx,%ebx - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%ebp - xorl %edx,%ebx - movl 12(%esp),%ecx - xorl %ebp,%ebx - movl 16(%esp),%edx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L006loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.align 4 -__sse_AES_decrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 4,0x90 -L007loop: - pshufw $12,%mm0,%mm1 - pshufw $9,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $6,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $3,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movd %mm2,%eax - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $16,%esi - movd %mm6,%ebx - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %al,%edi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $16,%esi - shrl $16,%eax - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shrl $16,%ebx - shll $8,%esi - movd %edx,%mm1 - movzbl -128(%ebp,%edi,1),%edx - movzbl %bh,%edi - shll $24,%edx - andl $255,%ebx - orl %esi,%edx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movzbl %ah,%eax - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - orl %ebx,%edx - shll $16,%esi - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%edx - shll $24,%eax - orl %eax,%ecx - movl 20(%esp),%edi - movd %edx,%mm4 - movd %ecx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja L008out - movq %mm0,%mm3 - movq %mm4,%mm7 - pshufw $228,%mm0,%mm2 - pshufw $228,%mm4,%mm6 - movq %mm0,%mm1 - movq %mm4,%mm5 - pshufw $177,%mm0,%mm0 - pshufw $177,%mm4,%mm4 - pslld $8,%mm2 - pslld $8,%mm6 - psrld $8,%mm3 - psrld $8,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pslld $16,%mm2 - pslld $16,%mm6 - psrld $16,%mm3 - psrld $16,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movq 8(%esp),%mm3 - pxor %mm2,%mm2 - pxor %mm6,%mm6 - pcmpgtb %mm1,%mm2 - pcmpgtb %mm5,%mm6 - pand %mm3,%mm2 - pand %mm3,%mm6 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm2,%mm1 - pxor %mm6,%mm5 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq %mm1,%mm2 - movq %mm5,%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pslld $24,%mm3 - pslld $24,%mm7 - psrld $8,%mm2 - psrld $8,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pshufw $177,%mm1,%mm3 - pshufw $177,%mm5,%mm7 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - pshufw $177,%mm1,%mm2 - pshufw $177,%mm5,%mm6 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pslld $8,%mm1 - pslld $8,%mm5 - psrld $8,%mm3 - psrld $8,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl -128(%ebp),%eax - pslld $16,%mm1 - pslld $16,%mm5 - movl -64(%ebp),%ebx - psrld $16,%mm3 - psrld $16,%mm7 - movl (%ebp),%ecx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl 64(%ebp),%edx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp L007loop -.align 4,0x90 -L008out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.align 4 -__x86_AES_decrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 4,0x90 -L009loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ebx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %ah,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl 20(%esp),%edi - andl $255,%edx - movl (%ebp,%edx,8),%edx - movzbl %ch,%ecx - xorl 3(%ebp,%ecx,8),%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - shrl $24,%eax - xorl 1(%ebp,%eax,8),%edx - movl 4(%esp),%eax - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb L009loop - leal 2176(%ebp),%ebp - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi - leal -128(%ebp),%ebp - movl %eax,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl (%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl (%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl (%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl (%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - leal -2048(%ebp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 6,0x90 -LAES_Td: -.long 1353184337,1353184337 -.long 1399144830,1399144830 -.long 3282310938,3282310938 -.long 2522752826,2522752826 -.long 3412831035,3412831035 -.long 4047871263,4047871263 -.long 2874735276,2874735276 -.long 2466505547,2466505547 -.long 1442459680,1442459680 -.long 4134368941,4134368941 -.long 2440481928,2440481928 -.long 625738485,625738485 -.long 4242007375,4242007375 -.long 3620416197,3620416197 -.long 2151953702,2151953702 -.long 2409849525,2409849525 -.long 1230680542,1230680542 -.long 1729870373,1729870373 -.long 2551114309,2551114309 -.long 3787521629,3787521629 -.long 41234371,41234371 -.long 317738113,317738113 -.long 2744600205,2744600205 -.long 3338261355,3338261355 -.long 3881799427,3881799427 -.long 2510066197,2510066197 -.long 3950669247,3950669247 -.long 3663286933,3663286933 -.long 763608788,763608788 -.long 3542185048,3542185048 -.long 694804553,694804553 -.long 1154009486,1154009486 -.long 1787413109,1787413109 -.long 2021232372,2021232372 -.long 1799248025,1799248025 -.long 3715217703,3715217703 -.long 3058688446,3058688446 -.long 397248752,397248752 -.long 1722556617,1722556617 -.long 3023752829,3023752829 -.long 407560035,407560035 -.long 2184256229,2184256229 -.long 1613975959,1613975959 -.long 1165972322,1165972322 -.long 3765920945,3765920945 -.long 2226023355,2226023355 -.long 480281086,480281086 -.long 2485848313,2485848313 -.long 1483229296,1483229296 -.long 436028815,436028815 -.long 2272059028,2272059028 -.long 3086515026,3086515026 -.long 601060267,601060267 -.long 3791801202,3791801202 -.long 1468997603,1468997603 -.long 715871590,715871590 -.long 120122290,120122290 -.long 63092015,63092015 -.long 2591802758,2591802758 -.long 2768779219,2768779219 -.long 4068943920,4068943920 -.long 2997206819,2997206819 -.long 3127509762,3127509762 -.long 1552029421,1552029421 -.long 723308426,723308426 -.long 2461301159,2461301159 -.long 4042393587,4042393587 -.long 2715969870,2715969870 -.long 3455375973,3455375973 -.long 3586000134,3586000134 -.long 526529745,526529745 -.long 2331944644,2331944644 -.long 2639474228,2639474228 -.long 2689987490,2689987490 -.long 853641733,853641733 -.long 1978398372,1978398372 -.long 971801355,971801355 -.long 2867814464,2867814464 -.long 111112542,111112542 -.long 1360031421,1360031421 -.long 4186579262,4186579262 -.long 1023860118,1023860118 -.long 2919579357,2919579357 -.long 1186850381,1186850381 -.long 3045938321,3045938321 -.long 90031217,90031217 -.long 1876166148,1876166148 -.long 4279586912,4279586912 -.long 620468249,620468249 -.long 2548678102,2548678102 -.long 3426959497,3426959497 -.long 2006899047,2006899047 -.long 3175278768,3175278768 -.long 2290845959,2290845959 -.long 945494503,945494503 -.long 3689859193,3689859193 -.long 1191869601,1191869601 -.long 3910091388,3910091388 -.long 3374220536,3374220536 -.long 0,0 -.long 2206629897,2206629897 -.long 1223502642,1223502642 -.long 2893025566,2893025566 -.long 1316117100,1316117100 -.long 4227796733,4227796733 -.long 1446544655,1446544655 -.long 517320253,517320253 -.long 658058550,658058550 -.long 1691946762,1691946762 -.long 564550760,564550760 -.long 3511966619,3511966619 -.long 976107044,976107044 -.long 2976320012,2976320012 -.long 266819475,266819475 -.long 3533106868,3533106868 -.long 2660342555,2660342555 -.long 1338359936,1338359936 -.long 2720062561,2720062561 -.long 1766553434,1766553434 -.long 370807324,370807324 -.long 179999714,179999714 -.long 3844776128,3844776128 -.long 1138762300,1138762300 -.long 488053522,488053522 -.long 185403662,185403662 -.long 2915535858,2915535858 -.long 3114841645,3114841645 -.long 3366526484,3366526484 -.long 2233069911,2233069911 -.long 1275557295,1275557295 -.long 3151862254,3151862254 -.long 4250959779,4250959779 -.long 2670068215,2670068215 -.long 3170202204,3170202204 -.long 3309004356,3309004356 -.long 880737115,880737115 -.long 1982415755,1982415755 -.long 3703972811,3703972811 -.long 1761406390,1761406390 -.long 1676797112,1676797112 -.long 3403428311,3403428311 -.long 277177154,277177154 -.long 1076008723,1076008723 -.long 538035844,538035844 -.long 2099530373,2099530373 -.long 4164795346,4164795346 -.long 288553390,288553390 -.long 1839278535,1839278535 -.long 1261411869,1261411869 -.long 4080055004,4080055004 -.long 3964831245,3964831245 -.long 3504587127,3504587127 -.long 1813426987,1813426987 -.long 2579067049,2579067049 -.long 4199060497,4199060497 -.long 577038663,577038663 -.long 3297574056,3297574056 -.long 440397984,440397984 -.long 3626794326,3626794326 -.long 4019204898,4019204898 -.long 3343796615,3343796615 -.long 3251714265,3251714265 -.long 4272081548,4272081548 -.long 906744984,906744984 -.long 3481400742,3481400742 -.long 685669029,685669029 -.long 646887386,646887386 -.long 2764025151,2764025151 -.long 3835509292,3835509292 -.long 227702864,227702864 -.long 2613862250,2613862250 -.long 1648787028,1648787028 -.long 3256061430,3256061430 -.long 3904428176,3904428176 -.long 1593260334,1593260334 -.long 4121936770,4121936770 -.long 3196083615,3196083615 -.long 2090061929,2090061929 -.long 2838353263,2838353263 -.long 3004310991,3004310991 -.long 999926984,999926984 -.long 2809993232,2809993232 -.long 1852021992,1852021992 -.long 2075868123,2075868123 -.long 158869197,158869197 -.long 4095236462,4095236462 -.long 28809964,28809964 -.long 2828685187,2828685187 -.long 1701746150,1701746150 -.long 2129067946,2129067946 -.long 147831841,147831841 -.long 3873969647,3873969647 -.long 3650873274,3650873274 -.long 3459673930,3459673930 -.long 3557400554,3557400554 -.long 3598495785,3598495785 -.long 2947720241,2947720241 -.long 824393514,824393514 -.long 815048134,815048134 -.long 3227951669,3227951669 -.long 935087732,935087732 -.long 2798289660,2798289660 -.long 2966458592,2966458592 -.long 366520115,366520115 -.long 1251476721,1251476721 -.long 4158319681,4158319681 -.long 240176511,240176511 -.long 804688151,804688151 -.long 2379631990,2379631990 -.long 1303441219,1303441219 -.long 1414376140,1414376140 -.long 3741619940,3741619940 -.long 3820343710,3820343710 -.long 461924940,461924940 -.long 3089050817,3089050817 -.long 2136040774,2136040774 -.long 82468509,82468509 -.long 1563790337,1563790337 -.long 1937016826,1937016826 -.long 776014843,776014843 -.long 1511876531,1511876531 -.long 1389550482,1389550482 -.long 861278441,861278441 -.long 323475053,323475053 -.long 2355222426,2355222426 -.long 2047648055,2047648055 -.long 2383738969,2383738969 -.long 2302415851,2302415851 -.long 3995576782,3995576782 -.long 902390199,902390199 -.long 3991215329,3991215329 -.long 1018251130,1018251130 -.long 1507840668,1507840668 -.long 1064563285,1064563285 -.long 2043548696,2043548696 -.long 3208103795,3208103795 -.long 3939366739,3939366739 -.long 1537932639,1537932639 -.long 342834655,342834655 -.long 2262516856,2262516856 -.long 2180231114,2180231114 -.long 1053059257,1053059257 -.long 741614648,741614648 -.long 1598071746,1598071746 -.long 1925389590,1925389590 -.long 203809468,203809468 -.long 2336832552,2336832552 -.long 1100287487,1100287487 -.long 1895934009,1895934009 -.long 3736275976,3736275976 -.long 2632234200,2632234200 -.long 2428589668,2428589668 -.long 1636092795,1636092795 -.long 1890988757,1890988757 -.long 1952214088,1952214088 -.long 1113045200,1113045200 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.globl _AES_decrypt -.align 4 -_AES_decrypt: -L_AES_decrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call L010pic_point -L010pic_point: - popl %ebp - movl L_OPENSSL_ia32cap_P$non_lazy_ptr-L010pic_point(%ebp),%eax - leal LAES_Td-L010pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc L011x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call __sse_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4,0x90 -L011x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call __x86_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_cbc_encrypt -.align 4 -_AES_cbc_encrypt: -L_AES_cbc_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%ecx - cmpl $0,%ecx - je L012drop_out - call L013pic_point -L013pic_point: - popl %ebp - movl L_OPENSSL_ia32cap_P$non_lazy_ptr-L013pic_point(%ebp),%eax - cmpl $0,40(%esp) - leal LAES_Te-L013pic_point(%ebp),%ebp - jne L014picked_te - leal LAES_Td-LAES_Te(%ebp),%ebp -L014picked_te: - pushfl - cld - cmpl $512,%ecx - jb L015slow_way - testl $15,%ecx - jnz L015slow_way - btl $28,(%eax) - jc L015slow_way - leal -324(%esp),%esi - andl $-64,%esi - movl %ebp,%eax - leal 2304(%ebp),%ebx - movl %esi,%edx - andl $4095,%eax - andl $4095,%ebx - andl $4095,%edx - cmpl %ebx,%edx - jb L016tbl_break_out - subl %ebx,%edx - subl %edx,%esi - jmp L017tbl_ok -.align 2,0x90 -L016tbl_break_out: - subl %eax,%edx - andl $4095,%edx - addl $384,%edx - subl %edx,%esi -.align 2,0x90 -L017tbl_ok: - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 12(%edx),%edi - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl $0,316(%esp) - movl %edi,%ebx - movl $61,%ecx - subl %ebp,%ebx - movl %edi,%esi - andl $4095,%ebx - leal 76(%esp),%edi - cmpl $2304,%ebx - jb L018do_copy - cmpl $3852,%ebx - jb L019skip_copy -.align 2,0x90 -L018do_copy: - movl %edi,44(%esp) -.long 2784229001 -L019skip_copy: - movl $16,%edi -.align 2,0x90 -L020prefetch_tbl: - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%esi - leal 128(%ebp),%ebp - subl $1,%edi - jnz L020prefetch_tbl - subl $2048,%ebp - movl 32(%esp),%esi - movl 48(%esp),%edi - cmpl $0,%edx - je L021fast_decrypt - movl (%edi),%eax - movl 4(%edi),%ebx -.align 4,0x90 -L022fast_enc_loop: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - leal 16(%esi),%esi - movl 40(%esp),%ecx - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L022fast_enc_loop - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L023skip_ezero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L023skip_ezero: - movl 28(%esp),%esp - popfl -L012drop_out: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L021fast_decrypt: - cmpl 36(%esp),%esi - je L024fast_dec_in_place - movl %edi,52(%esp) -.align 2,0x90 -.align 4,0x90 -L025fast_dec_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 52(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 36(%esp),%edi - movl 32(%esp),%esi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl %esi,52(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edi - movl %edi,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L025fast_dec_loop - movl 52(%esp),%edi - movl 48(%esp),%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - jmp L026fast_dec_out -.align 4,0x90 -L024fast_dec_in_place: -L027fast_dec_in_place_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt - movl 48(%esp),%edi - movl 36(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz L027fast_dec_in_place_loop -.align 2,0x90 -L026fast_dec_out: - cmpl $0,316(%esp) - movl 44(%esp),%edi - je L028skip_dzero - movl $60,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2884892297 -L028skip_dzero: - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L015slow_way: - movl (%eax),%eax - movl 36(%esp),%edi - leal -80(%esp),%esi - andl $-64,%esi - leal -143(%edi),%ebx - subl %esi,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esi - leal 768(%esi),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl %eax,52(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl %esi,%edi - movl %eax,%esi - cmpl $0,%edx - je L029slow_decrypt - cmpl $16,%ecx - movl %ebx,%edx - jb L030slow_enc_tail - btl $25,52(%esp) - jnc L031slow_enc_x86 - movq (%edi),%mm0 - movq 8(%edi),%mm4 -.align 4,0x90 -L032slow_enc_loop_sse: - pxor (%esi),%mm0 - pxor 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl 40(%esp),%ecx - movq %mm0,(%edi) - movq %mm4,8(%edi) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L032slow_enc_loop_sse - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L031slow_enc_x86: - movl (%edi),%eax - movl 4(%edi),%ebx -.align 2,0x90 -L033slow_enc_loop_x86: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call __x86_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae L033slow_enc_loop_x86 - testl $15,%ecx - jnz L030slow_enc_tail - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L030slow_enc_tail: - emms - movl %edx,%edi - movl $16,%ebx - subl %ecx,%ebx - cmpl %esi,%edi - je L034enc_in_place -.align 2,0x90 -.long 2767451785 - jmp L035enc_skip_in_place -L034enc_in_place: - leal (%edi,%ecx,1),%edi -L035enc_skip_in_place: - movl %ebx,%ecx - xorl %eax,%eax -.align 2,0x90 -.long 2868115081 - movl 48(%esp),%edi - movl %edx,%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl $16,40(%esp) - jmp L033slow_enc_loop_x86 -.align 4,0x90 -L029slow_decrypt: - btl $25,52(%esp) - jnc L036slow_dec_loop_x86 -.align 2,0x90 -L037slow_dec_loop_sse: - movq (%esi),%mm0 - movq 8(%esi),%mm4 - movl 44(%esp),%edi - call __sse_AES_decrypt_compact - movl 32(%esp),%esi - leal 60(%esp),%eax - movl 36(%esp),%ebx - movl 40(%esp),%ecx - movl 48(%esp),%edi - movq (%esi),%mm1 - movq 8(%esi),%mm5 - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movq %mm1,(%edi) - movq %mm5,8(%edi) - subl $16,%ecx - jc L038slow_dec_partial_sse - movq %mm0,(%ebx) - movq %mm4,8(%ebx) - leal 16(%ebx),%ebx - movl %ebx,36(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - movl %ecx,40(%esp) - jnz L037slow_dec_loop_sse - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L038slow_dec_partial_sse: - movq %mm0,(%eax) - movq %mm4,8(%eax) - emms - addl $16,%ecx - movl %ebx,%edi - movl %eax,%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L036slow_dec_loop_x86: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call __x86_AES_decrypt_compact - movl 48(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - subl $16,%esi - jc L039slow_dec_partial_x86 - movl %esi,40(%esp) - movl 36(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - leal 16(%esi),%esi - movl %esi,32(%esp) - jnz L036slow_dec_loop_x86 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 4,0x90 -L039slow_dec_partial_x86: - leal 60(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 32(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl 36(%esp),%edi - leal 60(%esp),%esi -.align 2,0x90 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 4 -__x86_AES_set_encrypt_key: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 24(%esp),%esi - movl 32(%esp),%edi - testl $-1,%esi - jz L040badpointer - testl $-1,%edi - jz L040badpointer - call L041pic_point -L041pic_point: - popl %ebp - leal LAES_Te-L041pic_point(%ebp),%ebp - leal 2176(%ebp),%ebp - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx - movl 28(%esp),%ecx - cmpl $128,%ecx - je L04210rounds - cmpl $192,%ecx - je L04312rounds - cmpl $256,%ecx - je L04414rounds - movl $-2,%eax - jmp L045exit -L04210rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - xorl %ecx,%ecx - jmp L04610shortcut -.align 2,0x90 -L04710loop: - movl (%edi),%eax - movl 12(%edi),%edx -L04610shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,16(%edi) - xorl 4(%edi),%eax - movl %eax,20(%edi) - xorl 8(%edi),%eax - movl %eax,24(%edi) - xorl 12(%edi),%eax - movl %eax,28(%edi) - incl %ecx - addl $16,%edi - cmpl $10,%ecx - jl L04710loop - movl $10,80(%edi) - xorl %eax,%eax - jmp L045exit -L04312rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%ecx - movl 20(%esi),%edx - movl %ecx,16(%edi) - movl %edx,20(%edi) - xorl %ecx,%ecx - jmp L04812shortcut -.align 2,0x90 -L04912loop: - movl (%edi),%eax - movl 20(%edi),%edx -L04812shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,24(%edi) - xorl 4(%edi),%eax - movl %eax,28(%edi) - xorl 8(%edi),%eax - movl %eax,32(%edi) - xorl 12(%edi),%eax - movl %eax,36(%edi) - cmpl $7,%ecx - je L05012break - incl %ecx - xorl 16(%edi),%eax - movl %eax,40(%edi) - xorl 20(%edi),%eax - movl %eax,44(%edi) - addl $24,%edi - jmp L04912loop -L05012break: - movl $12,72(%edi) - xorl %eax,%eax - jmp L045exit -L04414rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%eax - movl 20(%esi),%ebx - movl 24(%esi),%ecx - movl 28(%esi),%edx - movl %eax,16(%edi) - movl %ebx,20(%edi) - movl %ecx,24(%edi) - movl %edx,28(%edi) - xorl %ecx,%ecx - jmp L05114shortcut -.align 2,0x90 -L05214loop: - movl 28(%edi),%edx -L05114shortcut: - movl (%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,32(%edi) - xorl 4(%edi),%eax - movl %eax,36(%edi) - xorl 8(%edi),%eax - movl %eax,40(%edi) - xorl 12(%edi),%eax - movl %eax,44(%edi) - cmpl $6,%ecx - je L05314break - incl %ecx - movl %eax,%edx - movl 16(%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - movl %eax,48(%edi) - xorl 20(%edi),%eax - movl %eax,52(%edi) - xorl 24(%edi),%eax - movl %eax,56(%edi) - xorl 28(%edi),%eax - movl %eax,60(%edi) - addl $32,%edi - jmp L05214loop -L05314break: - movl $14,48(%edi) - xorl %eax,%eax - jmp L045exit -L040badpointer: - movl $-1,%eax -L045exit: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.globl _AES_set_encrypt_key -.align 4 -_AES_set_encrypt_key: -L_AES_set_encrypt_key_begin: - call __x86_AES_set_encrypt_key - ret -.globl _AES_set_decrypt_key -.align 4 -_AES_set_decrypt_key: -L_AES_set_decrypt_key_begin: - call __x86_AES_set_encrypt_key - cmpl $0,%eax - je L054proceed - ret -L054proceed: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%esi - movl 240(%esi),%ecx - leal (,%ecx,4),%ecx - leal (%esi,%ecx,4),%edi -.align 2,0x90 -L055invert: - movl (%esi),%eax - movl 4(%esi),%ebx - movl (%edi),%ecx - movl 4(%edi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,(%esi) - movl %edx,4(%esi) - movl 8(%esi),%eax - movl 12(%esi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,8(%edi) - movl %ebx,12(%edi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - addl $16,%esi - subl $16,%edi - cmpl %edi,%esi - jne L055invert - movl 28(%esp),%edi - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,28(%esp) - movl 16(%edi),%eax -.align 2,0x90 -L056permute: - addl $16,%edi - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %eax,%ebx - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - xorl %eax,%ecx - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - roll $8,%eax - xorl %esi,%edx - movl 4(%edi),%ebp - xorl %ebx,%eax - xorl %edx,%ebx - xorl %ecx,%eax - roll $24,%ebx - xorl %edx,%ecx - xorl %edx,%eax - roll $16,%ecx - xorl %ebx,%eax - roll $8,%edx - xorl %ecx,%eax - movl %ebp,%ebx - xorl %edx,%eax - movl %eax,(%edi) - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - xorl %ebx,%edx - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - roll $8,%ebx - xorl %esi,%eax - movl 8(%edi),%ebp - xorl %ecx,%ebx - xorl %eax,%ecx - xorl %edx,%ebx - roll $24,%ecx - xorl %eax,%edx - xorl %eax,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%eax - xorl %edx,%ebx - movl %ebp,%ecx - xorl %eax,%ebx - movl %ebx,4(%edi) - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %ecx,%edx - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - xorl %ecx,%eax - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - roll $8,%ecx - xorl %esi,%ebx - movl 12(%edi),%ebp - xorl %edx,%ecx - xorl %ebx,%edx - xorl %eax,%ecx - roll $24,%edx - xorl %ebx,%eax - xorl %ebx,%ecx - roll $16,%eax - xorl %edx,%ecx - roll $8,%ebx - xorl %eax,%ecx - movl %ebp,%edx - xorl %ebx,%ecx - movl %ecx,8(%edi) - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %edx,%eax - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - xorl %edx,%ebx - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - roll $8,%edx - xorl %esi,%ecx - movl 16(%edi),%ebp - xorl %eax,%edx - xorl %ecx,%eax - xorl %ebx,%edx - roll $24,%eax - xorl %ecx,%ebx - xorl %ecx,%edx - roll $16,%ebx - xorl %eax,%edx - roll $8,%ecx - xorl %ebx,%edx - movl %ebp,%eax - xorl %ecx,%edx - movl %edx,12(%edi) - cmpl 28(%esp),%edi - jb L056permute - xorl %eax,%eax - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.byte 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -.byte 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -.byte 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.section __IMPORT,__pointers,non_lazy_symbol_pointers -L_OPENSSL_ia32cap_P$non_lazy_ptr: -.indirect_symbol _OPENSSL_ia32cap_P -.long 0 -.comm _OPENSSL_ia32cap_P,16,2 diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h index a78ae310fc883b..a925b543a9fac5 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Fri Sep 13 15:58:46 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:45 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -37,11 +37,12 @@ static const char compiler_flags[] = { '-','D','S','H','A','2','5','6','_','A','S','M',' ','-','D','S', 'H','A','5','1','2','_','A','S','M',' ','-','D','R','C','4','_', 'A','S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D', - 'R','M','D','1','6','0','_','A','S','M',' ','-','D','V','P','A', - 'E','S','_','A','S','M',' ','-','D','W','H','I','R','L','P','O', - 'O','L','_','A','S','M',' ','-','D','G','H','A','S','H','_','A', - 'S','M',' ','-','D','E','C','P','_','N','I','S','T','Z','2','5', - '6','_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5', - '_','A','S','M',' ','-','D','_','R','E','E','N','T','R','A','N', - 'T',' ','-','D','N','D','E','B','U','G','\0' + 'R','M','D','1','6','0','_','A','S','M',' ','-','D','A','E','S', + 'N','I','_','A','S','M',' ','-','D','V','P','A','E','S','_','A', + 'S','M',' ','-','D','W','H','I','R','L','P','O','O','L','_','A', + 'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-', + 'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S', + 'M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M', + ' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D', + 'N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s index a6736904f3f974..891647b7edf847 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s @@ -4378,19 +4378,15 @@ L009pic: orl 4(%edi),%eax orl 8(%edi),%eax orl 12(%edi),%eax + movl 576(%esp),%ebx + notl %ebx + orl %ebx,%eax + movl 580(%esp),%ebx + notl %ebx + orl %ebx,%eax + orl 584(%esp),%eax .byte 62 jnz L010add_proceed - movl 576(%esp),%eax - andl 580(%esp),%eax - movl 584(%esp),%ebx - jz L010add_proceed - testl %ebx,%ebx - jz L011add_double - movl 616(%esp),%edi - xorl %eax,%eax - movl $24,%ecx -.byte 252,243,171 - jmp L012add_done .align 4,0x90 L011add_double: movl 620(%esp),%esi diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h index a69309195ed634..e2d05cdbf49656 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".dylib" diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h index 77a271f9955a27..7602fb815ac093 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi index 35d5734b533f73..aa3222e6e6e745 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi @@ -15,6 +15,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi index c1f15b01a15b5a..47e1ff6afafed2 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi @@ -712,6 +712,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm index a40cf9d26d3bd6..191fabfac75fcb 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "darwin-i386-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -232,6 +232,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -350,8 +351,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -619,14 +620,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -702,6 +695,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1491,6 +1492,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3209,7 +3216,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3217,6 +3223,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3715,14 +3722,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4163,6 +4162,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4845,49 +4852,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4909,7 +4908,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4923,613 +4921,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5547,188 +5443,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5758,13 +5623,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5774,43 +5637,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5820,31 +5676,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5862,278 +5713,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6143,301 +5948,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6445,7 +6200,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6453,7 +6207,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6461,7 +6214,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6469,7 +6221,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6477,7 +6228,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6485,163 +6235,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6659,223 +6382,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6883,21 +6569,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6905,13 +6588,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6919,81 +6600,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7001,328 +6669,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7332,85 +6939,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7433,361 +7026,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7809,259 +7342,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8071,31 +7561,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8105,7 +7590,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8131,13 +7615,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8163,7 +7645,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8189,709 +7670,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8942,6 +8305,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9186,7 +8557,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9512,7 +8882,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9558,7 +8927,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9624,7 +8992,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9649,7 +9016,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9747,7 +9113,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9797,18 +9162,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9819,6 +9181,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9882,10 +9248,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9914,6 +9276,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10178,6 +9544,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15068,7 +14435,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15076,6 +14442,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15303,6 +14670,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15405,10 +14780,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15437,6 +14808,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h index 5a6d99c66de2c9..17da37fa077fa2 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin-i386-cc" -#define DATE "built on: Fri Sep 13 15:58:53 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:49 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h index a69309195ed634..e2d05cdbf49656 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".dylib" diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h index 0688f411720334..9dd40e7e286128 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h @@ -102,9 +102,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm index 667d891890ef1c..b4e4f412154218 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "darwin64-x86_64-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -235,6 +235,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1493,6 +1494,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3247,7 +3254,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3255,6 +3261,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3753,14 +3760,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4201,6 +4200,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4883,49 +4890,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4935,25 +4934,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4971,13 +4966,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4991,613 +4984,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5611,7 +5502,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5621,182 +5511,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5806,19 +5666,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5844,31 +5701,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5878,37 +5730,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5918,31 +5764,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5960,278 +5801,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6241,301 +6036,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,7 +6288,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6551,7 +6295,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6559,7 +6302,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6567,7 +6309,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6575,7 +6316,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6583,163 +6323,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6757,241 +6470,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6999,21 +6672,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7021,13 +6691,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7035,81 +6703,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7117,328 +6772,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7448,91 +7042,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7551,7 +7130,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7561,361 +7139,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7937,265 +7455,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8205,31 +7679,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8239,7 +7708,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8253,7 +7721,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8271,19 +7738,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8297,7 +7761,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8315,13 +7778,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8347,727 +7808,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9118,6 +8458,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9362,7 +8710,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9688,7 +9035,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9734,7 +9080,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9800,7 +9145,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9825,7 +9169,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9923,7 +9266,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9973,18 +9315,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9995,6 +9334,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10058,10 +9401,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10090,6 +9429,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10354,6 +9697,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15359,7 +14703,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15367,6 +14710,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15594,6 +14938,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15696,10 +15048,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15728,6 +15076,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s deleted file mode 100644 index ee148d19dcb0ff..00000000000000 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2631 +0,0 @@ -.text - -.p2align 4 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp L$enc_loop -.p2align 4 -L$enc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz L$enc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 - - -.p2align 4 -_x86_64_AES_encrypt_compact: - - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp L$enc_loop_compact -.p2align 4 -L$enc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je L$enc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp L$enc_loop_compact -.p2align 4 -L$enc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 - - -.globl _AES_encrypt - -.p2align 4 -.globl _asm_AES_encrypt -.private_extern _asm_AES_encrypt -_asm_AES_encrypt: -_AES_encrypt: - - movq %rsp,%rax - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) - -L$enc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq L$AES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 - - movq -40(%rsi),%r14 - - movq -32(%rsi),%r13 - - movq -24(%rsi),%r12 - - movq -16(%rsi),%rbp - - movq -8(%rsi),%rbx - - leaq (%rsi),%rsp - -L$enc_epilogue: - .byte 0xf3,0xc3 - - - -.p2align 4 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp L$dec_loop -.p2align 4 -L$dec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz L$dec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 - - -.p2align 4 -_x86_64_AES_decrypt_compact: - - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp L$dec_loop_compact - -.p2align 4 -L$dec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je L$dec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp L$dec_loop_compact -.p2align 4 -L$dec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 - - -.globl _AES_decrypt - -.p2align 4 -.globl _asm_AES_decrypt -.private_extern _asm_AES_decrypt -_asm_AES_decrypt: -_AES_decrypt: - - movq %rsp,%rax - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) - -L$dec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq L$AES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 - - movq -40(%rsi),%r14 - - movq -32(%rsi),%r13 - - movq -24(%rsi),%r12 - - movq -16(%rsi),%rbp - - movq -8(%rsi),%rbx - - leaq (%rsi),%rsp - -L$dec_epilogue: - .byte 0xf3,0xc3 - - -.globl _AES_set_encrypt_key - -.p2align 4 -_AES_set_encrypt_key: - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - subq $8,%rsp - -L$enc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp - - movq 48(%rsp),%rbx - - addq $56,%rsp - -L$enc_key_epilogue: - .byte 0xf3,0xc3 - - - - -.p2align 4 -_x86_64_AES_set_encrypt_key: - - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz L$badpointer - testq $-1,%rdi - jz L$badpointer - - leaq L$AES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je L$10rounds - cmpl $192,%ecx - je L$12rounds - cmpl $256,%ecx - je L$14rounds - movq $-2,%rax - jmp L$exit - -L$10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp L$10shortcut -.p2align 2 -L$10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -L$10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl L$10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp L$exit - -L$12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp L$12shortcut -.p2align 2 -L$12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -L$12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je L$12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp L$12loop -L$12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp L$exit - -L$14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp L$14shortcut -.p2align 2 -L$14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -L$14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je L$14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp L$14loop -L$14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp L$exit - -L$badpointer: - movq $-1,%rax -L$exit: -.byte 0xf3,0xc3 - - -.globl _AES_set_decrypt_key - -.p2align 4 -_AES_set_decrypt_key: - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - pushq %rdx - -L$dec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne L$abort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.p2align 2 -L$invert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne L$invert - - leaq L$AES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.p2align 2 -L$permute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz L$permute - - xorq %rax,%rax -L$abort: - movq 8(%rsp),%r15 - - movq 16(%rsp),%r14 - - movq 24(%rsp),%r13 - - movq 32(%rsp),%r12 - - movq 40(%rsp),%rbp - - movq 48(%rsp),%rbx - - addq $56,%rsp - -L$dec_key_epilogue: - .byte 0xf3,0xc3 - - -.globl _AES_cbc_encrypt - -.p2align 4 - -.globl _asm_AES_cbc_encrypt -.private_extern _asm_AES_cbc_encrypt -_asm_AES_cbc_encrypt: -_AES_cbc_encrypt: - - cmpq $0,%rdx - je L$cbc_epilogue - pushfq - - - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - -L$cbc_prologue: - - cld - movl %r9d,%r9d - - leaq L$AES_Te(%rip),%r14 - leaq L$AES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - - - movl _OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb L$cbc_slow_prologue - testq $15,%rdx - jnz L$cbc_slow_prologue - btl $28,%r10d - jc L$cbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb L$cbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp L$cbc_te_ok -L$cbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.p2align 2 -L$cbc_te_ok: - - xchgq %rsp,%r15 - - - movq %r15,16(%rsp) - -L$cbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb L$cbc_do_ecopy - cmpq $4096-248,%r10 - jb L$cbc_skip_ecopy -.p2align 2 -L$cbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -L$cbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.p2align 2 -L$cbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz L$cbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je L$FAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.p2align 2 -L$cbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz L$cbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp L$cbc_fast_cleanup - - -.p2align 4 -L$FAST_DECRYPT: - cmpq %r8,%r9 - je L$cbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.p2align 2 -L$cbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz L$cbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp L$cbc_fast_cleanup - -.p2align 4 -L$cbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.p2align 2 -L$cbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz L$cbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp L$cbc_fast_dec_in_place_loop -L$cbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.p2align 2 -L$cbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je L$cbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp L$cbc_exit - - -.p2align 4 -L$cbc_slow_prologue: - - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp - - - movq %rbp,16(%rsp) - -L$cbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je L$SLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz L$cbc_slow_enc_tail - -.p2align 2 -L$cbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz L$cbc_slow_enc_loop - testq $15,%r10 - jnz L$cbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp L$cbc_exit - -.p2align 2 -L$cbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp L$cbc_slow_enc_loop - -.p2align 4 -L$SLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.p2align 2 -L$cbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc L$cbc_slow_dec_partial - jz L$cbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp L$cbc_slow_dec_loop -L$cbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp L$cbc_exit - -.p2align 2 -L$cbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp L$cbc_exit - -.p2align 4 -L$cbc_exit: - movq 16(%rsp),%rsi - - movq (%rsi),%r15 - - movq 8(%rsi),%r14 - - movq 16(%rsi),%r13 - - movq 24(%rsi),%r12 - - movq 32(%rsi),%rbp - - movq 40(%rsi),%rbx - - leaq 48(%rsi),%rsp - -L$cbc_popfq: - popfq - - - -L$cbc_epilogue: - .byte 0xf3,0xc3 - - -.p2align 6 -L$AES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.p2align 6 -L$AES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.p2align 6 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s index aed8f3a345ad66..738aa6dc53b327 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s @@ -6,6 +6,7 @@ .p2align 5 _aesni_cbc_sha1_enc: + movl _OPENSSL_ia32cap_P+0(%rip),%r10d movq _OPENSSL_ia32cap_P+4(%rip),%r11 btq $61,%r11 @@ -19,6 +20,7 @@ _aesni_cbc_sha1_enc: .byte 0xf3,0xc3 + .p2align 5 aesni_cbc_sha1_enc_ssse3: @@ -2718,6 +2720,7 @@ K_XX_XX: .p2align 5 aesni_cbc_sha1_enc_shaext: + movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s index 28cf0768cada91..3aee22c3bc57a8 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .p2align 4 _aesni_cbc_sha256_enc: + leaq _OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -32,6 +33,7 @@ L$probe: .byte 0xf3,0xc3 + .p2align 6 K256: @@ -2528,7 +2530,15 @@ L$oop_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi + leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) + movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ L$avx2_00_47: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ L$avx2_00_47: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ L$ower_avx2: jbe L$oop_avx2 leaq (%rsp),%rbp + + + L$done_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ L$epilogue_avx2: .p2align 5 aesni_cbc_sha256_enc_shaext: + movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s index 6792a530f28e8e..924900d84ebd18 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ L$ecb_ret: .p2align 4 _aesni_ccm64_encrypt_blocks: + movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa L$increment64(%rip),%xmm9 @@ -920,10 +921,12 @@ L$ccm64_enc2_loop: pxor %xmm6,%xmm6 .byte 0xf3,0xc3 + .globl _aesni_ccm64_decrypt_blocks .p2align 4 _aesni_ccm64_decrypt_blocks: + movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1017,6 +1020,7 @@ L$oop_enc1_6: pxor %xmm6,%xmm6 .byte 0xf3,0xc3 + .globl _aesni_ctr32_encrypt_blocks .p2align 4 @@ -2785,6 +2789,7 @@ L$ocb_enc_epilogue: .p2align 5 __ocb_encrypt6: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2885,8 +2890,10 @@ L$ocb_enc_loop6: + .p2align 5 __ocb_encrypt4: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2954,8 +2961,10 @@ L$ocb_enc_loop4: + .p2align 5 __ocb_encrypt1: + pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2988,6 +2997,7 @@ L$ocb_enc_loop1: .byte 0xf3,0xc3 + .globl _aesni_ocb_decrypt .p2align 5 @@ -3223,6 +3233,7 @@ L$ocb_dec_epilogue: .p2align 5 __ocb_decrypt6: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3317,8 +3328,10 @@ L$ocb_dec_loop6: + .p2align 5 __ocb_decrypt4: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3382,8 +3395,10 @@ L$ocb_dec_loop4: + .p2align 5 __ocb_decrypt1: + pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3414,6 +3429,7 @@ L$ocb_dec_loop1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 + .globl _aesni_cbc_encrypt .p2align 4 @@ -4351,7 +4367,6 @@ L$enc_key_ret: addq $8,%rsp .byte 0xf3,0xc3 - L$SEH_end_set_encrypt_key: .p2align 4 @@ -4424,6 +4439,7 @@ L$key_expansion_256b: .byte 0xf3,0xc3 + .p2align 6 L$bswap_mask: .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index 2fefb75ac36844..00000000000000 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2571 +0,0 @@ -.text - - - - - -.p2align 6 -_bsaes_encrypt8: - - leaq L$BS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp L$enc_sbox -.p2align 4 -L$enc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -L$enc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl L$enc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz L$enc_loop - movdqa 64(%r11),%xmm7 - jmp L$enc_loop -.p2align 4 -L$enc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 - - - - -.p2align 6 -_bsaes_decrypt8: - - leaq L$BS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp L$dec_sbox -.p2align 4 -L$dec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -L$dec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl L$dec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz L$dec_loop - movdqa -32(%r11),%xmm7 - jmp L$dec_loop -.p2align 4 -L$dec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 - - - -.p2align 4 -_bsaes_key_convert: - - leaq L$masks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp L$key_loop -.p2align 4 -L$key_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz L$key_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 - - - -.globl _bsaes_cbc_encrypt - -.p2align 4 -_bsaes_cbc_encrypt: - - cmpl $0,%r9d - jne _asm_AES_cbc_encrypt - cmpq $128,%rdx - jb _asm_AES_cbc_encrypt - - movq %rsp,%rax -L$cbc_dec_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -L$cbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc L$cbc_dec_loop - - addq $8,%r14 - jz L$cbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb L$cbc_dec_one - movdqu 16(%r12),%xmm0 - je L$cbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb L$cbc_dec_three - movdqu 48(%r12),%xmm2 - je L$cbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb L$cbc_dec_five - movdqu 80(%r12),%xmm4 - je L$cbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -L$cbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$cbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$cbc_dec_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$cbc_dec_epilogue: - .byte 0xf3,0xc3 - - - -.globl _bsaes_ctr32_encrypt_blocks - -.p2align 4 -_bsaes_ctr32_encrypt_blocks: - - movq %rsp,%rax -L$ctr_enc_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb L$ctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq L$ADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp L$ctr_enc_loop -.p2align 4 -L$ctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq L$BS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc L$ctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq L$ADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz L$ctr_enc_loop - - jmp L$ctr_enc_done -.p2align 4 -L$ctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb L$ctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je L$ctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb L$ctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je L$ctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb L$ctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je L$ctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp L$ctr_enc_done - -.p2align 4 -L$ctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz L$ctr_enc_short - -L$ctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$ctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$ctr_enc_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$ctr_enc_epilogue: - .byte 0xf3,0xc3 - - -.globl _bsaes_xts_encrypt - -.p2align 4 -_bsaes_xts_encrypt: - - movq %rsp,%rax -L$xts_enc_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call _asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc L$xts_enc_short - jmp L$xts_enc_loop - -.p2align 4 -L$xts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc L$xts_enc_loop - -L$xts_enc_short: - addq $0x80,%r14 - jz L$xts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je L$xts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je L$xts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je L$xts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je L$xts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je L$xts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je L$xts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -L$xts_enc_done: - andl $15,%ebx - jz L$xts_enc_ret - movq %r13,%rdx - -L$xts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz L$xts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call _asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -L$xts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$xts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$xts_enc_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$xts_enc_epilogue: - .byte 0xf3,0xc3 - - - -.globl _bsaes_xts_decrypt - -.p2align 4 -_bsaes_xts_decrypt: - - movq %rsp,%rax -L$xts_dec_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call _asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc L$xts_dec_short - jmp L$xts_dec_loop - -.p2align 4 -L$xts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc L$xts_dec_loop - -L$xts_dec_short: - addq $0x80,%r14 - jz L$xts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je L$xts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je L$xts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je L$xts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je L$xts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je L$xts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je L$xts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -L$xts_dec_done: - andl $15,%ebx - jz L$xts_dec_ret - - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -L$xts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz L$xts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -L$xts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$xts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$xts_dec_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$xts_dec_epilogue: - .byte 0xf3,0xc3 - - - -.p2align 6 -_bsaes_const: -L$M0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -L$ISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -L$ISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -L$BS0: -.quad 0x5555555555555555, 0x5555555555555555 -L$BS1: -.quad 0x3333333333333333, 0x3333333333333333 -L$BS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -L$SR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -L$SRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -L$M0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -L$SWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -L$SWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -L$ADD1: -.quad 0x0000000000000000, 0x0000000100000000 -L$ADD2: -.quad 0x0000000000000000, 0x0000000200000000 -L$ADD3: -.quad 0x0000000000000000, 0x0000000300000000 -L$ADD4: -.quad 0x0000000000000000, 0x0000000400000000 -L$ADD5: -.quad 0x0000000000000000, 0x0000000500000000 -L$ADD6: -.quad 0x0000000000000000, 0x0000000600000000 -L$ADD7: -.quad 0x0000000000000000, 0x0000000700000000 -L$ADD8: -.quad 0x0000000000000000, 0x0000000800000000 -L$xts_magic: -.long 0x87,0,1,0 -L$masks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -L$M0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -L$63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.p2align 6 - diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s index eab5b54b2c1846..b572410a065e03 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s @@ -23,7 +23,7 @@ _rsaz_512_sqr: subq $128+24,%rsp L$sqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -38,6 +38,7 @@ L$oop_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -76,31 +77,29 @@ L$oop_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -108,7 +107,7 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -116,7 +115,7 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -124,7 +123,7 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -132,39 +131,39 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -172,7 +171,7 @@ L$oop_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -180,9 +179,7 @@ L$oop_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -190,36 +187,40 @@ L$oop_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -228,9 +229,8 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -239,32 +239,33 @@ L$oop_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -272,97 +273,99 @@ L$oop_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -372,6 +375,10 @@ L$oop_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -400,9 +407,9 @@ L$oop_sqr: L$oop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -410,40 +417,39 @@ L$oop_sqrx: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -461,24 +467,25 @@ L$oop_sqrx: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -486,7 +493,7 @@ L$oop_sqrx: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -494,27 +501,28 @@ L$oop_sqrx: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -529,25 +537,25 @@ L$oop_sqrx: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -558,18 +566,19 @@ L$oop_sqrx: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -582,18 +591,19 @@ L$oop_sqrx: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -603,31 +613,31 @@ L$oop_sqrx: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -641,6 +651,9 @@ L$oop_sqrx: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1410,6 +1423,7 @@ L$mul_by_one_epilogue: .p2align 5 __rsaz_512_reduce: + movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1491,9 +1505,11 @@ L$reduction_loop: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_reducex: + imulq %r8,%rdx xorq %rsi,%rsi movl $8,%ecx @@ -1547,8 +1563,10 @@ L$reduction_loopx: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_subtract: + movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1604,8 +1622,10 @@ __rsaz_512_subtract: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_mul: + leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1746,8 +1766,10 @@ L$oop_mul: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_mulx: + mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1865,10 +1887,12 @@ L$oop_mulx: .byte 0xf3,0xc3 + .globl _rsaz_512_scatter4 .p2align 4 _rsaz_512_scatter4: + leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp L$oop_scatter @@ -1883,10 +1907,12 @@ L$oop_scatter: .byte 0xf3,0xc3 + .globl _rsaz_512_gather4 .p2align 4 _rsaz_512_gather4: + movd %edx,%xmm8 movdqa L$inc+16(%rip),%xmm1 movdqa L$inc(%rip),%xmm0 @@ -1952,6 +1978,7 @@ L$oop_gather: L$SEH_end_rsaz_512_gather4: + .p2align 6 L$inc: .long 0,0, 1,1 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s index ee0ef1639a1286..6712682a60e027 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ L$mul4x_epilogue: .p2align 5 mul4x_internal: + shlq $5,%r9 movd 8(%rax),%xmm5 leaq L$inc(%rip),%rax @@ -1072,6 +1073,7 @@ L$inner4x: movq 24(%rbp),%r15 jmp L$sqr4x_sub_entry + .globl _bn_power5 .p2align 5 @@ -1284,6 +1286,7 @@ __bn_sqr8x_internal: + leaq 32(%r10),%rbp @@ -1989,8 +1992,10 @@ L$8x_no_tail: .byte 0xf3,0xc3 + .p2align 5 __bn_post4x_internal: + movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2042,10 +2047,12 @@ L$sqr4x_sub_entry: negq %r9 .byte 0xf3,0xc3 + .globl _bn_from_montgomery .p2align 5 _bn_from_montgomery: + testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax @@ -2053,6 +2060,7 @@ _bn_from_montgomery: + .p2align 5 bn_from_mont8x: @@ -2333,6 +2341,7 @@ L$mulx4x_epilogue: .p2align 5 mulx4x_internal: + movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2753,6 +2762,7 @@ L$mulx4x_inner: jmp L$sqrx4x_sub_entry + .p2align 5 bn_powerx5: @@ -3509,6 +3519,7 @@ L$sqrx8x_no_tail: .p2align 5 __bn_postx4x_internal: + movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3557,10 +3568,12 @@ L$sqrx4x_sub_entry: .byte 0xf3,0xc3 + .globl _bn_get_bits5 .p2align 4 _bn_get_bits5: + leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3576,10 +3589,12 @@ _bn_get_bits5: .byte 0xf3,0xc3 + .globl _bn_scatter5 .p2align 4 _bn_scatter5: + cmpl $0,%esi jz L$scatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3594,12 +3609,14 @@ L$scatter_epilogue: .byte 0xf3,0xc3 + .globl _bn_gather5 .p2align 5 _bn_gather5: L$SEH_begin_bn_gather5: + .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 leaq L$inc(%rip),%rax @@ -3757,6 +3774,7 @@ L$gather: .byte 0xf3,0xc3 L$SEH_end_bn_gather5: + .p2align 6 L$inc: .long 0,0, 1,1 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h index a6d2dadb30280a..ab5367073d6352 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Fri Sep 13 15:58:07 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:19 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -35,11 +35,12 @@ static const char compiler_flags[] = { 'A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5','1', '2','_','A','S','M',' ','-','D','K','E','C','C','A','K','1','6', '0','0','_','A','S','M',' ','-','D','R','C','4','_','A','S','M', - ' ','-','D','M','D','5','_','A','S','M',' ','-','D','V','P','A', - 'E','S','_','A','S','M',' ','-','D','G','H','A','S','H','_','A', - 'S','M',' ','-','D','E','C','P','_','N','I','S','T','Z','2','5', - '6','_','A','S','M',' ','-','D','X','2','5','5','1','9','_','A', - 'S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S', - 'M',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-', - 'D','N','D','E','B','U','G','\0' + ' ','-','D','M','D','5','_','A','S','M',' ','-','D','A','E','S', + 'N','I','_','A','S','M',' ','-','D','V','P','A','E','S','_','A', + 'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-', + 'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S', + 'M',' ','-','D','X','2','5','5','1','9','_','A','S','M',' ','-', + 'D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D', + '_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D','E', + 'B','U','G','\0' }; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s index 2ae924deeceba5..d815175ff57356 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s @@ -5,6 +5,7 @@ .p2align 4 _Camellia_EncryptBlock: + movl $128,%eax subl %edi,%eax movl $3,%edi @@ -12,6 +13,7 @@ _Camellia_EncryptBlock: jmp L$enc_rounds + .globl _Camellia_EncryptBlock_Rounds .p2align 4 @@ -78,6 +80,7 @@ L$enc_epilogue: .p2align 4 _x86_64_Camellia_encrypt: + xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -283,10 +286,12 @@ L$edone: + .globl _Camellia_DecryptBlock .p2align 4 _Camellia_DecryptBlock: + movl $128,%eax subl %edi,%eax movl $3,%edi @@ -294,6 +299,7 @@ _Camellia_DecryptBlock: jmp L$dec_rounds + .globl _Camellia_DecryptBlock_Rounds .p2align 4 @@ -360,6 +366,7 @@ L$dec_epilogue: .p2align 4 _x86_64_Camellia_decrypt: + xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -564,6 +571,7 @@ L$ddone: .byte 0xf3,0xc3 + .globl _Camellia_Ekeygen .p2align 4 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s index ff7ae723440e6c..dc6bed3b5bdea4 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -3838,6 +3838,7 @@ L$ord_sqrx_epilogue: .p2align 5 _ecp_nistz256_to_mont: + movl $0x80100,%ecx andl _OPENSSL_ia32cap_P+8(%rip),%ecx leaq L$RR(%rip),%rdx @@ -3850,6 +3851,7 @@ _ecp_nistz256_to_mont: + .globl _ecp_nistz256_mul_mont .p2align 5 @@ -4771,6 +4773,7 @@ L$from_epilogue: .p2align 5 _ecp_nistz256_scatter_w5: + leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4791,6 +4794,7 @@ _ecp_nistz256_scatter_w5: + .globl _ecp_nistz256_gather_w5 .p2align 5 @@ -4860,6 +4864,7 @@ L$SEH_end_ecp_nistz256_gather_w5: .p2align 5 _ecp_nistz256_scatter_w7: + movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4875,6 +4880,7 @@ _ecp_nistz256_scatter_w7: + .globl _ecp_nistz256_gather_w7 .p2align 5 @@ -5593,26 +5599,16 @@ L$point_addq_body: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz L$add_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz L$add_proceedq - testq %r9,%r9 - jz L$add_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp L$add_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz L$add_proceedq -.p2align 5 L$add_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6694,26 +6690,16 @@ L$point_addx_body: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz L$add_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz L$add_proceedx - testq %r9,%r9 - jz L$add_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp L$add_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz L$add_proceedx -.p2align 5 L$add_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s index cdb602d4ccc897..158e8496114df7 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s @@ -382,6 +382,7 @@ L$fe51_mul121666_epilogue: .p2align 5 _x25519_fe64_eligible: + movl _OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx @@ -390,6 +391,7 @@ _x25519_fe64_eligible: .byte 0xf3,0xc3 + .globl _x25519_fe64_mul .p2align 5 @@ -616,6 +618,7 @@ L$fe64_sqr_epilogue: .p2align 5 _x25519_fe64_mul121666: L$fe64_mul121666_body: + movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -646,11 +649,13 @@ L$fe64_mul121666_epilogue: .byte 0xf3,0xc3 + .globl _x25519_fe64_add .p2align 5 _x25519_fe64_add: L$fe64_add_body: + movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -681,11 +686,13 @@ L$fe64_add_epilogue: .byte 0xf3,0xc3 + .globl _x25519_fe64_sub .p2align 5 _x25519_fe64_sub: L$fe64_sub_body: + movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -716,11 +723,13 @@ L$fe64_sub_epilogue: .byte 0xf3,0xc3 + .globl _x25519_fe64_tobytes .p2align 5 _x25519_fe64_tobytes: L$fe64_to_body: + movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -757,4 +766,5 @@ L$fe64_to_body: L$fe64_to_epilogue: .byte 0xf3,0xc3 + .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h index a69309195ed634..e2d05cdbf49656 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".dylib" diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s index d5920186ce6e5c..c26df9da7e6377 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .p2align 5 _aesni_ctr32_ghash_6x: + vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -311,6 +312,7 @@ L$6x_done: .byte 0xf3,0xc3 + .globl _aesni_gcm_decrypt .p2align 5 @@ -416,6 +418,7 @@ L$gcm_dec_abort: .p2align 5 _aesni_ctr32_6x: + vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -504,6 +507,7 @@ L$handle_ctr32_2: jmp L$oop_ctr32 + .globl _aesni_gcm_encrypt .p2align 5 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s index cbc8c808168601..19e55e1d329afe 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .p2align 5 _poly1305_init: + xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -50,6 +51,7 @@ L$no_key: + .p2align 5 _poly1305_blocks: @@ -161,6 +163,7 @@ L$blocks_epilogue: .p2align 5 _poly1305_emit: + L$emit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -183,8 +186,10 @@ L$emit: .byte 0xf3,0xc3 + .p2align 5 __poly1305_block: + mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -227,8 +232,10 @@ __poly1305_block: + .p2align 5 __poly1305_init_avx: + movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -389,6 +396,7 @@ __poly1305_init_avx: + .p2align 5 poly1305_blocks_avx: @@ -1214,6 +1222,7 @@ L$short_tail_avx: .p2align 5 poly1305_emit_avx: + cmpl $0,20(%rdi) je L$emit @@ -1266,6 +1275,7 @@ poly1305_emit_avx: .byte 0xf3,0xc3 + .p2align 5 poly1305_blocks_avx2: @@ -2448,6 +2458,7 @@ L$tail_avx512: .p2align 5 poly1305_init_base2_44: + xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -2483,8 +2494,10 @@ L$init_base2_44: .byte 0xf3,0xc3 + .p2align 5 poly1305_blocks_vpmadd52: + shrq $4,%rdx jz L$no_data_vpmadd52 @@ -2593,8 +2606,10 @@ L$no_data_vpmadd52: .byte 0xf3,0xc3 + .p2align 5 poly1305_blocks_vpmadd52_4x: + shrq $4,%rdx jz L$no_data_vpmadd52_4x @@ -3021,8 +3036,10 @@ L$no_data_vpmadd52_4x: .byte 0xf3,0xc3 + .p2align 5 poly1305_blocks_vpmadd52_8x: + shrq $4,%rdx jz L$no_data_vpmadd52_8x @@ -3365,8 +3382,10 @@ L$no_data_vpmadd52_8x: .byte 0xf3,0xc3 + .p2align 5 poly1305_emit_base2_44: + movq 0(%rdi),%r8 movq 8(%rdi),%r9 movq 16(%rdi),%r10 @@ -3398,6 +3417,7 @@ poly1305_emit_base2_44: .byte 0xf3,0xc3 + .p2align 6 L$const: L$mask24: @@ -3435,6 +3455,7 @@ L$x_mask42: .p2align 4 _xor128_encrypt_n_pad: + subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -3478,10 +3499,12 @@ L$done_enc: .byte 0xf3,0xc3 + .globl _xor128_decrypt_n_pad .p2align 4 _xor128_decrypt_n_pad: + subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s index 8bfb48b74a672e..8b6186f0e2bca7 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl _RC4 .p2align 4 -_RC4: orq %rsi,%rsi +_RC4: + + orq %rsi,%rsi jne L$entry .byte 0xf3,0xc3 L$entry: - pushq %rbx pushq %r12 @@ -530,6 +531,7 @@ L$epilogue: .p2align 4 _RC4_set_key: + leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -598,10 +600,12 @@ L$exit_key: .byte 0xf3,0xc3 + .globl _RC4_options .p2align 4 _RC4_options: + leaq L$opts(%rip),%rax movl _OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -614,6 +618,7 @@ L$8xchar: addq $12,%rax L$done: .byte 0xf3,0xc3 + .p2align 6 L$opts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s index ec096c5ab0cae8..5105d9818b5575 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .p2align 5 __KeccakF1600: + movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -258,6 +259,7 @@ L$oop: + .p2align 5 KeccakF1600: diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s index 02472d0b7d57e5..fb22d41c1a44ed 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s @@ -1421,10 +1421,10 @@ L$oop_shaext: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) - .byte 0xf3,0xc3 + .p2align 4 sha1_block_data_order_ssse3: _ssse3_shortcut: diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s index e43cdd7040f517..3952a775b92182 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .p2align 6 sha256_block_data_order_shaext: _shaext_shortcut: + leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1979,6 +1980,7 @@ L$oop_shaext: .byte 0xf3,0xc3 + .p2align 6 sha256_block_data_order_ssse3: @@ -4238,7 +4240,15 @@ L$oop_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi + leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) + movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ L$oop_avx2: .p2align 4 L$avx2_00_47: leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ L$avx2_00_47: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ L$ower_avx2: leaq 448(%rsp),%rsp + + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ L$ower_avx2: jbe L$oop_avx2 leaq (%rsp),%rbp + + + L$done_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s index 51ace9a686804c..6348b0a2c0f8fa 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ L$oop_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi + leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) + vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ L$oop_avx2: .p2align 4 L$avx2_00_47: leaq -128(%rsp),%rsp + + + pushq 128-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ L$avx2_00_47: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp + + + pushq 128-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ L$ower_avx2: leaq 1152(%rsp),%rsp + + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ L$ower_avx2: jbe L$oop_avx2 leaq (%rsp),%rbp + + + L$done_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s index 05afede678c954..32a92da69f0b8c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s @@ -13,6 +13,7 @@ .p2align 4 _OPENSSL_atomic_add: + movl (%rdi),%eax L$spin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -23,16 +24,19 @@ L$spin: leaq (%rsi,%rax,1),%r8 .byte 0xf3,0xc3 + .globl _OPENSSL_rdtsc .p2align 4 _OPENSSL_rdtsc: + rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 + .globl _OPENSSL_ia32_cpuid .p2align 4 @@ -206,6 +210,7 @@ L$done: .p2align 4 _OPENSSL_cleanse: + xorq %rax,%rax cmpq $15,%rsi jae L$ot @@ -237,10 +242,12 @@ L$aligned: .byte 0xf3,0xc3 + .globl _CRYPTO_memcmp .p2align 4 _CRYPTO_memcmp: + xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -270,10 +277,12 @@ L$oop_cmp: L$no_data: .byte 0xf3,0xc3 + .globl _OPENSSL_wipe_cpu .p2align 4 _OPENSSL_wipe_cpu: + pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -301,10 +310,12 @@ _OPENSSL_wipe_cpu: leaq 8(%rsp),%rax .byte 0xf3,0xc3 + .globl _OPENSSL_instrument_bus .p2align 4 _OPENSSL_instrument_bus: + movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -333,10 +344,12 @@ L$oop: rdtsc .byte 0xf3,0xc3 + .globl _OPENSSL_instrument_bus2 .p2align 4 _OPENSSL_instrument_bus2: + movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -380,10 +393,12 @@ L$done2: subq %rcx,%rax .byte 0xf3,0xc3 + .globl _OPENSSL_ia32_rdrand_bytes .p2align 4 _OPENSSL_ia32_rdrand_bytes: + xorq %rax,%rax cmpq $0,%rsi je L$done_rdrand_bytes @@ -421,10 +436,12 @@ L$done_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 + .globl _OPENSSL_ia32_rdseed_bytes .p2align 4 _OPENSSL_ia32_rdseed_bytes: + xorq %rax,%rax cmpq $0,%rsi je L$done_rdseed_bytes diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h index 2a63d7a6ba190f..25a4ebf76afc2f 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi index 95e8dc567ee299..152f3f9fa54295 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi @@ -15,6 +15,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi index f87225df694da8..3b44bb5fc89404 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi @@ -722,6 +722,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm index 32bcc2c46627da..e07de8a9b50ad8 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "darwin64-x86_64-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -235,6 +235,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -352,8 +353,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -621,14 +622,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -704,6 +697,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1493,6 +1494,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3247,7 +3254,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3255,6 +3261,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3753,14 +3760,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4201,6 +4200,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4883,49 +4890,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4935,25 +4934,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4971,13 +4966,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4991,613 +4984,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5611,7 +5502,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5621,182 +5511,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5806,19 +5666,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5844,31 +5701,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5878,37 +5730,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5918,31 +5764,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5960,278 +5801,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6241,301 +6036,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,7 +6288,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6551,7 +6295,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6559,7 +6302,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6567,7 +6309,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6575,7 +6316,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6583,163 +6323,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6757,241 +6470,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6999,21 +6672,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7021,13 +6691,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7035,81 +6703,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7117,328 +6772,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7448,91 +7042,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7551,7 +7130,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7561,361 +7139,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7937,265 +7455,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8205,31 +7679,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8239,7 +7708,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8253,7 +7721,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8271,19 +7738,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8297,7 +7761,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8315,13 +7778,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8347,727 +7808,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9118,6 +8458,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9362,7 +8710,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9688,7 +9035,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9734,7 +9080,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9800,7 +9145,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9825,7 +9169,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9923,7 +9266,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9973,18 +9315,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9995,6 +9334,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10058,10 +9401,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10090,6 +9429,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10354,6 +9697,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15359,7 +14703,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15367,6 +14710,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15594,6 +14938,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15696,10 +15048,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15728,6 +15076,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s deleted file mode 100644 index ee148d19dcb0ff..00000000000000 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2631 +0,0 @@ -.text - -.p2align 4 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp L$enc_loop -.p2align 4 -L$enc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz L$enc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 - - -.p2align 4 -_x86_64_AES_encrypt_compact: - - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp L$enc_loop_compact -.p2align 4 -L$enc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je L$enc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp L$enc_loop_compact -.p2align 4 -L$enc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 - - -.globl _AES_encrypt - -.p2align 4 -.globl _asm_AES_encrypt -.private_extern _asm_AES_encrypt -_asm_AES_encrypt: -_AES_encrypt: - - movq %rsp,%rax - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) - -L$enc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq L$AES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 - - movq -40(%rsi),%r14 - - movq -32(%rsi),%r13 - - movq -24(%rsi),%r12 - - movq -16(%rsi),%rbp - - movq -8(%rsi),%rbx - - leaq (%rsi),%rsp - -L$enc_epilogue: - .byte 0xf3,0xc3 - - - -.p2align 4 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp L$dec_loop -.p2align 4 -L$dec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz L$dec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 - - -.p2align 4 -_x86_64_AES_decrypt_compact: - - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp L$dec_loop_compact - -.p2align 4 -L$dec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je L$dec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp L$dec_loop_compact -.p2align 4 -L$dec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 - - -.globl _AES_decrypt - -.p2align 4 -.globl _asm_AES_decrypt -.private_extern _asm_AES_decrypt -_asm_AES_decrypt: -_AES_decrypt: - - movq %rsp,%rax - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) - -L$dec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq L$AES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 - - movq -40(%rsi),%r14 - - movq -32(%rsi),%r13 - - movq -24(%rsi),%r12 - - movq -16(%rsi),%rbp - - movq -8(%rsi),%rbx - - leaq (%rsi),%rsp - -L$dec_epilogue: - .byte 0xf3,0xc3 - - -.globl _AES_set_encrypt_key - -.p2align 4 -_AES_set_encrypt_key: - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - subq $8,%rsp - -L$enc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp - - movq 48(%rsp),%rbx - - addq $56,%rsp - -L$enc_key_epilogue: - .byte 0xf3,0xc3 - - - - -.p2align 4 -_x86_64_AES_set_encrypt_key: - - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz L$badpointer - testq $-1,%rdi - jz L$badpointer - - leaq L$AES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je L$10rounds - cmpl $192,%ecx - je L$12rounds - cmpl $256,%ecx - je L$14rounds - movq $-2,%rax - jmp L$exit - -L$10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp L$10shortcut -.p2align 2 -L$10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -L$10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl L$10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp L$exit - -L$12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp L$12shortcut -.p2align 2 -L$12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -L$12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je L$12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp L$12loop -L$12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp L$exit - -L$14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp L$14shortcut -.p2align 2 -L$14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -L$14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je L$14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp L$14loop -L$14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp L$exit - -L$badpointer: - movq $-1,%rax -L$exit: -.byte 0xf3,0xc3 - - -.globl _AES_set_decrypt_key - -.p2align 4 -_AES_set_decrypt_key: - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - pushq %rdx - -L$dec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne L$abort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.p2align 2 -L$invert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne L$invert - - leaq L$AES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.p2align 2 -L$permute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz L$permute - - xorq %rax,%rax -L$abort: - movq 8(%rsp),%r15 - - movq 16(%rsp),%r14 - - movq 24(%rsp),%r13 - - movq 32(%rsp),%r12 - - movq 40(%rsp),%rbp - - movq 48(%rsp),%rbx - - addq $56,%rsp - -L$dec_key_epilogue: - .byte 0xf3,0xc3 - - -.globl _AES_cbc_encrypt - -.p2align 4 - -.globl _asm_AES_cbc_encrypt -.private_extern _asm_AES_cbc_encrypt -_asm_AES_cbc_encrypt: -_AES_cbc_encrypt: - - cmpq $0,%rdx - je L$cbc_epilogue - pushfq - - - - pushq %rbx - - pushq %rbp - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - -L$cbc_prologue: - - cld - movl %r9d,%r9d - - leaq L$AES_Te(%rip),%r14 - leaq L$AES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - - - movl _OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb L$cbc_slow_prologue - testq $15,%rdx - jnz L$cbc_slow_prologue - btl $28,%r10d - jc L$cbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb L$cbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp L$cbc_te_ok -L$cbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.p2align 2 -L$cbc_te_ok: - - xchgq %rsp,%r15 - - - movq %r15,16(%rsp) - -L$cbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb L$cbc_do_ecopy - cmpq $4096-248,%r10 - jb L$cbc_skip_ecopy -.p2align 2 -L$cbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -L$cbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.p2align 2 -L$cbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz L$cbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je L$FAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.p2align 2 -L$cbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz L$cbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp L$cbc_fast_cleanup - - -.p2align 4 -L$FAST_DECRYPT: - cmpq %r8,%r9 - je L$cbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.p2align 2 -L$cbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz L$cbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp L$cbc_fast_cleanup - -.p2align 4 -L$cbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.p2align 2 -L$cbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz L$cbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp L$cbc_fast_dec_in_place_loop -L$cbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.p2align 2 -L$cbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je L$cbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp L$cbc_exit - - -.p2align 4 -L$cbc_slow_prologue: - - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp - - - movq %rbp,16(%rsp) - -L$cbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je L$SLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz L$cbc_slow_enc_tail - -.p2align 2 -L$cbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz L$cbc_slow_enc_loop - testq $15,%r10 - jnz L$cbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp L$cbc_exit - -.p2align 2 -L$cbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp L$cbc_slow_enc_loop - -.p2align 4 -L$SLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.p2align 2 -L$cbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc L$cbc_slow_dec_partial - jz L$cbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp L$cbc_slow_dec_loop -L$cbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp L$cbc_exit - -.p2align 2 -L$cbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp L$cbc_exit - -.p2align 4 -L$cbc_exit: - movq 16(%rsp),%rsi - - movq (%rsi),%r15 - - movq 8(%rsi),%r14 - - movq 16(%rsi),%r13 - - movq 24(%rsi),%r12 - - movq 32(%rsi),%rbp - - movq 40(%rsi),%rbx - - leaq 48(%rsi),%rsp - -L$cbc_popfq: - popfq - - - -L$cbc_epilogue: - .byte 0xf3,0xc3 - - -.p2align 6 -L$AES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.p2align 6 -L$AES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.p2align 6 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s index aed8f3a345ad66..738aa6dc53b327 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s @@ -6,6 +6,7 @@ .p2align 5 _aesni_cbc_sha1_enc: + movl _OPENSSL_ia32cap_P+0(%rip),%r10d movq _OPENSSL_ia32cap_P+4(%rip),%r11 btq $61,%r11 @@ -19,6 +20,7 @@ _aesni_cbc_sha1_enc: .byte 0xf3,0xc3 + .p2align 5 aesni_cbc_sha1_enc_ssse3: @@ -2718,6 +2720,7 @@ K_XX_XX: .p2align 5 aesni_cbc_sha1_enc_shaext: + movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s index 28cf0768cada91..3aee22c3bc57a8 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .p2align 4 _aesni_cbc_sha256_enc: + leaq _OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -32,6 +33,7 @@ L$probe: .byte 0xf3,0xc3 + .p2align 6 K256: @@ -2528,7 +2530,15 @@ L$oop_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi + leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) + movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ L$avx2_00_47: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ L$avx2_00_47: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ L$ower_avx2: jbe L$oop_avx2 leaq (%rsp),%rbp + + + L$done_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ L$epilogue_avx2: .p2align 5 aesni_cbc_sha256_enc_shaext: + movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s index 6792a530f28e8e..924900d84ebd18 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ L$ecb_ret: .p2align 4 _aesni_ccm64_encrypt_blocks: + movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa L$increment64(%rip),%xmm9 @@ -920,10 +921,12 @@ L$ccm64_enc2_loop: pxor %xmm6,%xmm6 .byte 0xf3,0xc3 + .globl _aesni_ccm64_decrypt_blocks .p2align 4 _aesni_ccm64_decrypt_blocks: + movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1017,6 +1020,7 @@ L$oop_enc1_6: pxor %xmm6,%xmm6 .byte 0xf3,0xc3 + .globl _aesni_ctr32_encrypt_blocks .p2align 4 @@ -2785,6 +2789,7 @@ L$ocb_enc_epilogue: .p2align 5 __ocb_encrypt6: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2885,8 +2890,10 @@ L$ocb_enc_loop6: + .p2align 5 __ocb_encrypt4: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2954,8 +2961,10 @@ L$ocb_enc_loop4: + .p2align 5 __ocb_encrypt1: + pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2988,6 +2997,7 @@ L$ocb_enc_loop1: .byte 0xf3,0xc3 + .globl _aesni_ocb_decrypt .p2align 5 @@ -3223,6 +3233,7 @@ L$ocb_dec_epilogue: .p2align 5 __ocb_decrypt6: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3317,8 +3328,10 @@ L$ocb_dec_loop6: + .p2align 5 __ocb_decrypt4: + pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3382,8 +3395,10 @@ L$ocb_dec_loop4: + .p2align 5 __ocb_decrypt1: + pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3414,6 +3429,7 @@ L$ocb_dec_loop1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 + .globl _aesni_cbc_encrypt .p2align 4 @@ -4351,7 +4367,6 @@ L$enc_key_ret: addq $8,%rsp .byte 0xf3,0xc3 - L$SEH_end_set_encrypt_key: .p2align 4 @@ -4424,6 +4439,7 @@ L$key_expansion_256b: .byte 0xf3,0xc3 + .p2align 6 L$bswap_mask: .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index 2fefb75ac36844..00000000000000 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2571 +0,0 @@ -.text - - - - - -.p2align 6 -_bsaes_encrypt8: - - leaq L$BS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp L$enc_sbox -.p2align 4 -L$enc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -L$enc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl L$enc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz L$enc_loop - movdqa 64(%r11),%xmm7 - jmp L$enc_loop -.p2align 4 -L$enc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 - - - - -.p2align 6 -_bsaes_decrypt8: - - leaq L$BS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp L$dec_sbox -.p2align 4 -L$dec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -L$dec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl L$dec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz L$dec_loop - movdqa -32(%r11),%xmm7 - jmp L$dec_loop -.p2align 4 -L$dec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 - - - -.p2align 4 -_bsaes_key_convert: - - leaq L$masks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp L$key_loop -.p2align 4 -L$key_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz L$key_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 - - - -.globl _bsaes_cbc_encrypt - -.p2align 4 -_bsaes_cbc_encrypt: - - cmpl $0,%r9d - jne _asm_AES_cbc_encrypt - cmpq $128,%rdx - jb _asm_AES_cbc_encrypt - - movq %rsp,%rax -L$cbc_dec_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -L$cbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc L$cbc_dec_loop - - addq $8,%r14 - jz L$cbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb L$cbc_dec_one - movdqu 16(%r12),%xmm0 - je L$cbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb L$cbc_dec_three - movdqu 48(%r12),%xmm2 - je L$cbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb L$cbc_dec_five - movdqu 80(%r12),%xmm4 - je L$cbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp L$cbc_dec_done -.p2align 4 -L$cbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -L$cbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$cbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$cbc_dec_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$cbc_dec_epilogue: - .byte 0xf3,0xc3 - - - -.globl _bsaes_ctr32_encrypt_blocks - -.p2align 4 -_bsaes_ctr32_encrypt_blocks: - - movq %rsp,%rax -L$ctr_enc_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb L$ctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq L$ADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp L$ctr_enc_loop -.p2align 4 -L$ctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq L$BS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc L$ctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq L$ADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz L$ctr_enc_loop - - jmp L$ctr_enc_done -.p2align 4 -L$ctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb L$ctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je L$ctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb L$ctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je L$ctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb L$ctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je L$ctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp L$ctr_enc_done - -.p2align 4 -L$ctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz L$ctr_enc_short - -L$ctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$ctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$ctr_enc_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$ctr_enc_epilogue: - .byte 0xf3,0xc3 - - -.globl _bsaes_xts_encrypt - -.p2align 4 -_bsaes_xts_encrypt: - - movq %rsp,%rax -L$xts_enc_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call _asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc L$xts_enc_short - jmp L$xts_enc_loop - -.p2align 4 -L$xts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc L$xts_enc_loop - -L$xts_enc_short: - addq $0x80,%r14 - jz L$xts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je L$xts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je L$xts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je L$xts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je L$xts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je L$xts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je L$xts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp L$xts_enc_done -.p2align 4 -L$xts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -L$xts_enc_done: - andl $15,%ebx - jz L$xts_enc_ret - movq %r13,%rdx - -L$xts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz L$xts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call _asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -L$xts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$xts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$xts_enc_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$xts_enc_epilogue: - .byte 0xf3,0xc3 - - - -.globl _bsaes_xts_decrypt - -.p2align 4 -_bsaes_xts_decrypt: - - movq %rsp,%rax -L$xts_dec_prologue: - pushq %rbp - - pushq %rbx - - pushq %r12 - - pushq %r13 - - pushq %r14 - - pushq %r15 - - leaq -72(%rsp),%rsp - - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call _asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc L$xts_dec_short - jmp L$xts_dec_loop - -.p2align 4 -L$xts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc L$xts_dec_loop - -L$xts_dec_short: - addq $0x80,%r14 - jz L$xts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je L$xts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je L$xts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je L$xts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je L$xts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je L$xts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je L$xts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp L$xts_dec_done -.p2align 4 -L$xts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -L$xts_dec_done: - andl $15,%ebx - jz L$xts_dec_ret - - pxor %xmm14,%xmm14 - movdqa L$xts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -L$xts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz L$xts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call _asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -L$xts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -L$xts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja L$xts_dec_bzero - - leaq 120(%rbp),%rax - - movq -48(%rax),%r15 - - movq -40(%rax),%r14 - - movq -32(%rax),%r13 - - movq -24(%rax),%r12 - - movq -16(%rax),%rbx - - movq -8(%rax),%rbp - - leaq (%rax),%rsp - -L$xts_dec_epilogue: - .byte 0xf3,0xc3 - - - -.p2align 6 -_bsaes_const: -L$M0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -L$ISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -L$ISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -L$BS0: -.quad 0x5555555555555555, 0x5555555555555555 -L$BS1: -.quad 0x3333333333333333, 0x3333333333333333 -L$BS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -L$SR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -L$SRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -L$M0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -L$SWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -L$SWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -L$ADD1: -.quad 0x0000000000000000, 0x0000000100000000 -L$ADD2: -.quad 0x0000000000000000, 0x0000000200000000 -L$ADD3: -.quad 0x0000000000000000, 0x0000000300000000 -L$ADD4: -.quad 0x0000000000000000, 0x0000000400000000 -L$ADD5: -.quad 0x0000000000000000, 0x0000000500000000 -L$ADD6: -.quad 0x0000000000000000, 0x0000000600000000 -L$ADD7: -.quad 0x0000000000000000, 0x0000000700000000 -L$ADD8: -.quad 0x0000000000000000, 0x0000000800000000 -L$xts_magic: -.long 0x87,0,1,0 -L$masks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -L$M0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -L$63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.p2align 6 - diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s index eab5b54b2c1846..b572410a065e03 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s @@ -23,7 +23,7 @@ _rsaz_512_sqr: subq $128+24,%rsp L$sqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -38,6 +38,7 @@ L$oop_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -76,31 +77,29 @@ L$oop_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -108,7 +107,7 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -116,7 +115,7 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -124,7 +123,7 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -132,39 +131,39 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -172,7 +171,7 @@ L$oop_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -180,9 +179,7 @@ L$oop_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -190,36 +187,40 @@ L$oop_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -228,9 +229,8 @@ L$oop_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -239,32 +239,33 @@ L$oop_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -272,97 +273,99 @@ L$oop_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -372,6 +375,10 @@ L$oop_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -400,9 +407,9 @@ L$oop_sqr: L$oop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -410,40 +417,39 @@ L$oop_sqrx: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -461,24 +467,25 @@ L$oop_sqrx: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -486,7 +493,7 @@ L$oop_sqrx: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -494,27 +501,28 @@ L$oop_sqrx: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -529,25 +537,25 @@ L$oop_sqrx: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -558,18 +566,19 @@ L$oop_sqrx: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -582,18 +591,19 @@ L$oop_sqrx: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -603,31 +613,31 @@ L$oop_sqrx: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -641,6 +651,9 @@ L$oop_sqrx: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1410,6 +1423,7 @@ L$mul_by_one_epilogue: .p2align 5 __rsaz_512_reduce: + movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1491,9 +1505,11 @@ L$reduction_loop: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_reducex: + imulq %r8,%rdx xorq %rsi,%rsi movl $8,%ecx @@ -1547,8 +1563,10 @@ L$reduction_loopx: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_subtract: + movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1604,8 +1622,10 @@ __rsaz_512_subtract: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_mul: + leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1746,8 +1766,10 @@ L$oop_mul: .byte 0xf3,0xc3 + .p2align 5 __rsaz_512_mulx: + mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1865,10 +1887,12 @@ L$oop_mulx: .byte 0xf3,0xc3 + .globl _rsaz_512_scatter4 .p2align 4 _rsaz_512_scatter4: + leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp L$oop_scatter @@ -1883,10 +1907,12 @@ L$oop_scatter: .byte 0xf3,0xc3 + .globl _rsaz_512_gather4 .p2align 4 _rsaz_512_gather4: + movd %edx,%xmm8 movdqa L$inc+16(%rip),%xmm1 movdqa L$inc(%rip),%xmm0 @@ -1952,6 +1978,7 @@ L$oop_gather: L$SEH_end_rsaz_512_gather4: + .p2align 6 L$inc: .long 0,0, 1,1 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s index ee0ef1639a1286..6712682a60e027 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ L$mul4x_epilogue: .p2align 5 mul4x_internal: + shlq $5,%r9 movd 8(%rax),%xmm5 leaq L$inc(%rip),%rax @@ -1072,6 +1073,7 @@ L$inner4x: movq 24(%rbp),%r15 jmp L$sqr4x_sub_entry + .globl _bn_power5 .p2align 5 @@ -1284,6 +1286,7 @@ __bn_sqr8x_internal: + leaq 32(%r10),%rbp @@ -1989,8 +1992,10 @@ L$8x_no_tail: .byte 0xf3,0xc3 + .p2align 5 __bn_post4x_internal: + movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2042,10 +2047,12 @@ L$sqr4x_sub_entry: negq %r9 .byte 0xf3,0xc3 + .globl _bn_from_montgomery .p2align 5 _bn_from_montgomery: + testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax @@ -2053,6 +2060,7 @@ _bn_from_montgomery: + .p2align 5 bn_from_mont8x: @@ -2333,6 +2341,7 @@ L$mulx4x_epilogue: .p2align 5 mulx4x_internal: + movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2753,6 +2762,7 @@ L$mulx4x_inner: jmp L$sqrx4x_sub_entry + .p2align 5 bn_powerx5: @@ -3509,6 +3519,7 @@ L$sqrx8x_no_tail: .p2align 5 __bn_postx4x_internal: + movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3557,10 +3568,12 @@ L$sqrx4x_sub_entry: .byte 0xf3,0xc3 + .globl _bn_get_bits5 .p2align 4 _bn_get_bits5: + leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3576,10 +3589,12 @@ _bn_get_bits5: .byte 0xf3,0xc3 + .globl _bn_scatter5 .p2align 4 _bn_scatter5: + cmpl $0,%esi jz L$scatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3594,12 +3609,14 @@ L$scatter_epilogue: .byte 0xf3,0xc3 + .globl _bn_gather5 .p2align 5 _bn_gather5: L$SEH_begin_bn_gather5: + .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 leaq L$inc(%rip),%rax @@ -3757,6 +3774,7 @@ L$gather: .byte 0xf3,0xc3 L$SEH_end_bn_gather5: + .p2align 6 L$inc: .long 0,0, 1,1 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h index da2e3d51505ac4..7847154abb8994 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Fri Sep 13 15:58:21 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:29 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -36,11 +36,12 @@ static const char compiler_flags[] = { 'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A', '5','1','2','_','A','S','M',' ','-','D','K','E','C','C','A','K', '1','6','0','0','_','A','S','M',' ','-','D','R','C','4','_','A', - 'S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','V', - 'P','A','E','S','_','A','S','M',' ','-','D','G','H','A','S','H', - '_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z', - '2','5','6','_','A','S','M',' ','-','D','X','2','5','5','1','9', - '_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_', - 'A','S','M',' ','-','D','_','R','E','E','N','T','R','A','N','T', - ' ','-','D','N','D','E','B','U','G','\0' + 'S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','A', + 'E','S','N','I','_','A','S','M',' ','-','D','V','P','A','E','S', + '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M', + ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_', + 'A','S','M',' ','-','D','X','2','5','5','1','9','_','A','S','M', + ' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ', + '-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N', + 'D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s index 2ae924deeceba5..d815175ff57356 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s @@ -5,6 +5,7 @@ .p2align 4 _Camellia_EncryptBlock: + movl $128,%eax subl %edi,%eax movl $3,%edi @@ -12,6 +13,7 @@ _Camellia_EncryptBlock: jmp L$enc_rounds + .globl _Camellia_EncryptBlock_Rounds .p2align 4 @@ -78,6 +80,7 @@ L$enc_epilogue: .p2align 4 _x86_64_Camellia_encrypt: + xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -283,10 +286,12 @@ L$edone: + .globl _Camellia_DecryptBlock .p2align 4 _Camellia_DecryptBlock: + movl $128,%eax subl %edi,%eax movl $3,%edi @@ -294,6 +299,7 @@ _Camellia_DecryptBlock: jmp L$dec_rounds + .globl _Camellia_DecryptBlock_Rounds .p2align 4 @@ -360,6 +366,7 @@ L$dec_epilogue: .p2align 4 _x86_64_Camellia_decrypt: + xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -564,6 +571,7 @@ L$ddone: .byte 0xf3,0xc3 + .globl _Camellia_Ekeygen .p2align 4 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s index ff7ae723440e6c..dc6bed3b5bdea4 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s @@ -3838,6 +3838,7 @@ L$ord_sqrx_epilogue: .p2align 5 _ecp_nistz256_to_mont: + movl $0x80100,%ecx andl _OPENSSL_ia32cap_P+8(%rip),%ecx leaq L$RR(%rip),%rdx @@ -3850,6 +3851,7 @@ _ecp_nistz256_to_mont: + .globl _ecp_nistz256_mul_mont .p2align 5 @@ -4771,6 +4773,7 @@ L$from_epilogue: .p2align 5 _ecp_nistz256_scatter_w5: + leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4791,6 +4794,7 @@ _ecp_nistz256_scatter_w5: + .globl _ecp_nistz256_gather_w5 .p2align 5 @@ -4860,6 +4864,7 @@ L$SEH_end_ecp_nistz256_gather_w5: .p2align 5 _ecp_nistz256_scatter_w7: + movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4875,6 +4880,7 @@ _ecp_nistz256_scatter_w7: + .globl _ecp_nistz256_gather_w7 .p2align 5 @@ -5593,26 +5599,16 @@ L$point_addq_body: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz L$add_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz L$add_proceedq - testq %r9,%r9 - jz L$add_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp L$add_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz L$add_proceedq -.p2align 5 L$add_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6694,26 +6690,16 @@ L$point_addx_body: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz L$add_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz L$add_proceedx - testq %r9,%r9 - jz L$add_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp L$add_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz L$add_proceedx -.p2align 5 L$add_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s index cdb602d4ccc897..158e8496114df7 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s @@ -382,6 +382,7 @@ L$fe51_mul121666_epilogue: .p2align 5 _x25519_fe64_eligible: + movl _OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx @@ -390,6 +391,7 @@ _x25519_fe64_eligible: .byte 0xf3,0xc3 + .globl _x25519_fe64_mul .p2align 5 @@ -616,6 +618,7 @@ L$fe64_sqr_epilogue: .p2align 5 _x25519_fe64_mul121666: L$fe64_mul121666_body: + movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -646,11 +649,13 @@ L$fe64_mul121666_epilogue: .byte 0xf3,0xc3 + .globl _x25519_fe64_add .p2align 5 _x25519_fe64_add: L$fe64_add_body: + movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -681,11 +686,13 @@ L$fe64_add_epilogue: .byte 0xf3,0xc3 + .globl _x25519_fe64_sub .p2align 5 _x25519_fe64_sub: L$fe64_sub_body: + movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -716,11 +723,13 @@ L$fe64_sub_epilogue: .byte 0xf3,0xc3 + .globl _x25519_fe64_tobytes .p2align 5 _x25519_fe64_tobytes: L$fe64_to_body: + movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -757,4 +766,5 @@ L$fe64_to_body: L$fe64_to_epilogue: .byte 0xf3,0xc3 + .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h index a69309195ed634..e2d05cdbf49656 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".dylib" diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s index d5920186ce6e5c..c26df9da7e6377 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .p2align 5 _aesni_ctr32_ghash_6x: + vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -311,6 +312,7 @@ L$6x_done: .byte 0xf3,0xc3 + .globl _aesni_gcm_decrypt .p2align 5 @@ -416,6 +418,7 @@ L$gcm_dec_abort: .p2align 5 _aesni_ctr32_6x: + vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -504,6 +507,7 @@ L$handle_ctr32_2: jmp L$oop_ctr32 + .globl _aesni_gcm_encrypt .p2align 5 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s index cf3ca1a4dbd7e3..f6afad8ff0c006 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .p2align 5 _poly1305_init: + xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -45,6 +46,7 @@ L$no_key: + .p2align 5 _poly1305_blocks: @@ -156,6 +158,7 @@ L$blocks_epilogue: .p2align 5 _poly1305_emit: + L$emit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -178,8 +181,10 @@ L$emit: .byte 0xf3,0xc3 + .p2align 5 __poly1305_block: + mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -222,8 +227,10 @@ __poly1305_block: + .p2align 5 __poly1305_init_avx: + movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -384,6 +391,7 @@ __poly1305_init_avx: + .p2align 5 poly1305_blocks_avx: @@ -1209,6 +1217,7 @@ L$short_tail_avx: .p2align 5 poly1305_emit_avx: + cmpl $0,20(%rdi) je L$emit @@ -1261,6 +1270,7 @@ poly1305_emit_avx: .byte 0xf3,0xc3 + .p2align 5 poly1305_blocks_avx2: @@ -1929,6 +1939,7 @@ L$x_mask42: .p2align 4 _xor128_encrypt_n_pad: + subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -1972,10 +1983,12 @@ L$done_enc: .byte 0xf3,0xc3 + .globl _xor128_decrypt_n_pad .p2align 4 _xor128_decrypt_n_pad: + subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s index 8bfb48b74a672e..8b6186f0e2bca7 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl _RC4 .p2align 4 -_RC4: orq %rsi,%rsi +_RC4: + + orq %rsi,%rsi jne L$entry .byte 0xf3,0xc3 L$entry: - pushq %rbx pushq %r12 @@ -530,6 +531,7 @@ L$epilogue: .p2align 4 _RC4_set_key: + leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -598,10 +600,12 @@ L$exit_key: .byte 0xf3,0xc3 + .globl _RC4_options .p2align 4 _RC4_options: + leaq L$opts(%rip),%rax movl _OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -614,6 +618,7 @@ L$8xchar: addq $12,%rax L$done: .byte 0xf3,0xc3 + .p2align 6 L$opts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s index ec096c5ab0cae8..5105d9818b5575 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .p2align 5 __KeccakF1600: + movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -258,6 +259,7 @@ L$oop: + .p2align 5 KeccakF1600: diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s index 02472d0b7d57e5..fb22d41c1a44ed 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s @@ -1421,10 +1421,10 @@ L$oop_shaext: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) - .byte 0xf3,0xc3 + .p2align 4 sha1_block_data_order_ssse3: _ssse3_shortcut: diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s index e43cdd7040f517..3952a775b92182 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .p2align 6 sha256_block_data_order_shaext: _shaext_shortcut: + leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1979,6 +1980,7 @@ L$oop_shaext: .byte 0xf3,0xc3 + .p2align 6 sha256_block_data_order_ssse3: @@ -4238,7 +4240,15 @@ L$oop_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi + leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) + movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ L$oop_avx2: .p2align 4 L$avx2_00_47: leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ L$avx2_00_47: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp + + + pushq 64-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ L$ower_avx2: leaq 448(%rsp),%rsp + + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ L$ower_avx2: jbe L$oop_avx2 leaq (%rsp),%rbp + + + L$done_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s index 51ace9a686804c..6348b0a2c0f8fa 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ L$oop_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi + leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) + vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ L$oop_avx2: .p2align 4 L$avx2_00_47: leaq -128(%rsp),%rsp + + + pushq 128-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ L$avx2_00_47: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp + + + pushq 128-8(%rsp) + + leaq 8(%rsp),%rsp + vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ L$ower_avx2: leaq 1152(%rsp),%rsp + + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ L$ower_avx2: jbe L$oop_avx2 leaq (%rsp),%rbp + + + L$done_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s index 05afede678c954..32a92da69f0b8c 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s @@ -13,6 +13,7 @@ .p2align 4 _OPENSSL_atomic_add: + movl (%rdi),%eax L$spin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -23,16 +24,19 @@ L$spin: leaq (%rsi,%rax,1),%r8 .byte 0xf3,0xc3 + .globl _OPENSSL_rdtsc .p2align 4 _OPENSSL_rdtsc: + rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 + .globl _OPENSSL_ia32_cpuid .p2align 4 @@ -206,6 +210,7 @@ L$done: .p2align 4 _OPENSSL_cleanse: + xorq %rax,%rax cmpq $15,%rsi jae L$ot @@ -237,10 +242,12 @@ L$aligned: .byte 0xf3,0xc3 + .globl _CRYPTO_memcmp .p2align 4 _CRYPTO_memcmp: + xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -270,10 +277,12 @@ L$oop_cmp: L$no_data: .byte 0xf3,0xc3 + .globl _OPENSSL_wipe_cpu .p2align 4 _OPENSSL_wipe_cpu: + pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -301,10 +310,12 @@ _OPENSSL_wipe_cpu: leaq 8(%rsp),%rax .byte 0xf3,0xc3 + .globl _OPENSSL_instrument_bus .p2align 4 _OPENSSL_instrument_bus: + movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -333,10 +344,12 @@ L$oop: rdtsc .byte 0xf3,0xc3 + .globl _OPENSSL_instrument_bus2 .p2align 4 _OPENSSL_instrument_bus2: + movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -380,10 +393,12 @@ L$done2: subq %rcx,%rax .byte 0xf3,0xc3 + .globl _OPENSSL_ia32_rdrand_bytes .p2align 4 _OPENSSL_ia32_rdrand_bytes: + xorq %rax,%rax cmpq $0,%rsi je L$done_rdrand_bytes @@ -421,10 +436,12 @@ L$done_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 + .globl _OPENSSL_ia32_rdseed_bytes .p2align 4 _OPENSSL_ia32_rdseed_bytes: + xorq %rax,%rax cmpq $0,%rsi je L$done_rdseed_bytes diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h index 2a63d7a6ba190f..25a4ebf76afc2f 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi index 95e8dc567ee299..152f3f9fa54295 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi @@ -15,6 +15,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi index be4971efb1cbbf..3871c8129e4600 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi @@ -722,6 +722,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm index 02290abc08f011..12d99f475e421e 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm @@ -54,7 +54,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -110,8 +110,8 @@ our %config = ( sourcedir => ".", target => "darwin64-x86_64-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -232,6 +232,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -350,8 +351,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -619,14 +620,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -702,6 +695,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1491,6 +1492,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3209,7 +3216,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3217,6 +3223,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3715,14 +3722,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4163,6 +4162,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4845,49 +4852,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4909,7 +4908,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4923,613 +4921,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5547,188 +5443,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5758,13 +5623,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5774,43 +5637,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5820,31 +5676,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5862,278 +5713,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6143,301 +5948,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6445,7 +6200,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6453,7 +6207,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6461,7 +6214,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6469,7 +6221,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6477,7 +6228,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6485,163 +6235,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6659,223 +6382,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6883,21 +6569,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6905,13 +6588,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6919,81 +6600,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7001,328 +6669,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7332,85 +6939,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7433,361 +7026,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7809,259 +7342,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8071,31 +7561,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8105,7 +7590,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8131,13 +7615,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8163,7 +7645,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8189,709 +7670,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8942,6 +8305,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9186,7 +8557,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9512,7 +8882,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9558,7 +8927,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9624,7 +8992,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9649,7 +9016,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9747,7 +9113,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9797,18 +9162,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9819,6 +9181,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9882,10 +9248,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9914,6 +9276,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10178,6 +9544,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15068,7 +14435,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15076,6 +14442,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15303,6 +14670,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15405,10 +14780,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15437,6 +14808,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h index a2a8835315fef3..43f321a7ac65d0 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: darwin64-x86_64-cc" -#define DATE "built on: Fri Sep 13 15:58:36 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:38 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h index a69309195ed634..e2d05cdbf49656 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".dylib" diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h index 9079cf7ba8f58a..30e08538dd3653 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h @@ -102,9 +102,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm index 832a223ee3ea9c..1e08556a96b2bc 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-aarch64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3234,7 +3241,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3242,6 +3248,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3740,14 +3747,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4188,6 +4187,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4882,49 +4889,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4938,7 +4937,6 @@ our %unified_info = ( "crypto/aes/aesv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4949,26 +4947,22 @@ our %unified_info = ( "crypto/aes/vpaes-armv8.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/armcap.o" => [ ".", - "crypto/include", "include", ], "crypto/armv4cpuid.o" => @@ -4978,613 +4972,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5598,7 +5490,6 @@ our %unified_info = ( "crypto/bn/armv8-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5608,188 +5499,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5819,13 +5679,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5835,43 +5693,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5881,31 +5732,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5915,7 +5761,6 @@ our %unified_info = ( "crypto/chacha/chacha-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5926,272 +5771,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6201,301 +6001,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,7 +6260,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6519,7 +6267,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6527,7 +6274,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6535,7 +6281,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,163 +6288,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6709,7 +6427,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -6720,229 +6437,191 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6950,21 +6629,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6972,13 +6648,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6986,81 +6660,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7068,328 +6729,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7399,79 +6999,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7490,368 +7077,307 @@ our %unified_info = ( "crypto/modes/ghashv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7861,7 +7387,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7876,259 +7401,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8138,31 +7620,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8172,7 +7649,6 @@ our %unified_info = ( "crypto/sha/keccak1600-armv8.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8182,7 +7658,6 @@ our %unified_info = ( "crypto/sha/sha1-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8201,13 +7676,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8217,7 +7690,6 @@ our %unified_info = ( "crypto/sha/sha256-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8236,7 +7708,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8246,7 +7717,6 @@ our %unified_info = ( "crypto/sha/sha512-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8265,709 +7735,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9018,6 +8370,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9262,7 +8622,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9588,7 +8947,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9634,7 +8992,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9700,7 +9057,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9725,7 +9081,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9823,7 +9178,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9873,18 +9227,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9895,6 +9246,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9958,10 +9313,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9990,6 +9341,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10254,6 +9609,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15199,7 +14555,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15207,6 +14562,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15434,6 +14790,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15536,10 +14900,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15568,6 +14928,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h index 6046c7d5fd9777..ed35c1e5ca7997 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Fri Sep 13 15:58:56 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:53 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S index 9b625b9560132b..7caa5816083f62 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S @@ -3015,7 +3015,7 @@ __ecp_nistz256_div_by_2: .align 5 ecp_nistz256_point_double: .inst 0xd503233f // paciasp - stp x29,x30,[sp,#-80]! + stp x29,x30,[sp,#-96]! add x29,sp,#0 stp x19,x20,[sp,#16] stp x21,x22,[sp,#32] @@ -3148,7 +3148,7 @@ ecp_nistz256_point_double: add sp,x29,#0 // destroy frame ldp x19,x20,[x29,#16] ldp x21,x22,[x29,#32] - ldp x29,x30,[sp],#80 + ldp x29,x30,[sp],#96 .inst 0xd50323bf // autiasp ret .size ecp_nistz256_point_double,.-ecp_nistz256_point_double @@ -3157,12 +3157,13 @@ ecp_nistz256_point_double: .align 5 ecp_nistz256_point_add: .inst 0xd503233f // paciasp - stp x29,x30,[sp,#-80]! + stp x29,x30,[sp,#-96]! add x29,sp,#0 stp x19,x20,[sp,#16] stp x21,x22,[sp,#32] stp x23,x24,[sp,#48] stp x25,x26,[sp,#64] + stp x27,x28,[sp,#80] sub sp,sp,#32*12 ldp x4,x5,[x2,#64] // in2_z @@ -3176,7 +3177,7 @@ ecp_nistz256_point_add: orr x10,x6,x7 orr x25,x8,x10 cmp x25,#0 - csetm x25,ne // !in2infty + csetm x25,ne // ~in2infty add x0,sp,#192 bl __ecp_nistz256_sqr_mont // p256_sqr_mont(Z2sqr, in2_z); @@ -3186,7 +3187,7 @@ ecp_nistz256_point_add: orr x10,x6,x7 orr x24,x8,x10 cmp x24,#0 - csetm x24,ne // !in1infty + csetm x24,ne // ~in1infty add x0,sp,#128 bl __ecp_nistz256_sqr_mont // p256_sqr_mont(Z1sqr, in1_z); @@ -3227,7 +3228,7 @@ ecp_nistz256_point_add: orr x14,x14,x15 // see if result is zero orr x16,x16,x17 - orr x26,x14,x16 + orr x26,x14,x16 // ~is_equal(S1,S2) add x2,sp,#192 add x0,sp,#256 @@ -3248,32 +3249,21 @@ ecp_nistz256_point_add: orr x14,x14,x15 // see if result is zero orr x16,x16,x17 - orr x14,x14,x16 - tst x14,x14 - b.ne .Ladd_proceed // is_equal(U1,U2)? + orr x14,x14,x16 // ~is_equal(U1,U2) - tst x24,x25 - b.eq .Ladd_proceed // (in1infty || in2infty)? + mvn x27,x24 // -1/0 -> 0/-1 + mvn x28,x25 // -1/0 -> 0/-1 + orr x14,x14,x27 + orr x14,x14,x28 + orr x14,x14,x26 + cbnz x14,.Ladd_proceed // if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2)) - tst x26,x26 - b.eq .Ladd_double // is_equal(S1,S2)? - - eor x4,x4,x4 - eor x5,x5,x5 - stp x4,x5,[x21] - stp x4,x5,[x21,#16] - stp x4,x5,[x21,#32] - stp x4,x5,[x21,#48] - stp x4,x5,[x21,#64] - stp x4,x5,[x21,#80] - b .Ladd_done - -.align 4 .Ladd_double: mov x1,x22 mov x0,x21 ldp x23,x24,[x29,#48] ldp x25,x26,[x29,#64] + ldp x27,x28,[x29,#80] add sp,sp,#32*(12-4) // difference in stack frames b .Ldouble_shortcut @@ -3355,14 +3345,14 @@ ecp_nistz256_point_add: ldp x8,x9,[x23] // in2 ldp x10,x11,[x23,#16] ldp x14,x15,[x22,#0] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#0+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+0+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+0+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3373,14 +3363,14 @@ ecp_nistz256_point_add: stp x14,x15,[x21,#0] stp x16,x17,[x21,#0+16] ldp x14,x15,[x22,#32] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#32+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+32+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+32+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3391,13 +3381,13 @@ ecp_nistz256_point_add: stp x14,x15,[x21,#32] stp x16,x17,[x21,#32+16] ldp x14,x15,[x22,#64] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#64+16] csel x8,x4,x8,ne csel x9,x5,x9,ne csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? csel x14,x8,x14,ne csel x15,x9,x15,ne csel x16,x10,x16,ne @@ -3411,7 +3401,8 @@ ecp_nistz256_point_add: ldp x21,x22,[x29,#32] ldp x23,x24,[x29,#48] ldp x25,x26,[x29,#64] - ldp x29,x30,[sp],#80 + ldp x27,x28,[x29,#80] + ldp x29,x30,[sp],#96 .inst 0xd50323bf // autiasp ret .size ecp_nistz256_point_add,.-ecp_nistz256_point_add @@ -3440,7 +3431,7 @@ ecp_nistz256_point_add_affine: orr x10,x6,x7 orr x24,x8,x10 cmp x24,#0 - csetm x24,ne // !in1infty + csetm x24,ne // ~in1infty ldp x14,x15,[x2] // in2_x ldp x16,x17,[x2,#16] @@ -3454,7 +3445,7 @@ ecp_nistz256_point_add_affine: orr x8,x8,x10 orr x25,x14,x8 cmp x25,#0 - csetm x25,ne // !in2infty + csetm x25,ne // ~in2infty add x0,sp,#128 bl __ecp_nistz256_sqr_mont // p256_sqr_mont(Z1sqr, in1_z); @@ -3561,14 +3552,14 @@ ecp_nistz256_point_add_affine: ldp x8,x9,[x23] // in2 ldp x10,x11,[x23,#16] ldp x14,x15,[x22,#0] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#0+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+0+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+0+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3580,14 +3571,14 @@ ecp_nistz256_point_add_affine: stp x16,x17,[x21,#0+16] adr x23,.Lone_mont-64 ldp x14,x15,[x22,#32] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#32+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+32+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+32+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3598,13 +3589,13 @@ ecp_nistz256_point_add_affine: stp x14,x15,[x21,#32] stp x16,x17,[x21,#32+16] ldp x14,x15,[x22,#64] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#64+16] csel x8,x4,x8,ne csel x9,x5,x9,ne csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? csel x14,x8,x14,ne csel x15,x9,x15,ne csel x16,x10,x16,ne diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S index 7dcc98ea95ce66..a8843c87d19265 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S @@ -1,4 +1,4 @@ -// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved. +// Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved. // // Licensed under the OpenSSL license (the "License"). You may not use // this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S index d341c63a289f8b..e86b69f011c955 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S @@ -1,4 +1,4 @@ -// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved. +// Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved. // // Licensed under the OpenSSL license (the "License"). You may not use // this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm index bfc02733dc2706..591ab6875b226b 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-aarch64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3234,7 +3241,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3242,6 +3248,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3740,14 +3747,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4188,6 +4187,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4882,49 +4889,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4938,7 +4937,6 @@ our %unified_info = ( "crypto/aes/aesv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4949,26 +4947,22 @@ our %unified_info = ( "crypto/aes/vpaes-armv8.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/armcap.o" => [ ".", - "crypto/include", "include", ], "crypto/armv4cpuid.o" => @@ -4978,613 +4972,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5598,7 +5490,6 @@ our %unified_info = ( "crypto/bn/armv8-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5608,188 +5499,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5819,13 +5679,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5835,43 +5693,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5881,31 +5732,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5915,7 +5761,6 @@ our %unified_info = ( "crypto/chacha/chacha-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5926,272 +5771,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6201,301 +6001,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,7 +6260,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6519,7 +6267,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6527,7 +6274,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6535,7 +6281,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,163 +6288,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6709,7 +6427,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -6720,229 +6437,191 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6950,21 +6629,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6972,13 +6648,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6986,81 +6660,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7068,328 +6729,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7399,79 +6999,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7490,368 +7077,307 @@ our %unified_info = ( "crypto/modes/ghashv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7861,7 +7387,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7876,259 +7401,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8138,31 +7620,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8172,7 +7649,6 @@ our %unified_info = ( "crypto/sha/keccak1600-armv8.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8182,7 +7658,6 @@ our %unified_info = ( "crypto/sha/sha1-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8201,13 +7676,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8217,7 +7690,6 @@ our %unified_info = ( "crypto/sha/sha256-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8236,7 +7708,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8246,7 +7717,6 @@ our %unified_info = ( "crypto/sha/sha512-armv8.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8265,709 +7735,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9018,6 +8370,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9262,7 +8622,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9588,7 +8947,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9634,7 +8992,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9700,7 +9057,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9725,7 +9081,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9823,7 +9178,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9873,18 +9227,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9895,6 +9246,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9958,10 +9313,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9990,6 +9341,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10254,6 +9609,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15199,7 +14555,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15207,6 +14562,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15434,6 +14790,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15536,10 +14900,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15568,6 +14928,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h index 566cfdfd842a9a..672273eb20e94a 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Fri Sep 13 15:59:02 2019 UTC" +#define DATE "built on: Wed Mar 18 21:05:58 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S index 9b625b9560132b..7caa5816083f62 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S @@ -3015,7 +3015,7 @@ __ecp_nistz256_div_by_2: .align 5 ecp_nistz256_point_double: .inst 0xd503233f // paciasp - stp x29,x30,[sp,#-80]! + stp x29,x30,[sp,#-96]! add x29,sp,#0 stp x19,x20,[sp,#16] stp x21,x22,[sp,#32] @@ -3148,7 +3148,7 @@ ecp_nistz256_point_double: add sp,x29,#0 // destroy frame ldp x19,x20,[x29,#16] ldp x21,x22,[x29,#32] - ldp x29,x30,[sp],#80 + ldp x29,x30,[sp],#96 .inst 0xd50323bf // autiasp ret .size ecp_nistz256_point_double,.-ecp_nistz256_point_double @@ -3157,12 +3157,13 @@ ecp_nistz256_point_double: .align 5 ecp_nistz256_point_add: .inst 0xd503233f // paciasp - stp x29,x30,[sp,#-80]! + stp x29,x30,[sp,#-96]! add x29,sp,#0 stp x19,x20,[sp,#16] stp x21,x22,[sp,#32] stp x23,x24,[sp,#48] stp x25,x26,[sp,#64] + stp x27,x28,[sp,#80] sub sp,sp,#32*12 ldp x4,x5,[x2,#64] // in2_z @@ -3176,7 +3177,7 @@ ecp_nistz256_point_add: orr x10,x6,x7 orr x25,x8,x10 cmp x25,#0 - csetm x25,ne // !in2infty + csetm x25,ne // ~in2infty add x0,sp,#192 bl __ecp_nistz256_sqr_mont // p256_sqr_mont(Z2sqr, in2_z); @@ -3186,7 +3187,7 @@ ecp_nistz256_point_add: orr x10,x6,x7 orr x24,x8,x10 cmp x24,#0 - csetm x24,ne // !in1infty + csetm x24,ne // ~in1infty add x0,sp,#128 bl __ecp_nistz256_sqr_mont // p256_sqr_mont(Z1sqr, in1_z); @@ -3227,7 +3228,7 @@ ecp_nistz256_point_add: orr x14,x14,x15 // see if result is zero orr x16,x16,x17 - orr x26,x14,x16 + orr x26,x14,x16 // ~is_equal(S1,S2) add x2,sp,#192 add x0,sp,#256 @@ -3248,32 +3249,21 @@ ecp_nistz256_point_add: orr x14,x14,x15 // see if result is zero orr x16,x16,x17 - orr x14,x14,x16 - tst x14,x14 - b.ne .Ladd_proceed // is_equal(U1,U2)? + orr x14,x14,x16 // ~is_equal(U1,U2) - tst x24,x25 - b.eq .Ladd_proceed // (in1infty || in2infty)? + mvn x27,x24 // -1/0 -> 0/-1 + mvn x28,x25 // -1/0 -> 0/-1 + orr x14,x14,x27 + orr x14,x14,x28 + orr x14,x14,x26 + cbnz x14,.Ladd_proceed // if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2)) - tst x26,x26 - b.eq .Ladd_double // is_equal(S1,S2)? - - eor x4,x4,x4 - eor x5,x5,x5 - stp x4,x5,[x21] - stp x4,x5,[x21,#16] - stp x4,x5,[x21,#32] - stp x4,x5,[x21,#48] - stp x4,x5,[x21,#64] - stp x4,x5,[x21,#80] - b .Ladd_done - -.align 4 .Ladd_double: mov x1,x22 mov x0,x21 ldp x23,x24,[x29,#48] ldp x25,x26,[x29,#64] + ldp x27,x28,[x29,#80] add sp,sp,#32*(12-4) // difference in stack frames b .Ldouble_shortcut @@ -3355,14 +3345,14 @@ ecp_nistz256_point_add: ldp x8,x9,[x23] // in2 ldp x10,x11,[x23,#16] ldp x14,x15,[x22,#0] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#0+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+0+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+0+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3373,14 +3363,14 @@ ecp_nistz256_point_add: stp x14,x15,[x21,#0] stp x16,x17,[x21,#0+16] ldp x14,x15,[x22,#32] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#32+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+32+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+32+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3391,13 +3381,13 @@ ecp_nistz256_point_add: stp x14,x15,[x21,#32] stp x16,x17,[x21,#32+16] ldp x14,x15,[x22,#64] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#64+16] csel x8,x4,x8,ne csel x9,x5,x9,ne csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? csel x14,x8,x14,ne csel x15,x9,x15,ne csel x16,x10,x16,ne @@ -3411,7 +3401,8 @@ ecp_nistz256_point_add: ldp x21,x22,[x29,#32] ldp x23,x24,[x29,#48] ldp x25,x26,[x29,#64] - ldp x29,x30,[sp],#80 + ldp x27,x28,[x29,#80] + ldp x29,x30,[sp],#96 .inst 0xd50323bf // autiasp ret .size ecp_nistz256_point_add,.-ecp_nistz256_point_add @@ -3440,7 +3431,7 @@ ecp_nistz256_point_add_affine: orr x10,x6,x7 orr x24,x8,x10 cmp x24,#0 - csetm x24,ne // !in1infty + csetm x24,ne // ~in1infty ldp x14,x15,[x2] // in2_x ldp x16,x17,[x2,#16] @@ -3454,7 +3445,7 @@ ecp_nistz256_point_add_affine: orr x8,x8,x10 orr x25,x14,x8 cmp x25,#0 - csetm x25,ne // !in2infty + csetm x25,ne // ~in2infty add x0,sp,#128 bl __ecp_nistz256_sqr_mont // p256_sqr_mont(Z1sqr, in1_z); @@ -3561,14 +3552,14 @@ ecp_nistz256_point_add_affine: ldp x8,x9,[x23] // in2 ldp x10,x11,[x23,#16] ldp x14,x15,[x22,#0] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#0+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+0+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+0+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3580,14 +3571,14 @@ ecp_nistz256_point_add_affine: stp x16,x17,[x21,#0+16] adr x23,.Lone_mont-64 ldp x14,x15,[x22,#32] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#32+16] csel x8,x4,x8,ne csel x9,x5,x9,ne ldp x4,x5,[sp,#0+32+32] // res csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? ldp x6,x7,[sp,#0+32+48] csel x14,x8,x14,ne csel x15,x9,x15,ne @@ -3598,13 +3589,13 @@ ecp_nistz256_point_add_affine: stp x14,x15,[x21,#32] stp x16,x17,[x21,#32+16] ldp x14,x15,[x22,#64] // in1 - cmp x24,#0 // !, remember? + cmp x24,#0 // ~, remember? ldp x16,x17,[x22,#64+16] csel x8,x4,x8,ne csel x9,x5,x9,ne csel x10,x6,x10,ne csel x11,x7,x11,ne - cmp x25,#0 // !, remember? + cmp x25,#0 // ~, remember? csel x14,x8,x14,ne csel x15,x9,x15,ne csel x16,x10,x16,ne diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S index 7dcc98ea95ce66..a8843c87d19265 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S @@ -1,4 +1,4 @@ -// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved. +// Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved. // // Licensed under the OpenSSL license (the "License"). You may not use // this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S index d341c63a289f8b..e86b69f011c955 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S @@ -1,4 +1,4 @@ -// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved. +// Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved. // // Licensed under the OpenSSL license (the "License"). You may not use // this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm index 320833b90223fa..a36f3889d4751f 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-aarch64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -237,6 +237,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -355,8 +356,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -624,14 +625,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -707,6 +700,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1504,6 +1505,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3222,7 +3229,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3230,6 +3236,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3728,14 +3735,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4176,6 +4175,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4870,49 +4877,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4934,7 +4933,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4948,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5572,188 +5468,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5783,13 +5648,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5799,43 +5662,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5845,31 +5701,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5887,278 +5738,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6168,301 +5973,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6470,7 +6225,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6232,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6239,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6246,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,163 +6260,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6684,223 +6407,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6908,21 +6594,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6930,13 +6613,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6944,81 +6625,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7026,328 +6694,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7357,85 +6964,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7458,361 +7051,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7834,259 +7367,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8096,31 +7586,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8130,7 +7615,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8156,13 +7640,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8188,7 +7670,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8214,709 +7695,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8967,6 +8330,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9211,7 +8582,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9537,7 +8907,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9583,7 +8952,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9649,7 +9017,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9674,7 +9041,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9772,7 +9138,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9822,18 +9187,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9844,6 +9206,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9907,10 +9273,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9939,6 +9301,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10203,6 +9569,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15093,7 +14460,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15101,6 +14467,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15328,6 +14695,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15430,10 +14805,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15462,6 +14833,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h index ed237c3102f71e..4f6ff84c2810f2 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-aarch64" -#define DATE "built on: Fri Sep 13 15:59:08 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:04 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h index 212e3f67d8e568..781ef739dc2274 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm index c62115205baa7e..42746324ce6230 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-armv4", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3236,7 +3243,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3244,6 +3250,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3742,14 +3749,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4190,6 +4189,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4868,7 +4875,6 @@ our %unified_info = ( "crypto/aes/aes-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4887,43 +4893,36 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4937,21 +4936,18 @@ our %unified_info = ( "crypto/aes/aesv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/aes/bsaes-armv7.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4961,639 +4957,533 @@ our %unified_info = ( "crypto/armcap.o" => [ ".", - "crypto/include", "include", ], "crypto/armv4cpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/armv4-mont.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5604,188 +5494,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5815,13 +5674,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5831,43 +5688,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5877,37 +5727,31 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5922,272 +5766,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6197,301 +5996,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6248,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,7 +6255,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6515,7 +6262,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6523,7 +6269,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6531,7 +6276,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6539,169 +6283,141 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -6716,229 +6432,191 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6946,21 +6624,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6968,13 +6643,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6982,81 +6655,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7064,328 +6724,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7395,86 +6994,72 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/modes/ghash-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7489,374 +7074,312 @@ our %unified_info = ( "crypto/modes/ghashv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7875,259 +7398,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8137,44 +7617,37 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/sha/sha1-armv4-large.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8197,19 +7670,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8232,13 +7702,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8261,709 +7729,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9014,6 +8364,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9258,7 +8616,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9584,7 +8941,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9630,7 +8986,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9696,7 +9051,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9721,7 +9075,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9819,7 +9172,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9869,18 +9221,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9891,6 +9240,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9954,10 +9307,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9986,6 +9335,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10250,6 +9603,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15205,7 +14559,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15213,6 +14566,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15440,6 +14794,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15542,10 +14904,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15574,6 +14932,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S index 4746b714cad247..839663c84155b0 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S index e05feb2ceeac32..ef3992c9aa7069 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S @@ -1,4 +1,4 @@ -@ Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h index ef86bdcf892a82..69027a7fb80eb8 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Fri Sep 13 15:59:11 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:07 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S index d96f1c339901cf..63f850e6b90da6 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S @@ -3757,7 +3757,7 @@ ecp_nistz256_point_add: #endif movne r12,#-1 stmia r3,{r4,r5,r6,r7,r8,r9,r10,r11} - str r12,[sp,#32*18+8] @ !in2infty + str r12,[sp,#32*18+8] @ ~in2infty ldmia r1!,{r4,r5,r6,r7,r8,r9,r10,r11} @ copy in1_x add r3,sp,#96 @@ -3778,7 +3778,7 @@ ecp_nistz256_point_add: #endif movne r12,#-1 stmia r3,{r4,r5,r6,r7,r8,r9,r10,r11} - str r12,[sp,#32*18+4] @ !in1infty + str r12,[sp,#32*18+4] @ ~in1infty add r1,sp,#256 add r2,sp,#256 @@ -3843,33 +3843,20 @@ ecp_nistz256_point_add: orr r11,r11,r4 orr r6,r6,r8 orr r11,r11,r9 - orrs r11,r11,r6 + orr r11,r11,r6 @ ~is_equal(U1,U2) - bne .Ladd_proceed @ is_equal(U1,U2)? + ldr r10,[sp,#32*18+4] @ ~in1infty + ldr r12,[sp,#32*18+8] @ ~in2infty + ldr r14,[sp,#32*18+12] @ ~is_equal(S1,S2) + mvn r10,r10 @ -1/0 -> 0/-1 + mvn r12,r12 @ -1/0 -> 0/-1 + orr r11,r10 + orr r11,r12 + orrs r11,r14 @ set flags - ldr r10,[sp,#32*18+4] - ldr r12,[sp,#32*18+8] - ldr r14,[sp,#32*18+12] - tst r10,r12 - beq .Ladd_proceed @ (in1infty || in2infty)? - tst r14,r14 - beq .Ladd_double @ is_equal(S1,S2)? + @ if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2)) + bne .Ladd_proceed - ldr r0,[sp,#32*18+16] - eor r4,r4,r4 - eor r5,r5,r5 - eor r6,r6,r6 - eor r7,r7,r7 - eor r8,r8,r8 - eor r9,r9,r9 - eor r10,r10,r10 - eor r11,r11,r11 - stmia r0!,{r4,r5,r6,r7,r8,r9,r10,r11} - stmia r0!,{r4,r5,r6,r7,r8,r9,r10,r11} - stmia r0!,{r4,r5,r6,r7,r8,r9,r10,r11} - b .Ladd_done - -.align 4 .Ladd_double: ldr r1,[sp,#32*18+20] add sp,sp,#32*(18-5)+16 @ difference in frame sizes @@ -3934,24 +3921,24 @@ ecp_nistz256_point_add: add r2,sp,#544 bl __ecp_nistz256_sub_from @ p256_sub(res_y, res_y, S2); - ldr r11,[sp,#32*18+4] @ !in1intfy - ldr r12,[sp,#32*18+8] @ !in2intfy + ldr r11,[sp,#32*18+4] @ ~in1infty + ldr r12,[sp,#32*18+8] @ ~in2infty add r1,sp,#0 add r2,sp,#192 - and r10,r11,r12 + and r10,r11,r12 @ ~in1infty & ~in2infty mvn r11,r11 add r3,sp,#96 - and r11,r11,r12 - mvn r12,r12 + and r11,r11,r12 @ in1infty & ~in2infty + mvn r12,r12 @ in2infty ldr r0,[sp,#32*18+16] ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -3961,11 +3948,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -3975,11 +3962,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -3989,11 +3976,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4003,11 +3990,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4017,11 +4004,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4031,11 +4018,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4045,11 +4032,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4059,11 +4046,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4073,11 +4060,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4087,11 +4074,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4101,11 +4088,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4147,7 +4134,7 @@ ecp_nistz256_point_add_affine: #endif movne r12,#-1 stmia r3,{r4,r5,r6,r7,r8,r9,r10,r11} - str r12,[sp,#32*15+4] @ !in1infty + str r12,[sp,#32*15+4] @ ~in1infty ldmia r2!,{r4,r5,r6,r7,r8,r9,r10,r11} @ copy in2_x add r3,sp,#192 @@ -4174,7 +4161,7 @@ ecp_nistz256_point_add_affine: it ne #endif movne r12,#-1 - str r12,[sp,#32*15+8] @ !in2infty + str r12,[sp,#32*15+8] @ ~in2infty add r1,sp,#160 add r2,sp,#160 @@ -4256,24 +4243,24 @@ ecp_nistz256_point_add_affine: add r2,sp,#288 bl __ecp_nistz256_sub_from @ p256_sub(res_y, res_y, S2); - ldr r11,[sp,#32*15+4] @ !in1intfy - ldr r12,[sp,#32*15+8] @ !in2intfy + ldr r11,[sp,#32*15+4] @ ~in1infty + ldr r12,[sp,#32*15+8] @ ~in2infty add r1,sp,#0 add r2,sp,#192 - and r10,r11,r12 + and r10,r11,r12 @ ~in1infty & ~in2infty mvn r11,r11 add r3,sp,#96 - and r11,r11,r12 - mvn r12,r12 + and r11,r11,r12 @ in1infty & ~in2infty + mvn r12,r12 @ in2infty ldr r0,[sp,#32*15] ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4283,11 +4270,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4297,11 +4284,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4311,11 +4298,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4325,11 +4312,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4339,11 +4326,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4353,11 +4340,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4367,11 +4354,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S index 3efcde6b6eb058..12c44793dea259 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S index 1e2fbf635016f9..7c28e37a6f6498 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h index 1a2b31bdc7008c..71c4fecc40cc4e 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm index 41e52a0bd5590d..ad3c832efe9312 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-armv4", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3236,7 +3243,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3244,6 +3250,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3742,14 +3749,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4190,6 +4189,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4868,7 +4875,6 @@ our %unified_info = ( "crypto/aes/aes-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4887,43 +4893,36 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4937,21 +4936,18 @@ our %unified_info = ( "crypto/aes/aesv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/aes/bsaes-armv7.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4961,639 +4957,533 @@ our %unified_info = ( "crypto/armcap.o" => [ ".", - "crypto/include", "include", ], "crypto/armv4cpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/armv4-mont.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5604,188 +5494,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5815,13 +5674,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5831,43 +5688,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5877,37 +5727,31 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5922,272 +5766,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6197,301 +5996,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6248,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,7 +6255,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6515,7 +6262,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6523,7 +6269,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6531,7 +6276,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6539,169 +6283,141 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -6716,229 +6432,191 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6946,21 +6624,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6968,13 +6643,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6982,81 +6655,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7064,328 +6724,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7395,86 +6994,72 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/modes/ghash-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7489,374 +7074,312 @@ our %unified_info = ( "crypto/modes/ghashv8-armx.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7875,259 +7398,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8137,44 +7617,37 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/sha/sha1-armv4-large.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8197,19 +7670,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8232,13 +7702,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8261,709 +7729,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9014,6 +8364,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9258,7 +8616,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9584,7 +8941,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9630,7 +8986,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9696,7 +9051,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9721,7 +9075,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9819,7 +9172,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9869,18 +9221,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9891,6 +9240,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9954,10 +9307,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9986,6 +9335,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10250,6 +9603,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15205,7 +14559,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15213,6 +14566,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15440,6 +14794,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15542,10 +14904,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15574,6 +14932,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S index 4746b714cad247..839663c84155b0 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S index e05feb2ceeac32..ef3992c9aa7069 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S @@ -1,4 +1,4 @@ -@ Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h index 3b9d482a1ab1ba..d1b23647596725 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Fri Sep 13 15:59:17 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:14 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S index d96f1c339901cf..63f850e6b90da6 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S @@ -3757,7 +3757,7 @@ ecp_nistz256_point_add: #endif movne r12,#-1 stmia r3,{r4,r5,r6,r7,r8,r9,r10,r11} - str r12,[sp,#32*18+8] @ !in2infty + str r12,[sp,#32*18+8] @ ~in2infty ldmia r1!,{r4,r5,r6,r7,r8,r9,r10,r11} @ copy in1_x add r3,sp,#96 @@ -3778,7 +3778,7 @@ ecp_nistz256_point_add: #endif movne r12,#-1 stmia r3,{r4,r5,r6,r7,r8,r9,r10,r11} - str r12,[sp,#32*18+4] @ !in1infty + str r12,[sp,#32*18+4] @ ~in1infty add r1,sp,#256 add r2,sp,#256 @@ -3843,33 +3843,20 @@ ecp_nistz256_point_add: orr r11,r11,r4 orr r6,r6,r8 orr r11,r11,r9 - orrs r11,r11,r6 + orr r11,r11,r6 @ ~is_equal(U1,U2) - bne .Ladd_proceed @ is_equal(U1,U2)? + ldr r10,[sp,#32*18+4] @ ~in1infty + ldr r12,[sp,#32*18+8] @ ~in2infty + ldr r14,[sp,#32*18+12] @ ~is_equal(S1,S2) + mvn r10,r10 @ -1/0 -> 0/-1 + mvn r12,r12 @ -1/0 -> 0/-1 + orr r11,r10 + orr r11,r12 + orrs r11,r14 @ set flags - ldr r10,[sp,#32*18+4] - ldr r12,[sp,#32*18+8] - ldr r14,[sp,#32*18+12] - tst r10,r12 - beq .Ladd_proceed @ (in1infty || in2infty)? - tst r14,r14 - beq .Ladd_double @ is_equal(S1,S2)? + @ if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2)) + bne .Ladd_proceed - ldr r0,[sp,#32*18+16] - eor r4,r4,r4 - eor r5,r5,r5 - eor r6,r6,r6 - eor r7,r7,r7 - eor r8,r8,r8 - eor r9,r9,r9 - eor r10,r10,r10 - eor r11,r11,r11 - stmia r0!,{r4,r5,r6,r7,r8,r9,r10,r11} - stmia r0!,{r4,r5,r6,r7,r8,r9,r10,r11} - stmia r0!,{r4,r5,r6,r7,r8,r9,r10,r11} - b .Ladd_done - -.align 4 .Ladd_double: ldr r1,[sp,#32*18+20] add sp,sp,#32*(18-5)+16 @ difference in frame sizes @@ -3934,24 +3921,24 @@ ecp_nistz256_point_add: add r2,sp,#544 bl __ecp_nistz256_sub_from @ p256_sub(res_y, res_y, S2); - ldr r11,[sp,#32*18+4] @ !in1intfy - ldr r12,[sp,#32*18+8] @ !in2intfy + ldr r11,[sp,#32*18+4] @ ~in1infty + ldr r12,[sp,#32*18+8] @ ~in2infty add r1,sp,#0 add r2,sp,#192 - and r10,r11,r12 + and r10,r11,r12 @ ~in1infty & ~in2infty mvn r11,r11 add r3,sp,#96 - and r11,r11,r12 - mvn r12,r12 + and r11,r11,r12 @ in1infty & ~in2infty + mvn r12,r12 @ in2infty ldr r0,[sp,#32*18+16] ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -3961,11 +3948,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -3975,11 +3962,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -3989,11 +3976,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4003,11 +3990,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4017,11 +4004,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4031,11 +4018,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4045,11 +4032,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4059,11 +4046,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4073,11 +4060,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4087,11 +4074,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4101,11 +4088,11 @@ ecp_nistz256_point_add: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4147,7 +4134,7 @@ ecp_nistz256_point_add_affine: #endif movne r12,#-1 stmia r3,{r4,r5,r6,r7,r8,r9,r10,r11} - str r12,[sp,#32*15+4] @ !in1infty + str r12,[sp,#32*15+4] @ ~in1infty ldmia r2!,{r4,r5,r6,r7,r8,r9,r10,r11} @ copy in2_x add r3,sp,#192 @@ -4174,7 +4161,7 @@ ecp_nistz256_point_add_affine: it ne #endif movne r12,#-1 - str r12,[sp,#32*15+8] @ !in2infty + str r12,[sp,#32*15+8] @ ~in2infty add r1,sp,#160 add r2,sp,#160 @@ -4256,24 +4243,24 @@ ecp_nistz256_point_add_affine: add r2,sp,#288 bl __ecp_nistz256_sub_from @ p256_sub(res_y, res_y, S2); - ldr r11,[sp,#32*15+4] @ !in1intfy - ldr r12,[sp,#32*15+8] @ !in2intfy + ldr r11,[sp,#32*15+4] @ ~in1infty + ldr r12,[sp,#32*15+8] @ ~in2infty add r1,sp,#0 add r2,sp,#192 - and r10,r11,r12 + and r10,r11,r12 @ ~in1infty & ~in2infty mvn r11,r11 add r3,sp,#96 - and r11,r11,r12 - mvn r12,r12 + and r11,r11,r12 @ in1infty & ~in2infty + mvn r12,r12 @ in2infty ldr r0,[sp,#32*15] ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4283,11 +4270,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4297,11 +4284,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4311,11 +4298,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4325,11 +4312,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4339,11 +4326,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4353,11 +4340,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 @@ -4367,11 +4354,11 @@ ecp_nistz256_point_add_affine: ldmia r1!,{r4,r5} @ res_x ldmia r2!,{r6,r7} @ in2_x ldmia r3!,{r8,r9} @ in1_x - and r4,r4,r10 + and r4,r4,r10 @ ~in1infty & ~in2infty and r5,r5,r10 - and r6,r6,r11 + and r6,r6,r11 @ in1infty & ~in2infty and r7,r7,r11 - and r8,r8,r12 + and r8,r8,r12 @ in2infty and r9,r9,r12 orr r4,r4,r6 orr r5,r5,r7 diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S index 3efcde6b6eb058..12c44793dea259 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S index 1e2fbf635016f9..7c28e37a6f6498 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S @@ -1,4 +1,4 @@ -@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved. +@ Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved. @ @ Licensed under the OpenSSL license (the "License"). You may not use @ this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h index 1a2b31bdc7008c..71c4fecc40cc4e 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm index 9603f342e70290..c1fb4d9a7e6d75 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-armv4", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -237,6 +237,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -355,8 +356,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -624,14 +625,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -707,6 +700,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1504,6 +1505,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3222,7 +3229,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3230,6 +3236,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3728,14 +3735,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4176,6 +4175,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4870,49 +4877,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4934,7 +4933,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4948,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5572,188 +5468,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5783,13 +5648,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5799,43 +5662,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5845,31 +5701,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5887,278 +5738,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6168,301 +5973,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6470,7 +6225,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6232,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6239,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6246,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,163 +6260,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6684,223 +6407,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6908,21 +6594,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6930,13 +6613,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6944,81 +6625,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7026,328 +6694,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7357,85 +6964,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7458,361 +7051,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7834,259 +7367,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8096,31 +7586,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8130,7 +7615,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8156,13 +7640,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8188,7 +7670,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8214,709 +7695,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8967,6 +8330,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9211,7 +8582,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9537,7 +8907,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9583,7 +8952,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9649,7 +9017,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9674,7 +9041,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9772,7 +9138,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9822,18 +9187,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9844,6 +9206,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9907,10 +9273,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9939,6 +9301,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10203,6 +9569,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15093,7 +14460,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15101,6 +14467,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15328,6 +14695,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15430,10 +14805,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15462,6 +14833,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h index 7cf872d12e9d2a..b5e738fe28df89 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-armv4" -#define DATE "built on: Fri Sep 13 15:59:23 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:19 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h index 6419ec21a2675f..4cbafb777f2ce3 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm index 2e07e0f655cb5d..8a4cc46d2bc848 100644 --- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm @@ -49,14 +49,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -112,8 +112,8 @@ our %config = ( sourcedir => ".", target => "linux-elf", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3237,7 +3244,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3245,6 +3251,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3743,14 +3750,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4191,6 +4190,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4885,49 +4892,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4937,7 +4936,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4955,13 +4953,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4975,613 +4971,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5595,7 +5489,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5605,188 +5498,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5816,25 +5678,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5844,31 +5702,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5878,31 +5731,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5920,284 +5768,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6207,295 +6008,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6255,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,7 +6262,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6519,7 +6269,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6527,7 +6276,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6535,7 +6283,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,163 +6290,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6717,235 +6437,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6953,21 +6634,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6975,13 +6653,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6989,81 +6665,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7071,334 +6734,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7408,79 +7009,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7499,7 +7087,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7509,361 +7096,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7885,265 +7412,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8153,31 +7636,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8187,13 +7665,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8219,19 +7695,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8257,13 +7730,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8289,727 +7760,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9060,6 +8410,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9304,7 +8662,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9630,7 +8987,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9676,7 +9032,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9742,7 +9097,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9767,7 +9121,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9865,7 +9218,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9915,18 +9267,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9937,6 +9286,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10000,10 +9353,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10032,6 +9381,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10296,6 +9649,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15251,7 +14605,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15259,6 +14612,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15486,6 +14840,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15588,10 +14950,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15620,6 +14978,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.s b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.s deleted file mode 100644 index 53cd2909ac69bb..00000000000000 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.s +++ /dev/null @@ -1,3243 +0,0 @@ -.text -.type _x86_AES_encrypt_compact,@function -.align 16 -_x86_AES_encrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 16 -.L000loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ecx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ecx,%edi - xorl %esi,%ecx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ecx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%ecx - andl %edx,%ebp - leal (%edx,%edx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %edx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %edx,%edi - xorl %esi,%edx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%edx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%edx - andl %eax,%ebp - leal (%eax,%eax,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %eax,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %eax,%edi - xorl %esi,%eax - rorl $24,%edi - xorl %ebp,%esi - roll $24,%eax - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%eax - andl %ebx,%ebp - leal (%ebx,%ebx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ebx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ebx,%edi - xorl %esi,%ebx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ebx - xorl %edi,%esi - xorl %esi,%ebx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L000loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.size _x86_AES_encrypt_compact,.-_x86_AES_encrypt_compact -.type _sse_AES_encrypt_compact,@function -.align 16 -_sse_AES_encrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 16 -.L001loop: - pshufw $8,%mm0,%mm1 - pshufw $13,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $13,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $8,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $8,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - movd %mm2,%eax - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - movd %mm6,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $8,%esi - shrl $16,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shrl $16,%eax - movd %ecx,%mm1 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - andl $255,%eax - orl %esi,%ecx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - andl $255,%ebx - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%ecx - shll $16,%eax - movzbl -128(%ebp,%edi,1),%esi - orl %eax,%edx - shll $8,%esi - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - orl %ebx,%edx - movl 20(%esp),%edi - movd %ecx,%mm4 - movd %edx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja .L002out - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - movq %mm0,%mm1 - movq %mm4,%mm5 - pcmpgtb %mm0,%mm3 - pcmpgtb %mm4,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - pshufw $177,%mm0,%mm2 - pshufw $177,%mm4,%mm6 - paddb %mm0,%mm0 - paddb %mm4,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pshufw $177,%mm2,%mm3 - pshufw $177,%mm6,%mm7 - pxor %mm0,%mm1 - pxor %mm4,%mm5 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm3,%mm2 - movq %mm7,%mm6 - pslld $8,%mm3 - pslld $8,%mm7 - psrld $24,%mm2 - psrld $24,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - psrld $8,%mm1 - psrld $8,%mm5 - movl -128(%ebp),%eax - pslld $24,%mm3 - pslld $24,%mm7 - movl -64(%ebp),%ebx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl (%ebp),%ecx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl 64(%ebp),%edx - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp .L001loop -.align 16 -.L002out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.size _sse_AES_encrypt_compact,.-_sse_AES_encrypt_compact -.type _x86_AES_encrypt,@function -.align 16 -_x86_AES_encrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 16 -.L003loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl (%ebp,%esi,8),%esi - movzbl %ch,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movzbl %bh,%edi - xorl 1(%ebp,%edi,8),%esi - - movl 20(%esp),%edi - movl (%ebp,%edx,8),%edx - movzbl %ah,%eax - xorl 3(%ebp,%eax,8),%edx - movl 4(%esp),%eax - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - xorl 1(%ebp,%ecx,8),%edx - movl %esi,%ecx - - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L003loop - movl %eax,%esi - andl $255,%esi - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %bh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %ch,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %dh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movzbl %bh,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movl 2(%ebp,%edx,8),%edx - andl $255,%edx - movzbl %ah,%eax - movl (%ebp,%eax,8),%eax - andl $65280,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movl (%ebp,%ebx,8),%ebx - andl $16711680,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movl 2(%ebp,%ecx,8),%ecx - andl $4278190080,%ecx - xorl %ecx,%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 64 -.LAES_Te: -.long 2774754246,2774754246 -.long 2222750968,2222750968 -.long 2574743534,2574743534 -.long 2373680118,2373680118 -.long 234025727,234025727 -.long 3177933782,3177933782 -.long 2976870366,2976870366 -.long 1422247313,1422247313 -.long 1345335392,1345335392 -.long 50397442,50397442 -.long 2842126286,2842126286 -.long 2099981142,2099981142 -.long 436141799,436141799 -.long 1658312629,1658312629 -.long 3870010189,3870010189 -.long 2591454956,2591454956 -.long 1170918031,1170918031 -.long 2642575903,2642575903 -.long 1086966153,1086966153 -.long 2273148410,2273148410 -.long 368769775,368769775 -.long 3948501426,3948501426 -.long 3376891790,3376891790 -.long 200339707,200339707 -.long 3970805057,3970805057 -.long 1742001331,1742001331 -.long 4255294047,4255294047 -.long 3937382213,3937382213 -.long 3214711843,3214711843 -.long 4154762323,4154762323 -.long 2524082916,2524082916 -.long 1539358875,1539358875 -.long 3266819957,3266819957 -.long 486407649,486407649 -.long 2928907069,2928907069 -.long 1780885068,1780885068 -.long 1513502316,1513502316 -.long 1094664062,1094664062 -.long 49805301,49805301 -.long 1338821763,1338821763 -.long 1546925160,1546925160 -.long 4104496465,4104496465 -.long 887481809,887481809 -.long 150073849,150073849 -.long 2473685474,2473685474 -.long 1943591083,1943591083 -.long 1395732834,1395732834 -.long 1058346282,1058346282 -.long 201589768,201589768 -.long 1388824469,1388824469 -.long 1696801606,1696801606 -.long 1589887901,1589887901 -.long 672667696,672667696 -.long 2711000631,2711000631 -.long 251987210,251987210 -.long 3046808111,3046808111 -.long 151455502,151455502 -.long 907153956,907153956 -.long 2608889883,2608889883 -.long 1038279391,1038279391 -.long 652995533,652995533 -.long 1764173646,1764173646 -.long 3451040383,3451040383 -.long 2675275242,2675275242 -.long 453576978,453576978 -.long 2659418909,2659418909 -.long 1949051992,1949051992 -.long 773462580,773462580 -.long 756751158,756751158 -.long 2993581788,2993581788 -.long 3998898868,3998898868 -.long 4221608027,4221608027 -.long 4132590244,4132590244 -.long 1295727478,1295727478 -.long 1641469623,1641469623 -.long 3467883389,3467883389 -.long 2066295122,2066295122 -.long 1055122397,1055122397 -.long 1898917726,1898917726 -.long 2542044179,2542044179 -.long 4115878822,4115878822 -.long 1758581177,1758581177 -.long 0,0 -.long 753790401,753790401 -.long 1612718144,1612718144 -.long 536673507,536673507 -.long 3367088505,3367088505 -.long 3982187446,3982187446 -.long 3194645204,3194645204 -.long 1187761037,1187761037 -.long 3653156455,3653156455 -.long 1262041458,1262041458 -.long 3729410708,3729410708 -.long 3561770136,3561770136 -.long 3898103984,3898103984 -.long 1255133061,1255133061 -.long 1808847035,1808847035 -.long 720367557,720367557 -.long 3853167183,3853167183 -.long 385612781,385612781 -.long 3309519750,3309519750 -.long 3612167578,3612167578 -.long 1429418854,1429418854 -.long 2491778321,2491778321 -.long 3477423498,3477423498 -.long 284817897,284817897 -.long 100794884,100794884 -.long 2172616702,2172616702 -.long 4031795360,4031795360 -.long 1144798328,1144798328 -.long 3131023141,3131023141 -.long 3819481163,3819481163 -.long 4082192802,4082192802 -.long 4272137053,4272137053 -.long 3225436288,3225436288 -.long 2324664069,2324664069 -.long 2912064063,2912064063 -.long 3164445985,3164445985 -.long 1211644016,1211644016 -.long 83228145,83228145 -.long 3753688163,3753688163 -.long 3249976951,3249976951 -.long 1977277103,1977277103 -.long 1663115586,1663115586 -.long 806359072,806359072 -.long 452984805,452984805 -.long 250868733,250868733 -.long 1842533055,1842533055 -.long 1288555905,1288555905 -.long 336333848,336333848 -.long 890442534,890442534 -.long 804056259,804056259 -.long 3781124030,3781124030 -.long 2727843637,2727843637 -.long 3427026056,3427026056 -.long 957814574,957814574 -.long 1472513171,1472513171 -.long 4071073621,4071073621 -.long 2189328124,2189328124 -.long 1195195770,1195195770 -.long 2892260552,2892260552 -.long 3881655738,3881655738 -.long 723065138,723065138 -.long 2507371494,2507371494 -.long 2690670784,2690670784 -.long 2558624025,2558624025 -.long 3511635870,3511635870 -.long 2145180835,2145180835 -.long 1713513028,1713513028 -.long 2116692564,2116692564 -.long 2878378043,2878378043 -.long 2206763019,2206763019 -.long 3393603212,3393603212 -.long 703524551,703524551 -.long 3552098411,3552098411 -.long 1007948840,1007948840 -.long 2044649127,2044649127 -.long 3797835452,3797835452 -.long 487262998,487262998 -.long 1994120109,1994120109 -.long 1004593371,1004593371 -.long 1446130276,1446130276 -.long 1312438900,1312438900 -.long 503974420,503974420 -.long 3679013266,3679013266 -.long 168166924,168166924 -.long 1814307912,1814307912 -.long 3831258296,3831258296 -.long 1573044895,1573044895 -.long 1859376061,1859376061 -.long 4021070915,4021070915 -.long 2791465668,2791465668 -.long 2828112185,2828112185 -.long 2761266481,2761266481 -.long 937747667,937747667 -.long 2339994098,2339994098 -.long 854058965,854058965 -.long 1137232011,1137232011 -.long 1496790894,1496790894 -.long 3077402074,3077402074 -.long 2358086913,2358086913 -.long 1691735473,1691735473 -.long 3528347292,3528347292 -.long 3769215305,3769215305 -.long 3027004632,3027004632 -.long 4199962284,4199962284 -.long 133494003,133494003 -.long 636152527,636152527 -.long 2942657994,2942657994 -.long 2390391540,2390391540 -.long 3920539207,3920539207 -.long 403179536,403179536 -.long 3585784431,3585784431 -.long 2289596656,2289596656 -.long 1864705354,1864705354 -.long 1915629148,1915629148 -.long 605822008,605822008 -.long 4054230615,4054230615 -.long 3350508659,3350508659 -.long 1371981463,1371981463 -.long 602466507,602466507 -.long 2094914977,2094914977 -.long 2624877800,2624877800 -.long 555687742,555687742 -.long 3712699286,3712699286 -.long 3703422305,3703422305 -.long 2257292045,2257292045 -.long 2240449039,2240449039 -.long 2423288032,2423288032 -.long 1111375484,1111375484 -.long 3300242801,3300242801 -.long 2858837708,2858837708 -.long 3628615824,3628615824 -.long 84083462,84083462 -.long 32962295,32962295 -.long 302911004,302911004 -.long 2741068226,2741068226 -.long 1597322602,1597322602 -.long 4183250862,4183250862 -.long 3501832553,3501832553 -.long 2441512471,2441512471 -.long 1489093017,1489093017 -.long 656219450,656219450 -.long 3114180135,3114180135 -.long 954327513,954327513 -.long 335083755,335083755 -.long 3013122091,3013122091 -.long 856756514,856756514 -.long 3144247762,3144247762 -.long 1893325225,1893325225 -.long 2307821063,2307821063 -.long 2811532339,2811532339 -.long 3063651117,3063651117 -.long 572399164,572399164 -.long 2458355477,2458355477 -.long 552200649,552200649 -.long 1238290055,1238290055 -.long 4283782570,4283782570 -.long 2015897680,2015897680 -.long 2061492133,2061492133 -.long 2408352771,2408352771 -.long 4171342169,4171342169 -.long 2156497161,2156497161 -.long 386731290,386731290 -.long 3669999461,3669999461 -.long 837215959,837215959 -.long 3326231172,3326231172 -.long 3093850320,3093850320 -.long 3275833730,3275833730 -.long 2962856233,2962856233 -.long 1999449434,1999449434 -.long 286199582,286199582 -.long 3417354363,3417354363 -.long 4233385128,4233385128 -.long 3602627437,3602627437 -.long 974525996,974525996 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.long 1,2,4,8 -.long 16,32,64,128 -.long 27,54,0,0 -.long 0,0,0,0 -.size _x86_AES_encrypt,.-_x86_AES_encrypt -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -AES_encrypt: -.L_AES_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call .L004pic_point -.L004pic_point: - popl %ebp - leal OPENSSL_ia32cap_P-.L004pic_point(%ebp),%eax - leal .LAES_Te-.L004pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc .L005x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call _sse_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 16 -.L005x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call _x86_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_encrypt,.-.L_AES_encrypt_begin -.type _x86_AES_decrypt_compact,@function -.align 16 -_x86_AES_decrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 16 -.L006loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%eax - subl %edi,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %ecx,%eax - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ecx,%ebx - roll $8,%ecx - xorl %esi,%ebp - xorl %eax,%ecx - xorl %ebp,%eax - xorl %ebx,%ecx - xorl %ebp,%ebx - roll $24,%eax - xorl %ebp,%ecx - roll $16,%ebx - xorl %eax,%ecx - roll $8,%ebp - xorl %ebx,%ecx - movl 4(%esp),%eax - xorl %ebp,%ecx - movl %ecx,12(%esp) - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %edx,%ebx - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %edx,%ecx - roll $8,%edx - xorl %esi,%ebp - xorl %ebx,%edx - xorl %ebp,%ebx - xorl %ecx,%edx - xorl %ebp,%ecx - roll $24,%ebx - xorl %ebp,%edx - roll $16,%ecx - xorl %ebx,%edx - roll $8,%ebp - xorl %ecx,%edx - movl 8(%esp),%ebx - xorl %ebp,%edx - movl %edx,16(%esp) - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %eax,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %eax,%edx - roll $8,%eax - xorl %esi,%ebp - xorl %ecx,%eax - xorl %ebp,%ecx - xorl %edx,%eax - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%eax - roll $16,%edx - xorl %ecx,%eax - roll $8,%ebp - xorl %edx,%eax - xorl %ebp,%eax - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ebx,%edx - roll $8,%ebx - xorl %esi,%ebp - xorl %ecx,%ebx - xorl %ebp,%ecx - xorl %edx,%ebx - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%ebp - xorl %edx,%ebx - movl 12(%esp),%ecx - xorl %ebp,%ebx - movl 16(%esp),%edx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L006loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.size _x86_AES_decrypt_compact,.-_x86_AES_decrypt_compact -.type _sse_AES_decrypt_compact,@function -.align 16 -_sse_AES_decrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 16 -.L007loop: - pshufw $12,%mm0,%mm1 - pshufw $9,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $6,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $3,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movd %mm2,%eax - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $16,%esi - movd %mm6,%ebx - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %al,%edi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $16,%esi - shrl $16,%eax - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shrl $16,%ebx - shll $8,%esi - movd %edx,%mm1 - movzbl -128(%ebp,%edi,1),%edx - movzbl %bh,%edi - shll $24,%edx - andl $255,%ebx - orl %esi,%edx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movzbl %ah,%eax - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - orl %ebx,%edx - shll $16,%esi - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%edx - shll $24,%eax - orl %eax,%ecx - movl 20(%esp),%edi - movd %edx,%mm4 - movd %ecx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja .L008out - movq %mm0,%mm3 - movq %mm4,%mm7 - pshufw $228,%mm0,%mm2 - pshufw $228,%mm4,%mm6 - movq %mm0,%mm1 - movq %mm4,%mm5 - pshufw $177,%mm0,%mm0 - pshufw $177,%mm4,%mm4 - pslld $8,%mm2 - pslld $8,%mm6 - psrld $8,%mm3 - psrld $8,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pslld $16,%mm2 - pslld $16,%mm6 - psrld $16,%mm3 - psrld $16,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movq 8(%esp),%mm3 - pxor %mm2,%mm2 - pxor %mm6,%mm6 - pcmpgtb %mm1,%mm2 - pcmpgtb %mm5,%mm6 - pand %mm3,%mm2 - pand %mm3,%mm6 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm2,%mm1 - pxor %mm6,%mm5 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq %mm1,%mm2 - movq %mm5,%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pslld $24,%mm3 - pslld $24,%mm7 - psrld $8,%mm2 - psrld $8,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pshufw $177,%mm1,%mm3 - pshufw $177,%mm5,%mm7 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - pshufw $177,%mm1,%mm2 - pshufw $177,%mm5,%mm6 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pslld $8,%mm1 - pslld $8,%mm5 - psrld $8,%mm3 - psrld $8,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl -128(%ebp),%eax - pslld $16,%mm1 - pslld $16,%mm5 - movl -64(%ebp),%ebx - psrld $16,%mm3 - psrld $16,%mm7 - movl (%ebp),%ecx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl 64(%ebp),%edx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp .L007loop -.align 16 -.L008out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.size _sse_AES_decrypt_compact,.-_sse_AES_decrypt_compact -.type _x86_AES_decrypt,@function -.align 16 -_x86_AES_decrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 16 -.L009loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ebx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %ah,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - - movl 20(%esp),%edi - andl $255,%edx - movl (%ebp,%edx,8),%edx - movzbl %ch,%ecx - xorl 3(%ebp,%ecx,8),%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - shrl $24,%eax - xorl 1(%ebp,%eax,8),%edx - movl 4(%esp),%eax - - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L009loop - leal 2176(%ebp),%ebp - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi - leal -128(%ebp),%ebp - movl %eax,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl (%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl (%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl (%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl (%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - leal -2048(%ebp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 64 -.LAES_Td: -.long 1353184337,1353184337 -.long 1399144830,1399144830 -.long 3282310938,3282310938 -.long 2522752826,2522752826 -.long 3412831035,3412831035 -.long 4047871263,4047871263 -.long 2874735276,2874735276 -.long 2466505547,2466505547 -.long 1442459680,1442459680 -.long 4134368941,4134368941 -.long 2440481928,2440481928 -.long 625738485,625738485 -.long 4242007375,4242007375 -.long 3620416197,3620416197 -.long 2151953702,2151953702 -.long 2409849525,2409849525 -.long 1230680542,1230680542 -.long 1729870373,1729870373 -.long 2551114309,2551114309 -.long 3787521629,3787521629 -.long 41234371,41234371 -.long 317738113,317738113 -.long 2744600205,2744600205 -.long 3338261355,3338261355 -.long 3881799427,3881799427 -.long 2510066197,2510066197 -.long 3950669247,3950669247 -.long 3663286933,3663286933 -.long 763608788,763608788 -.long 3542185048,3542185048 -.long 694804553,694804553 -.long 1154009486,1154009486 -.long 1787413109,1787413109 -.long 2021232372,2021232372 -.long 1799248025,1799248025 -.long 3715217703,3715217703 -.long 3058688446,3058688446 -.long 397248752,397248752 -.long 1722556617,1722556617 -.long 3023752829,3023752829 -.long 407560035,407560035 -.long 2184256229,2184256229 -.long 1613975959,1613975959 -.long 1165972322,1165972322 -.long 3765920945,3765920945 -.long 2226023355,2226023355 -.long 480281086,480281086 -.long 2485848313,2485848313 -.long 1483229296,1483229296 -.long 436028815,436028815 -.long 2272059028,2272059028 -.long 3086515026,3086515026 -.long 601060267,601060267 -.long 3791801202,3791801202 -.long 1468997603,1468997603 -.long 715871590,715871590 -.long 120122290,120122290 -.long 63092015,63092015 -.long 2591802758,2591802758 -.long 2768779219,2768779219 -.long 4068943920,4068943920 -.long 2997206819,2997206819 -.long 3127509762,3127509762 -.long 1552029421,1552029421 -.long 723308426,723308426 -.long 2461301159,2461301159 -.long 4042393587,4042393587 -.long 2715969870,2715969870 -.long 3455375973,3455375973 -.long 3586000134,3586000134 -.long 526529745,526529745 -.long 2331944644,2331944644 -.long 2639474228,2639474228 -.long 2689987490,2689987490 -.long 853641733,853641733 -.long 1978398372,1978398372 -.long 971801355,971801355 -.long 2867814464,2867814464 -.long 111112542,111112542 -.long 1360031421,1360031421 -.long 4186579262,4186579262 -.long 1023860118,1023860118 -.long 2919579357,2919579357 -.long 1186850381,1186850381 -.long 3045938321,3045938321 -.long 90031217,90031217 -.long 1876166148,1876166148 -.long 4279586912,4279586912 -.long 620468249,620468249 -.long 2548678102,2548678102 -.long 3426959497,3426959497 -.long 2006899047,2006899047 -.long 3175278768,3175278768 -.long 2290845959,2290845959 -.long 945494503,945494503 -.long 3689859193,3689859193 -.long 1191869601,1191869601 -.long 3910091388,3910091388 -.long 3374220536,3374220536 -.long 0,0 -.long 2206629897,2206629897 -.long 1223502642,1223502642 -.long 2893025566,2893025566 -.long 1316117100,1316117100 -.long 4227796733,4227796733 -.long 1446544655,1446544655 -.long 517320253,517320253 -.long 658058550,658058550 -.long 1691946762,1691946762 -.long 564550760,564550760 -.long 3511966619,3511966619 -.long 976107044,976107044 -.long 2976320012,2976320012 -.long 266819475,266819475 -.long 3533106868,3533106868 -.long 2660342555,2660342555 -.long 1338359936,1338359936 -.long 2720062561,2720062561 -.long 1766553434,1766553434 -.long 370807324,370807324 -.long 179999714,179999714 -.long 3844776128,3844776128 -.long 1138762300,1138762300 -.long 488053522,488053522 -.long 185403662,185403662 -.long 2915535858,2915535858 -.long 3114841645,3114841645 -.long 3366526484,3366526484 -.long 2233069911,2233069911 -.long 1275557295,1275557295 -.long 3151862254,3151862254 -.long 4250959779,4250959779 -.long 2670068215,2670068215 -.long 3170202204,3170202204 -.long 3309004356,3309004356 -.long 880737115,880737115 -.long 1982415755,1982415755 -.long 3703972811,3703972811 -.long 1761406390,1761406390 -.long 1676797112,1676797112 -.long 3403428311,3403428311 -.long 277177154,277177154 -.long 1076008723,1076008723 -.long 538035844,538035844 -.long 2099530373,2099530373 -.long 4164795346,4164795346 -.long 288553390,288553390 -.long 1839278535,1839278535 -.long 1261411869,1261411869 -.long 4080055004,4080055004 -.long 3964831245,3964831245 -.long 3504587127,3504587127 -.long 1813426987,1813426987 -.long 2579067049,2579067049 -.long 4199060497,4199060497 -.long 577038663,577038663 -.long 3297574056,3297574056 -.long 440397984,440397984 -.long 3626794326,3626794326 -.long 4019204898,4019204898 -.long 3343796615,3343796615 -.long 3251714265,3251714265 -.long 4272081548,4272081548 -.long 906744984,906744984 -.long 3481400742,3481400742 -.long 685669029,685669029 -.long 646887386,646887386 -.long 2764025151,2764025151 -.long 3835509292,3835509292 -.long 227702864,227702864 -.long 2613862250,2613862250 -.long 1648787028,1648787028 -.long 3256061430,3256061430 -.long 3904428176,3904428176 -.long 1593260334,1593260334 -.long 4121936770,4121936770 -.long 3196083615,3196083615 -.long 2090061929,2090061929 -.long 2838353263,2838353263 -.long 3004310991,3004310991 -.long 999926984,999926984 -.long 2809993232,2809993232 -.long 1852021992,1852021992 -.long 2075868123,2075868123 -.long 158869197,158869197 -.long 4095236462,4095236462 -.long 28809964,28809964 -.long 2828685187,2828685187 -.long 1701746150,1701746150 -.long 2129067946,2129067946 -.long 147831841,147831841 -.long 3873969647,3873969647 -.long 3650873274,3650873274 -.long 3459673930,3459673930 -.long 3557400554,3557400554 -.long 3598495785,3598495785 -.long 2947720241,2947720241 -.long 824393514,824393514 -.long 815048134,815048134 -.long 3227951669,3227951669 -.long 935087732,935087732 -.long 2798289660,2798289660 -.long 2966458592,2966458592 -.long 366520115,366520115 -.long 1251476721,1251476721 -.long 4158319681,4158319681 -.long 240176511,240176511 -.long 804688151,804688151 -.long 2379631990,2379631990 -.long 1303441219,1303441219 -.long 1414376140,1414376140 -.long 3741619940,3741619940 -.long 3820343710,3820343710 -.long 461924940,461924940 -.long 3089050817,3089050817 -.long 2136040774,2136040774 -.long 82468509,82468509 -.long 1563790337,1563790337 -.long 1937016826,1937016826 -.long 776014843,776014843 -.long 1511876531,1511876531 -.long 1389550482,1389550482 -.long 861278441,861278441 -.long 323475053,323475053 -.long 2355222426,2355222426 -.long 2047648055,2047648055 -.long 2383738969,2383738969 -.long 2302415851,2302415851 -.long 3995576782,3995576782 -.long 902390199,902390199 -.long 3991215329,3991215329 -.long 1018251130,1018251130 -.long 1507840668,1507840668 -.long 1064563285,1064563285 -.long 2043548696,2043548696 -.long 3208103795,3208103795 -.long 3939366739,3939366739 -.long 1537932639,1537932639 -.long 342834655,342834655 -.long 2262516856,2262516856 -.long 2180231114,2180231114 -.long 1053059257,1053059257 -.long 741614648,741614648 -.long 1598071746,1598071746 -.long 1925389590,1925389590 -.long 203809468,203809468 -.long 2336832552,2336832552 -.long 1100287487,1100287487 -.long 1895934009,1895934009 -.long 3736275976,3736275976 -.long 2632234200,2632234200 -.long 2428589668,2428589668 -.long 1636092795,1636092795 -.long 1890988757,1890988757 -.long 1952214088,1952214088 -.long 1113045200,1113045200 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.size _x86_AES_decrypt,.-_x86_AES_decrypt -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -AES_decrypt: -.L_AES_decrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call .L010pic_point -.L010pic_point: - popl %ebp - leal OPENSSL_ia32cap_P-.L010pic_point(%ebp),%eax - leal .LAES_Td-.L010pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc .L011x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call _sse_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 16 -.L011x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call _x86_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_decrypt,.-.L_AES_decrypt_begin -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 -AES_cbc_encrypt: -.L_AES_cbc_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%ecx - cmpl $0,%ecx - je .L012drop_out - call .L013pic_point -.L013pic_point: - popl %ebp - leal OPENSSL_ia32cap_P-.L013pic_point(%ebp),%eax - cmpl $0,40(%esp) - leal .LAES_Te-.L013pic_point(%ebp),%ebp - jne .L014picked_te - leal .LAES_Td-.LAES_Te(%ebp),%ebp -.L014picked_te: - pushfl - cld - cmpl $512,%ecx - jb .L015slow_way - testl $15,%ecx - jnz .L015slow_way - btl $28,(%eax) - jc .L015slow_way - leal -324(%esp),%esi - andl $-64,%esi - movl %ebp,%eax - leal 2304(%ebp),%ebx - movl %esi,%edx - andl $4095,%eax - andl $4095,%ebx - andl $4095,%edx - cmpl %ebx,%edx - jb .L016tbl_break_out - subl %ebx,%edx - subl %edx,%esi - jmp .L017tbl_ok -.align 4 -.L016tbl_break_out: - subl %eax,%edx - andl $4095,%edx - addl $384,%edx - subl %edx,%esi -.align 4 -.L017tbl_ok: - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 12(%edx),%edi - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl $0,316(%esp) - movl %edi,%ebx - movl $61,%ecx - subl %ebp,%ebx - movl %edi,%esi - andl $4095,%ebx - leal 76(%esp),%edi - cmpl $2304,%ebx - jb .L018do_copy - cmpl $3852,%ebx - jb .L019skip_copy -.align 4 -.L018do_copy: - movl %edi,44(%esp) -.long 2784229001 -.L019skip_copy: - movl $16,%edi -.align 4 -.L020prefetch_tbl: - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%esi - leal 128(%ebp),%ebp - subl $1,%edi - jnz .L020prefetch_tbl - subl $2048,%ebp - movl 32(%esp),%esi - movl 48(%esp),%edi - cmpl $0,%edx - je .L021fast_decrypt - movl (%edi),%eax - movl 4(%edi),%ebx -.align 16 -.L022fast_enc_loop: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call _x86_AES_encrypt - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - leal 16(%esi),%esi - movl 40(%esp),%ecx - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz .L022fast_enc_loop - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - cmpl $0,316(%esp) - movl 44(%esp),%edi - je .L023skip_ezero - movl $60,%ecx - xorl %eax,%eax -.align 4 -.long 2884892297 -.L023skip_ezero: - movl 28(%esp),%esp - popfl -.L012drop_out: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L021fast_decrypt: - cmpl 36(%esp),%esi - je .L024fast_dec_in_place - movl %edi,52(%esp) -.align 4 -.align 16 -.L025fast_dec_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl 44(%esp),%edi - call _x86_AES_decrypt - movl 52(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 36(%esp),%edi - movl 32(%esp),%esi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl %esi,52(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edi - movl %edi,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz .L025fast_dec_loop - movl 52(%esp),%edi - movl 48(%esp),%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - jmp .L026fast_dec_out -.align 16 -.L024fast_dec_in_place: -.L027fast_dec_in_place_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call _x86_AES_decrypt - movl 48(%esp),%edi - movl 36(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz .L027fast_dec_in_place_loop -.align 4 -.L026fast_dec_out: - cmpl $0,316(%esp) - movl 44(%esp),%edi - je .L028skip_dzero - movl $60,%ecx - xorl %eax,%eax -.align 4 -.long 2884892297 -.L028skip_dzero: - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L015slow_way: - movl (%eax),%eax - movl 36(%esp),%edi - leal -80(%esp),%esi - andl $-64,%esi - leal -143(%edi),%ebx - subl %esi,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esi - leal 768(%esi),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl %eax,52(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl %esi,%edi - movl %eax,%esi - cmpl $0,%edx - je .L029slow_decrypt - cmpl $16,%ecx - movl %ebx,%edx - jb .L030slow_enc_tail - btl $25,52(%esp) - jnc .L031slow_enc_x86 - movq (%edi),%mm0 - movq 8(%edi),%mm4 -.align 16 -.L032slow_enc_loop_sse: - pxor (%esi),%mm0 - pxor 8(%esi),%mm4 - movl 44(%esp),%edi - call _sse_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl 40(%esp),%ecx - movq %mm0,(%edi) - movq %mm4,8(%edi) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae .L032slow_enc_loop_sse - testl $15,%ecx - jnz .L030slow_enc_tail - movl 48(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L031slow_enc_x86: - movl (%edi),%eax - movl 4(%edi),%ebx -.align 4 -.L033slow_enc_loop_x86: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call _x86_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae .L033slow_enc_loop_x86 - testl $15,%ecx - jnz .L030slow_enc_tail - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L030slow_enc_tail: - emms - movl %edx,%edi - movl $16,%ebx - subl %ecx,%ebx - cmpl %esi,%edi - je .L034enc_in_place -.align 4 -.long 2767451785 - jmp .L035enc_skip_in_place -.L034enc_in_place: - leal (%edi,%ecx,1),%edi -.L035enc_skip_in_place: - movl %ebx,%ecx - xorl %eax,%eax -.align 4 -.long 2868115081 - movl 48(%esp),%edi - movl %edx,%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl $16,40(%esp) - jmp .L033slow_enc_loop_x86 -.align 16 -.L029slow_decrypt: - btl $25,52(%esp) - jnc .L036slow_dec_loop_x86 -.align 4 -.L037slow_dec_loop_sse: - movq (%esi),%mm0 - movq 8(%esi),%mm4 - movl 44(%esp),%edi - call _sse_AES_decrypt_compact - movl 32(%esp),%esi - leal 60(%esp),%eax - movl 36(%esp),%ebx - movl 40(%esp),%ecx - movl 48(%esp),%edi - movq (%esi),%mm1 - movq 8(%esi),%mm5 - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movq %mm1,(%edi) - movq %mm5,8(%edi) - subl $16,%ecx - jc .L038slow_dec_partial_sse - movq %mm0,(%ebx) - movq %mm4,8(%ebx) - leal 16(%ebx),%ebx - movl %ebx,36(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - movl %ecx,40(%esp) - jnz .L037slow_dec_loop_sse - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L038slow_dec_partial_sse: - movq %mm0,(%eax) - movq %mm4,8(%eax) - emms - addl $16,%ecx - movl %ebx,%edi - movl %eax,%esi -.align 4 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L036slow_dec_loop_x86: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call _x86_AES_decrypt_compact - movl 48(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - subl $16,%esi - jc .L039slow_dec_partial_x86 - movl %esi,40(%esp) - movl 36(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - leal 16(%esi),%esi - movl %esi,32(%esp) - jnz .L036slow_dec_loop_x86 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L039slow_dec_partial_x86: - leal 60(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 32(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl 36(%esp),%edi - leal 60(%esp),%esi -.align 4 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_cbc_encrypt,.-.L_AES_cbc_encrypt_begin -.type _x86_AES_set_encrypt_key,@function -.align 16 -_x86_AES_set_encrypt_key: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 24(%esp),%esi - movl 32(%esp),%edi - testl $-1,%esi - jz .L040badpointer - testl $-1,%edi - jz .L040badpointer - call .L041pic_point -.L041pic_point: - popl %ebp - leal .LAES_Te-.L041pic_point(%ebp),%ebp - leal 2176(%ebp),%ebp - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx - movl 28(%esp),%ecx - cmpl $128,%ecx - je .L04210rounds - cmpl $192,%ecx - je .L04312rounds - cmpl $256,%ecx - je .L04414rounds - movl $-2,%eax - jmp .L045exit -.L04210rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - xorl %ecx,%ecx - jmp .L04610shortcut -.align 4 -.L04710loop: - movl (%edi),%eax - movl 12(%edi),%edx -.L04610shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,16(%edi) - xorl 4(%edi),%eax - movl %eax,20(%edi) - xorl 8(%edi),%eax - movl %eax,24(%edi) - xorl 12(%edi),%eax - movl %eax,28(%edi) - incl %ecx - addl $16,%edi - cmpl $10,%ecx - jl .L04710loop - movl $10,80(%edi) - xorl %eax,%eax - jmp .L045exit -.L04312rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%ecx - movl 20(%esi),%edx - movl %ecx,16(%edi) - movl %edx,20(%edi) - xorl %ecx,%ecx - jmp .L04812shortcut -.align 4 -.L04912loop: - movl (%edi),%eax - movl 20(%edi),%edx -.L04812shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,24(%edi) - xorl 4(%edi),%eax - movl %eax,28(%edi) - xorl 8(%edi),%eax - movl %eax,32(%edi) - xorl 12(%edi),%eax - movl %eax,36(%edi) - cmpl $7,%ecx - je .L05012break - incl %ecx - xorl 16(%edi),%eax - movl %eax,40(%edi) - xorl 20(%edi),%eax - movl %eax,44(%edi) - addl $24,%edi - jmp .L04912loop -.L05012break: - movl $12,72(%edi) - xorl %eax,%eax - jmp .L045exit -.L04414rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%eax - movl 20(%esi),%ebx - movl 24(%esi),%ecx - movl 28(%esi),%edx - movl %eax,16(%edi) - movl %ebx,20(%edi) - movl %ecx,24(%edi) - movl %edx,28(%edi) - xorl %ecx,%ecx - jmp .L05114shortcut -.align 4 -.L05214loop: - movl 28(%edi),%edx -.L05114shortcut: - movl (%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,32(%edi) - xorl 4(%edi),%eax - movl %eax,36(%edi) - xorl 8(%edi),%eax - movl %eax,40(%edi) - xorl 12(%edi),%eax - movl %eax,44(%edi) - cmpl $6,%ecx - je .L05314break - incl %ecx - movl %eax,%edx - movl 16(%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - movl %eax,48(%edi) - xorl 20(%edi),%eax - movl %eax,52(%edi) - xorl 24(%edi),%eax - movl %eax,56(%edi) - xorl 28(%edi),%eax - movl %eax,60(%edi) - addl $32,%edi - jmp .L05214loop -.L05314break: - movl $14,48(%edi) - xorl %eax,%eax - jmp .L045exit -.L040badpointer: - movl $-1,%eax -.L045exit: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size _x86_AES_set_encrypt_key,.-_x86_AES_set_encrypt_key -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.L_AES_set_encrypt_key_begin: - call _x86_AES_set_encrypt_key - ret -.size AES_set_encrypt_key,.-.L_AES_set_encrypt_key_begin -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.L_AES_set_decrypt_key_begin: - call _x86_AES_set_encrypt_key - cmpl $0,%eax - je .L054proceed - ret -.L054proceed: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%esi - movl 240(%esi),%ecx - leal (,%ecx,4),%ecx - leal (%esi,%ecx,4),%edi -.align 4 -.L055invert: - movl (%esi),%eax - movl 4(%esi),%ebx - movl (%edi),%ecx - movl 4(%edi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,(%esi) - movl %edx,4(%esi) - movl 8(%esi),%eax - movl 12(%esi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,8(%edi) - movl %ebx,12(%edi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - addl $16,%esi - subl $16,%edi - cmpl %edi,%esi - jne .L055invert - movl 28(%esp),%edi - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,28(%esp) - movl 16(%edi),%eax -.align 4 -.L056permute: - addl $16,%edi - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %eax,%ebx - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - xorl %eax,%ecx - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - roll $8,%eax - xorl %esi,%edx - movl 4(%edi),%ebp - xorl %ebx,%eax - xorl %edx,%ebx - xorl %ecx,%eax - roll $24,%ebx - xorl %edx,%ecx - xorl %edx,%eax - roll $16,%ecx - xorl %ebx,%eax - roll $8,%edx - xorl %ecx,%eax - movl %ebp,%ebx - xorl %edx,%eax - movl %eax,(%edi) - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - xorl %ebx,%edx - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - roll $8,%ebx - xorl %esi,%eax - movl 8(%edi),%ebp - xorl %ecx,%ebx - xorl %eax,%ecx - xorl %edx,%ebx - roll $24,%ecx - xorl %eax,%edx - xorl %eax,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%eax - xorl %edx,%ebx - movl %ebp,%ecx - xorl %eax,%ebx - movl %ebx,4(%edi) - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %ecx,%edx - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - xorl %ecx,%eax - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - roll $8,%ecx - xorl %esi,%ebx - movl 12(%edi),%ebp - xorl %edx,%ecx - xorl %ebx,%edx - xorl %eax,%ecx - roll $24,%edx - xorl %ebx,%eax - xorl %ebx,%ecx - roll $16,%eax - xorl %edx,%ecx - roll $8,%ebx - xorl %eax,%ecx - movl %ebp,%edx - xorl %ebx,%ecx - movl %ecx,8(%edi) - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %edx,%eax - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - xorl %edx,%ebx - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - roll $8,%edx - xorl %esi,%ecx - movl 16(%edi),%ebp - xorl %eax,%edx - xorl %ecx,%eax - xorl %ebx,%edx - roll $24,%eax - xorl %ecx,%ebx - xorl %ecx,%edx - roll $16,%ebx - xorl %eax,%edx - roll $8,%ecx - xorl %ebx,%edx - movl %ebp,%eax - xorl %ecx,%edx - movl %edx,12(%edi) - cmpl 28(%esp),%edi - jb .L056permute - xorl %eax,%eax - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_set_decrypt_key,.-.L_AES_set_decrypt_key_begin -.byte 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -.byte 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -.byte 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.comm OPENSSL_ia32cap_P,16,4 diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h index d35d80a968c59e..bd6dc58174b08f 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Fri Sep 13 15:59:27 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:23 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -38,10 +38,11 @@ static const char compiler_flags[] = { '6','_','A','S','M',' ','-','D','S','H','A','5','1','2','_','A', 'S','M',' ','-','D','R','C','4','_','A','S','M',' ','-','D','M', 'D','5','_','A','S','M',' ','-','D','R','M','D','1','6','0','_', - 'A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ', - '-','D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ', - '-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C', - 'P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-', - 'D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D', - 'N','D','E','B','U','G','\0' + 'A','S','M',' ','-','D','A','E','S','N','I','_','A','S','M',' ', + '-','D','V','P','A','E','S','_','A','S','M',' ','-','D','W','H', + 'I','R','L','P','O','O','L','_','A','S','M',' ','-','D','G','H', + 'A','S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I', + 'S','T','Z','2','5','6','_','A','S','M',' ','-','D','P','O','L', + 'Y','1','3','0','5','_','A','S','M',' ','-','D','N','D','E','B', + 'U','G','\0' }; diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s index da9b3a7ee1dc57..4cec24f4e21cf7 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s @@ -4419,19 +4419,15 @@ ecp_nistz256_point_add: orl 4(%edi),%eax orl 8(%edi),%eax orl 12(%edi),%eax + movl 576(%esp),%ebx + notl %ebx + orl %ebx,%eax + movl 580(%esp),%ebx + notl %ebx + orl %ebx,%eax + orl 584(%esp),%eax .byte 62 jnz .L010add_proceed - movl 576(%esp),%eax - andl 580(%esp),%eax - movl 584(%esp),%ebx - jz .L010add_proceed - testl %ebx,%ebx - jz .L011add_double - movl 616(%esp),%edi - xorl %eax,%eax - movl $24,%ecx -.byte 252,243,171 - jmp .L012add_done .align 16 .L011add_double: movl 620(%esp),%esi diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h index c43f2272966f7a..da0b080ce0c7a3 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-elf/asm/include/progs.h b/deps/openssl/config/archs/linux-elf/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-elf/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi index e2fe28d73a968d..37aa910e1d975f 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi @@ -16,6 +16,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi index 19fe9eac77262f..25646b678cab5f 100644 --- a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi @@ -713,6 +713,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm index 9ddf36af0f5672..214775155c00f7 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm @@ -49,14 +49,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -112,8 +112,8 @@ our %config = ( sourcedir => ".", target => "linux-elf", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3237,7 +3244,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3245,6 +3251,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3743,14 +3750,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4191,6 +4190,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4885,49 +4892,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4937,7 +4936,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4955,13 +4953,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4975,613 +4971,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5595,7 +5489,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5605,188 +5498,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5816,25 +5678,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5844,31 +5702,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5878,31 +5731,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5920,284 +5768,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6207,295 +6008,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6255,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,7 +6262,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6519,7 +6269,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6527,7 +6276,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6535,7 +6283,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,163 +6290,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6717,235 +6437,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6953,21 +6634,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6975,13 +6653,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6989,81 +6665,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7071,334 +6734,272 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-586.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7408,79 +7009,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7499,7 +7087,6 @@ our %unified_info = ( "crypto/modes/ghash-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7509,361 +7096,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7885,265 +7412,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd-586.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8153,31 +7636,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8187,13 +7665,11 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8219,19 +7695,16 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8257,13 +7730,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-586.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8289,727 +7760,606 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-mmx.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9060,6 +8410,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9304,7 +8662,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9630,7 +8987,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9676,7 +9032,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9742,7 +9097,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9767,7 +9121,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9865,7 +9218,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9915,18 +9267,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9937,6 +9286,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10000,10 +9353,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10032,6 +9381,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10296,6 +9649,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15251,7 +14605,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15259,6 +14612,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15486,6 +14840,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15588,10 +14950,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15620,6 +14978,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.s b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.s deleted file mode 100644 index 53cd2909ac69bb..00000000000000 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.s +++ /dev/null @@ -1,3243 +0,0 @@ -.text -.type _x86_AES_encrypt_compact,@function -.align 16 -_x86_AES_encrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 16 -.L000loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ecx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ecx,%edi - xorl %esi,%ecx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ecx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%ecx - andl %edx,%ebp - leal (%edx,%edx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %edx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %edx,%edi - xorl %esi,%edx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%edx - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%edx - andl %eax,%ebp - leal (%eax,%eax,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %eax,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %eax,%edi - xorl %esi,%eax - rorl $24,%edi - xorl %ebp,%esi - roll $24,%eax - xorl %edi,%esi - movl $2155905152,%ebp - xorl %esi,%eax - andl %ebx,%ebp - leal (%ebx,%ebx,1),%edi - movl %ebp,%esi - shrl $7,%ebp - andl $4278124286,%edi - subl %ebp,%esi - movl %ebx,%ebp - andl $454761243,%esi - rorl $16,%ebp - xorl %edi,%esi - movl %ebx,%edi - xorl %esi,%ebx - rorl $24,%edi - xorl %ebp,%esi - roll $24,%ebx - xorl %edi,%esi - xorl %esi,%ebx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L000loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movzbl -128(%ebp,%esi,1),%esi - movzbl %ch,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ah,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $8,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movzbl -128(%ebp,%ecx,1),%ecx - shll $24,%ecx - xorl %ecx,%edx - movl %esi,%ecx - - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.size _x86_AES_encrypt_compact,.-_x86_AES_encrypt_compact -.type _sse_AES_encrypt_compact,@function -.align 16 -_sse_AES_encrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 16 -.L001loop: - pshufw $8,%mm0,%mm1 - pshufw $13,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $13,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $8,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $8,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - movd %mm2,%eax - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - movd %mm6,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $8,%esi - shrl $16,%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shrl $16,%eax - movd %ecx,%mm1 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %ah,%edi - shll $16,%ecx - andl $255,%eax - orl %esi,%ecx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - andl $255,%ebx - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%ecx - shll $16,%eax - movzbl -128(%ebp,%edi,1),%esi - orl %eax,%edx - shll $8,%esi - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - orl %ebx,%edx - movl 20(%esp),%edi - movd %ecx,%mm4 - movd %edx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja .L002out - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - movq %mm0,%mm1 - movq %mm4,%mm5 - pcmpgtb %mm0,%mm3 - pcmpgtb %mm4,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - pshufw $177,%mm0,%mm2 - pshufw $177,%mm4,%mm6 - paddb %mm0,%mm0 - paddb %mm4,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pshufw $177,%mm2,%mm3 - pshufw $177,%mm6,%mm7 - pxor %mm0,%mm1 - pxor %mm4,%mm5 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm3,%mm2 - movq %mm7,%mm6 - pslld $8,%mm3 - pslld $8,%mm7 - psrld $24,%mm2 - psrld $24,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - psrld $8,%mm1 - psrld $8,%mm5 - movl -128(%ebp),%eax - pslld $24,%mm3 - pslld $24,%mm7 - movl -64(%ebp),%ebx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl (%ebp),%ecx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl 64(%ebp),%edx - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp .L001loop -.align 16 -.L002out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.size _sse_AES_encrypt_compact,.-_sse_AES_encrypt_compact -.type _x86_AES_encrypt,@function -.align 16 -_x86_AES_encrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 16 -.L003loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl (%ebp,%esi,8),%esi - movzbl %ch,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movzbl %bh,%edi - xorl 1(%ebp,%edi,8),%esi - - movl 20(%esp),%edi - movl (%ebp,%edx,8),%edx - movzbl %ah,%eax - xorl 3(%ebp,%eax,8),%edx - movl 4(%esp),%eax - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - xorl 1(%ebp,%ecx,8),%edx - movl %esi,%ecx - - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L003loop - movl %eax,%esi - andl $255,%esi - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %bh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - shrl $16,%ebx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %ch,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $24,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - shrl $24,%ecx - movl 2(%ebp,%esi,8),%esi - andl $255,%esi - movzbl %dh,%edi - movl (%ebp,%edi,8),%edi - andl $65280,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edx - andl $255,%edi - movl (%ebp,%edi,8),%edi - andl $16711680,%edi - xorl %edi,%esi - movzbl %bh,%edi - movl 2(%ebp,%edi,8),%edi - andl $4278190080,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movl 2(%ebp,%edx,8),%edx - andl $255,%edx - movzbl %ah,%eax - movl (%ebp,%eax,8),%eax - andl $65280,%eax - xorl %eax,%edx - movl 4(%esp),%eax - andl $255,%ebx - movl (%ebp,%ebx,8),%ebx - andl $16711680,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - movl 2(%ebp,%ecx,8),%ecx - andl $4278190080,%ecx - xorl %ecx,%edx - movl %esi,%ecx - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 64 -.LAES_Te: -.long 2774754246,2774754246 -.long 2222750968,2222750968 -.long 2574743534,2574743534 -.long 2373680118,2373680118 -.long 234025727,234025727 -.long 3177933782,3177933782 -.long 2976870366,2976870366 -.long 1422247313,1422247313 -.long 1345335392,1345335392 -.long 50397442,50397442 -.long 2842126286,2842126286 -.long 2099981142,2099981142 -.long 436141799,436141799 -.long 1658312629,1658312629 -.long 3870010189,3870010189 -.long 2591454956,2591454956 -.long 1170918031,1170918031 -.long 2642575903,2642575903 -.long 1086966153,1086966153 -.long 2273148410,2273148410 -.long 368769775,368769775 -.long 3948501426,3948501426 -.long 3376891790,3376891790 -.long 200339707,200339707 -.long 3970805057,3970805057 -.long 1742001331,1742001331 -.long 4255294047,4255294047 -.long 3937382213,3937382213 -.long 3214711843,3214711843 -.long 4154762323,4154762323 -.long 2524082916,2524082916 -.long 1539358875,1539358875 -.long 3266819957,3266819957 -.long 486407649,486407649 -.long 2928907069,2928907069 -.long 1780885068,1780885068 -.long 1513502316,1513502316 -.long 1094664062,1094664062 -.long 49805301,49805301 -.long 1338821763,1338821763 -.long 1546925160,1546925160 -.long 4104496465,4104496465 -.long 887481809,887481809 -.long 150073849,150073849 -.long 2473685474,2473685474 -.long 1943591083,1943591083 -.long 1395732834,1395732834 -.long 1058346282,1058346282 -.long 201589768,201589768 -.long 1388824469,1388824469 -.long 1696801606,1696801606 -.long 1589887901,1589887901 -.long 672667696,672667696 -.long 2711000631,2711000631 -.long 251987210,251987210 -.long 3046808111,3046808111 -.long 151455502,151455502 -.long 907153956,907153956 -.long 2608889883,2608889883 -.long 1038279391,1038279391 -.long 652995533,652995533 -.long 1764173646,1764173646 -.long 3451040383,3451040383 -.long 2675275242,2675275242 -.long 453576978,453576978 -.long 2659418909,2659418909 -.long 1949051992,1949051992 -.long 773462580,773462580 -.long 756751158,756751158 -.long 2993581788,2993581788 -.long 3998898868,3998898868 -.long 4221608027,4221608027 -.long 4132590244,4132590244 -.long 1295727478,1295727478 -.long 1641469623,1641469623 -.long 3467883389,3467883389 -.long 2066295122,2066295122 -.long 1055122397,1055122397 -.long 1898917726,1898917726 -.long 2542044179,2542044179 -.long 4115878822,4115878822 -.long 1758581177,1758581177 -.long 0,0 -.long 753790401,753790401 -.long 1612718144,1612718144 -.long 536673507,536673507 -.long 3367088505,3367088505 -.long 3982187446,3982187446 -.long 3194645204,3194645204 -.long 1187761037,1187761037 -.long 3653156455,3653156455 -.long 1262041458,1262041458 -.long 3729410708,3729410708 -.long 3561770136,3561770136 -.long 3898103984,3898103984 -.long 1255133061,1255133061 -.long 1808847035,1808847035 -.long 720367557,720367557 -.long 3853167183,3853167183 -.long 385612781,385612781 -.long 3309519750,3309519750 -.long 3612167578,3612167578 -.long 1429418854,1429418854 -.long 2491778321,2491778321 -.long 3477423498,3477423498 -.long 284817897,284817897 -.long 100794884,100794884 -.long 2172616702,2172616702 -.long 4031795360,4031795360 -.long 1144798328,1144798328 -.long 3131023141,3131023141 -.long 3819481163,3819481163 -.long 4082192802,4082192802 -.long 4272137053,4272137053 -.long 3225436288,3225436288 -.long 2324664069,2324664069 -.long 2912064063,2912064063 -.long 3164445985,3164445985 -.long 1211644016,1211644016 -.long 83228145,83228145 -.long 3753688163,3753688163 -.long 3249976951,3249976951 -.long 1977277103,1977277103 -.long 1663115586,1663115586 -.long 806359072,806359072 -.long 452984805,452984805 -.long 250868733,250868733 -.long 1842533055,1842533055 -.long 1288555905,1288555905 -.long 336333848,336333848 -.long 890442534,890442534 -.long 804056259,804056259 -.long 3781124030,3781124030 -.long 2727843637,2727843637 -.long 3427026056,3427026056 -.long 957814574,957814574 -.long 1472513171,1472513171 -.long 4071073621,4071073621 -.long 2189328124,2189328124 -.long 1195195770,1195195770 -.long 2892260552,2892260552 -.long 3881655738,3881655738 -.long 723065138,723065138 -.long 2507371494,2507371494 -.long 2690670784,2690670784 -.long 2558624025,2558624025 -.long 3511635870,3511635870 -.long 2145180835,2145180835 -.long 1713513028,1713513028 -.long 2116692564,2116692564 -.long 2878378043,2878378043 -.long 2206763019,2206763019 -.long 3393603212,3393603212 -.long 703524551,703524551 -.long 3552098411,3552098411 -.long 1007948840,1007948840 -.long 2044649127,2044649127 -.long 3797835452,3797835452 -.long 487262998,487262998 -.long 1994120109,1994120109 -.long 1004593371,1004593371 -.long 1446130276,1446130276 -.long 1312438900,1312438900 -.long 503974420,503974420 -.long 3679013266,3679013266 -.long 168166924,168166924 -.long 1814307912,1814307912 -.long 3831258296,3831258296 -.long 1573044895,1573044895 -.long 1859376061,1859376061 -.long 4021070915,4021070915 -.long 2791465668,2791465668 -.long 2828112185,2828112185 -.long 2761266481,2761266481 -.long 937747667,937747667 -.long 2339994098,2339994098 -.long 854058965,854058965 -.long 1137232011,1137232011 -.long 1496790894,1496790894 -.long 3077402074,3077402074 -.long 2358086913,2358086913 -.long 1691735473,1691735473 -.long 3528347292,3528347292 -.long 3769215305,3769215305 -.long 3027004632,3027004632 -.long 4199962284,4199962284 -.long 133494003,133494003 -.long 636152527,636152527 -.long 2942657994,2942657994 -.long 2390391540,2390391540 -.long 3920539207,3920539207 -.long 403179536,403179536 -.long 3585784431,3585784431 -.long 2289596656,2289596656 -.long 1864705354,1864705354 -.long 1915629148,1915629148 -.long 605822008,605822008 -.long 4054230615,4054230615 -.long 3350508659,3350508659 -.long 1371981463,1371981463 -.long 602466507,602466507 -.long 2094914977,2094914977 -.long 2624877800,2624877800 -.long 555687742,555687742 -.long 3712699286,3712699286 -.long 3703422305,3703422305 -.long 2257292045,2257292045 -.long 2240449039,2240449039 -.long 2423288032,2423288032 -.long 1111375484,1111375484 -.long 3300242801,3300242801 -.long 2858837708,2858837708 -.long 3628615824,3628615824 -.long 84083462,84083462 -.long 32962295,32962295 -.long 302911004,302911004 -.long 2741068226,2741068226 -.long 1597322602,1597322602 -.long 4183250862,4183250862 -.long 3501832553,3501832553 -.long 2441512471,2441512471 -.long 1489093017,1489093017 -.long 656219450,656219450 -.long 3114180135,3114180135 -.long 954327513,954327513 -.long 335083755,335083755 -.long 3013122091,3013122091 -.long 856756514,856756514 -.long 3144247762,3144247762 -.long 1893325225,1893325225 -.long 2307821063,2307821063 -.long 2811532339,2811532339 -.long 3063651117,3063651117 -.long 572399164,572399164 -.long 2458355477,2458355477 -.long 552200649,552200649 -.long 1238290055,1238290055 -.long 4283782570,4283782570 -.long 2015897680,2015897680 -.long 2061492133,2061492133 -.long 2408352771,2408352771 -.long 4171342169,4171342169 -.long 2156497161,2156497161 -.long 386731290,386731290 -.long 3669999461,3669999461 -.long 837215959,837215959 -.long 3326231172,3326231172 -.long 3093850320,3093850320 -.long 3275833730,3275833730 -.long 2962856233,2962856233 -.long 1999449434,1999449434 -.long 286199582,286199582 -.long 3417354363,3417354363 -.long 4233385128,4233385128 -.long 3602627437,3602627437 -.long 974525996,974525996 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.byte 99,124,119,123,242,107,111,197 -.byte 48,1,103,43,254,215,171,118 -.byte 202,130,201,125,250,89,71,240 -.byte 173,212,162,175,156,164,114,192 -.byte 183,253,147,38,54,63,247,204 -.byte 52,165,229,241,113,216,49,21 -.byte 4,199,35,195,24,150,5,154 -.byte 7,18,128,226,235,39,178,117 -.byte 9,131,44,26,27,110,90,160 -.byte 82,59,214,179,41,227,47,132 -.byte 83,209,0,237,32,252,177,91 -.byte 106,203,190,57,74,76,88,207 -.byte 208,239,170,251,67,77,51,133 -.byte 69,249,2,127,80,60,159,168 -.byte 81,163,64,143,146,157,56,245 -.byte 188,182,218,33,16,255,243,210 -.byte 205,12,19,236,95,151,68,23 -.byte 196,167,126,61,100,93,25,115 -.byte 96,129,79,220,34,42,144,136 -.byte 70,238,184,20,222,94,11,219 -.byte 224,50,58,10,73,6,36,92 -.byte 194,211,172,98,145,149,228,121 -.byte 231,200,55,109,141,213,78,169 -.byte 108,86,244,234,101,122,174,8 -.byte 186,120,37,46,28,166,180,198 -.byte 232,221,116,31,75,189,139,138 -.byte 112,62,181,102,72,3,246,14 -.byte 97,53,87,185,134,193,29,158 -.byte 225,248,152,17,105,217,142,148 -.byte 155,30,135,233,206,85,40,223 -.byte 140,161,137,13,191,230,66,104 -.byte 65,153,45,15,176,84,187,22 -.long 1,2,4,8 -.long 16,32,64,128 -.long 27,54,0,0 -.long 0,0,0,0 -.size _x86_AES_encrypt,.-_x86_AES_encrypt -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -AES_encrypt: -.L_AES_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call .L004pic_point -.L004pic_point: - popl %ebp - leal OPENSSL_ia32cap_P-.L004pic_point(%ebp),%eax - leal .LAES_Te-.L004pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc .L005x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call _sse_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 16 -.L005x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call _x86_AES_encrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_encrypt,.-.L_AES_encrypt_begin -.type _x86_AES_decrypt_compact,@function -.align 16 -_x86_AES_decrypt_compact: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi -.align 16 -.L006loop: - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%eax - subl %edi,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %ecx,%eax - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ecx,%ebx - roll $8,%ecx - xorl %esi,%ebp - xorl %eax,%ecx - xorl %ebp,%eax - xorl %ebx,%ecx - xorl %ebp,%ebx - roll $24,%eax - xorl %ebp,%ecx - roll $16,%ebx - xorl %eax,%ecx - roll $8,%ebp - xorl %ebx,%ecx - movl 4(%esp),%eax - xorl %ebp,%ecx - movl %ecx,12(%esp) - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebx - subl %edi,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %edx,%ebx - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %edx,%ecx - roll $8,%edx - xorl %esi,%ebp - xorl %ebx,%edx - xorl %ebp,%ebx - xorl %ecx,%edx - xorl %ebp,%ecx - roll $24,%ebx - xorl %ebp,%edx - roll $16,%ecx - xorl %ebx,%edx - roll $8,%ebp - xorl %ecx,%edx - movl 8(%esp),%ebx - xorl %ebp,%edx - movl %edx,16(%esp) - movl $2155905152,%edi - andl %eax,%edi - movl %edi,%esi - shrl $7,%edi - leal (%eax,%eax,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %eax,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %eax,%edx - roll $8,%eax - xorl %esi,%ebp - xorl %ecx,%eax - xorl %ebp,%ecx - xorl %edx,%eax - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%eax - roll $16,%edx - xorl %ecx,%eax - roll $8,%ebp - xorl %edx,%eax - xorl %ebp,%eax - movl $2155905152,%edi - andl %ebx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ebx,%ebx,1),%ecx - subl %edi,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%edi - andl %ecx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%ecx,%ecx,1),%edx - subl %edi,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%edi - andl %edx,%edi - movl %edi,%esi - shrl $7,%edi - leal (%edx,%edx,1),%ebp - subl %edi,%esi - andl $4278124286,%ebp - andl $454761243,%esi - xorl %ebx,%edx - roll $8,%ebx - xorl %esi,%ebp - xorl %ecx,%ebx - xorl %ebp,%ecx - xorl %edx,%ebx - xorl %ebp,%edx - roll $24,%ecx - xorl %ebp,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%ebp - xorl %edx,%ebx - movl 12(%esp),%ecx - xorl %ebp,%ebx - movl 16(%esp),%edx - movl 20(%esp),%edi - movl 28(%esp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L006loop - movl %eax,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl -128(%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl -128(%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl -128(%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl -128(%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl -128(%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl -128(%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - xorl 16(%edi),%eax - xorl 20(%edi),%ebx - xorl 24(%edi),%ecx - xorl 28(%edi),%edx - ret -.size _x86_AES_decrypt_compact,.-_x86_AES_decrypt_compact -.type _sse_AES_decrypt_compact,@function -.align 16 -_sse_AES_decrypt_compact: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) - movl $454761243,%eax - movl %eax,8(%esp) - movl %eax,12(%esp) - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx -.align 16 -.L007loop: - pshufw $12,%mm0,%mm1 - pshufw $9,%mm4,%mm5 - movd %mm1,%eax - movd %mm5,%ebx - movl %edi,20(%esp) - movzbl %al,%esi - movzbl %ah,%edx - pshufw $6,%mm0,%mm2 - movzbl -128(%ebp,%esi,1),%ecx - movzbl %bl,%edi - movzbl -128(%ebp,%edx,1),%edx - shrl $16,%eax - shll $8,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $16,%esi - pshufw $3,%mm4,%mm6 - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $24,%esi - shrl $16,%ebx - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shll $24,%esi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movd %mm2,%eax - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - shll $16,%esi - movd %mm6,%ebx - movd %ecx,%mm0 - movzbl -128(%ebp,%edi,1),%ecx - movzbl %al,%edi - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bl,%edi - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %ah,%edi - shll $16,%esi - shrl $16,%eax - orl %esi,%edx - movzbl -128(%ebp,%edi,1),%esi - movzbl %bh,%edi - shrl $16,%ebx - shll $8,%esi - movd %edx,%mm1 - movzbl -128(%ebp,%edi,1),%edx - movzbl %bh,%edi - shll $24,%edx - andl $255,%ebx - orl %esi,%edx - punpckldq %mm1,%mm0 - movzbl -128(%ebp,%edi,1),%esi - movzbl %al,%edi - shll $8,%esi - movzbl %ah,%eax - movzbl -128(%ebp,%ebx,1),%ebx - orl %esi,%ecx - movzbl -128(%ebp,%edi,1),%esi - orl %ebx,%edx - shll $16,%esi - movzbl -128(%ebp,%eax,1),%eax - orl %esi,%edx - shll $24,%eax - orl %eax,%ecx - movl 20(%esp),%edi - movd %edx,%mm4 - movd %ecx,%mm5 - punpckldq %mm5,%mm4 - addl $16,%edi - cmpl 24(%esp),%edi - ja .L008out - movq %mm0,%mm3 - movq %mm4,%mm7 - pshufw $228,%mm0,%mm2 - pshufw $228,%mm4,%mm6 - movq %mm0,%mm1 - movq %mm4,%mm5 - pshufw $177,%mm0,%mm0 - pshufw $177,%mm4,%mm4 - pslld $8,%mm2 - pslld $8,%mm6 - psrld $8,%mm3 - psrld $8,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pslld $16,%mm2 - pslld $16,%mm6 - psrld $16,%mm3 - psrld $16,%mm7 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movq 8(%esp),%mm3 - pxor %mm2,%mm2 - pxor %mm6,%mm6 - pcmpgtb %mm1,%mm2 - pcmpgtb %mm5,%mm6 - pand %mm3,%mm2 - pand %mm3,%mm6 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm2,%mm1 - pxor %mm6,%mm5 - movq %mm1,%mm3 - movq %mm5,%mm7 - movq %mm1,%mm2 - movq %mm5,%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pslld $24,%mm3 - pslld $24,%mm7 - psrld $8,%mm2 - psrld $8,%mm6 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - movq 8(%esp),%mm2 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pshufw $177,%mm1,%mm3 - pshufw $177,%mm5,%mm7 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm3,%mm3 - pxor %mm7,%mm7 - pcmpgtb %mm1,%mm3 - pcmpgtb %mm5,%mm7 - pand %mm2,%mm3 - pand %mm2,%mm7 - paddb %mm1,%mm1 - paddb %mm5,%mm5 - pxor %mm3,%mm1 - pxor %mm7,%mm5 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movq %mm1,%mm3 - movq %mm5,%mm7 - pshufw $177,%mm1,%mm2 - pshufw $177,%mm5,%mm6 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - pslld $8,%mm1 - pslld $8,%mm5 - psrld $8,%mm3 - psrld $8,%mm7 - movq (%edi),%mm2 - movq 8(%edi),%mm6 - pxor %mm1,%mm0 - pxor %mm5,%mm4 - pxor %mm3,%mm0 - pxor %mm7,%mm4 - movl -128(%ebp),%eax - pslld $16,%mm1 - pslld $16,%mm5 - movl -64(%ebp),%ebx - psrld $16,%mm3 - psrld $16,%mm7 - movl (%ebp),%ecx - pxor %mm1,%mm0 - pxor %mm5,%mm4 - movl 64(%ebp),%edx - pxor %mm3,%mm0 - pxor %mm7,%mm4 - pxor %mm2,%mm0 - pxor %mm6,%mm4 - jmp .L007loop -.align 16 -.L008out: - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - ret -.size _sse_AES_decrypt_compact,.-_sse_AES_decrypt_compact -.type _x86_AES_decrypt,@function -.align 16 -_x86_AES_decrypt: - movl %edi,20(%esp) - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,24(%esp) -.align 16 -.L009loop: - movl %eax,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %dh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ebx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,4(%esp) - - movl %ebx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %ah,%edi - xorl 3(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %ecx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - movl %esi,8(%esp) - - movl %ecx,%esi - andl $255,%esi - movl (%ebp,%esi,8),%esi - movzbl %bh,%edi - xorl 3(%ebp,%edi,8),%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - xorl 2(%ebp,%edi,8),%esi - movl %edx,%edi - shrl $24,%edi - xorl 1(%ebp,%edi,8),%esi - - movl 20(%esp),%edi - andl $255,%edx - movl (%ebp,%edx,8),%edx - movzbl %ch,%ecx - xorl 3(%ebp,%ecx,8),%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - xorl 2(%ebp,%ebx,8),%edx - movl 8(%esp),%ebx - shrl $24,%eax - xorl 1(%ebp,%eax,8),%edx - movl 4(%esp),%eax - - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - cmpl 24(%esp),%edi - movl %edi,20(%esp) - jb .L009loop - leal 2176(%ebp),%ebp - movl -128(%ebp),%edi - movl -96(%ebp),%esi - movl -64(%ebp),%edi - movl -32(%ebp),%esi - movl (%ebp),%edi - movl 32(%ebp),%esi - movl 64(%ebp),%edi - movl 96(%ebp),%esi - leal -128(%ebp),%ebp - movl %eax,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %dh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ebx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,4(%esp) - movl %ebx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %ah,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %ecx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl %esi,8(%esp) - movl %ecx,%esi - andl $255,%esi - movzbl (%ebp,%esi,1),%esi - movzbl %bh,%edi - movzbl (%ebp,%edi,1),%edi - shll $8,%edi - xorl %edi,%esi - movl %eax,%edi - shrl $16,%edi - andl $255,%edi - movzbl (%ebp,%edi,1),%edi - shll $16,%edi - xorl %edi,%esi - movl %edx,%edi - shrl $24,%edi - movzbl (%ebp,%edi,1),%edi - shll $24,%edi - xorl %edi,%esi - movl 20(%esp),%edi - andl $255,%edx - movzbl (%ebp,%edx,1),%edx - movzbl %ch,%ecx - movzbl (%ebp,%ecx,1),%ecx - shll $8,%ecx - xorl %ecx,%edx - movl %esi,%ecx - shrl $16,%ebx - andl $255,%ebx - movzbl (%ebp,%ebx,1),%ebx - shll $16,%ebx - xorl %ebx,%edx - movl 8(%esp),%ebx - shrl $24,%eax - movzbl (%ebp,%eax,1),%eax - shll $24,%eax - xorl %eax,%edx - movl 4(%esp),%eax - leal -2048(%ebp),%ebp - addl $16,%edi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - ret -.align 64 -.LAES_Td: -.long 1353184337,1353184337 -.long 1399144830,1399144830 -.long 3282310938,3282310938 -.long 2522752826,2522752826 -.long 3412831035,3412831035 -.long 4047871263,4047871263 -.long 2874735276,2874735276 -.long 2466505547,2466505547 -.long 1442459680,1442459680 -.long 4134368941,4134368941 -.long 2440481928,2440481928 -.long 625738485,625738485 -.long 4242007375,4242007375 -.long 3620416197,3620416197 -.long 2151953702,2151953702 -.long 2409849525,2409849525 -.long 1230680542,1230680542 -.long 1729870373,1729870373 -.long 2551114309,2551114309 -.long 3787521629,3787521629 -.long 41234371,41234371 -.long 317738113,317738113 -.long 2744600205,2744600205 -.long 3338261355,3338261355 -.long 3881799427,3881799427 -.long 2510066197,2510066197 -.long 3950669247,3950669247 -.long 3663286933,3663286933 -.long 763608788,763608788 -.long 3542185048,3542185048 -.long 694804553,694804553 -.long 1154009486,1154009486 -.long 1787413109,1787413109 -.long 2021232372,2021232372 -.long 1799248025,1799248025 -.long 3715217703,3715217703 -.long 3058688446,3058688446 -.long 397248752,397248752 -.long 1722556617,1722556617 -.long 3023752829,3023752829 -.long 407560035,407560035 -.long 2184256229,2184256229 -.long 1613975959,1613975959 -.long 1165972322,1165972322 -.long 3765920945,3765920945 -.long 2226023355,2226023355 -.long 480281086,480281086 -.long 2485848313,2485848313 -.long 1483229296,1483229296 -.long 436028815,436028815 -.long 2272059028,2272059028 -.long 3086515026,3086515026 -.long 601060267,601060267 -.long 3791801202,3791801202 -.long 1468997603,1468997603 -.long 715871590,715871590 -.long 120122290,120122290 -.long 63092015,63092015 -.long 2591802758,2591802758 -.long 2768779219,2768779219 -.long 4068943920,4068943920 -.long 2997206819,2997206819 -.long 3127509762,3127509762 -.long 1552029421,1552029421 -.long 723308426,723308426 -.long 2461301159,2461301159 -.long 4042393587,4042393587 -.long 2715969870,2715969870 -.long 3455375973,3455375973 -.long 3586000134,3586000134 -.long 526529745,526529745 -.long 2331944644,2331944644 -.long 2639474228,2639474228 -.long 2689987490,2689987490 -.long 853641733,853641733 -.long 1978398372,1978398372 -.long 971801355,971801355 -.long 2867814464,2867814464 -.long 111112542,111112542 -.long 1360031421,1360031421 -.long 4186579262,4186579262 -.long 1023860118,1023860118 -.long 2919579357,2919579357 -.long 1186850381,1186850381 -.long 3045938321,3045938321 -.long 90031217,90031217 -.long 1876166148,1876166148 -.long 4279586912,4279586912 -.long 620468249,620468249 -.long 2548678102,2548678102 -.long 3426959497,3426959497 -.long 2006899047,2006899047 -.long 3175278768,3175278768 -.long 2290845959,2290845959 -.long 945494503,945494503 -.long 3689859193,3689859193 -.long 1191869601,1191869601 -.long 3910091388,3910091388 -.long 3374220536,3374220536 -.long 0,0 -.long 2206629897,2206629897 -.long 1223502642,1223502642 -.long 2893025566,2893025566 -.long 1316117100,1316117100 -.long 4227796733,4227796733 -.long 1446544655,1446544655 -.long 517320253,517320253 -.long 658058550,658058550 -.long 1691946762,1691946762 -.long 564550760,564550760 -.long 3511966619,3511966619 -.long 976107044,976107044 -.long 2976320012,2976320012 -.long 266819475,266819475 -.long 3533106868,3533106868 -.long 2660342555,2660342555 -.long 1338359936,1338359936 -.long 2720062561,2720062561 -.long 1766553434,1766553434 -.long 370807324,370807324 -.long 179999714,179999714 -.long 3844776128,3844776128 -.long 1138762300,1138762300 -.long 488053522,488053522 -.long 185403662,185403662 -.long 2915535858,2915535858 -.long 3114841645,3114841645 -.long 3366526484,3366526484 -.long 2233069911,2233069911 -.long 1275557295,1275557295 -.long 3151862254,3151862254 -.long 4250959779,4250959779 -.long 2670068215,2670068215 -.long 3170202204,3170202204 -.long 3309004356,3309004356 -.long 880737115,880737115 -.long 1982415755,1982415755 -.long 3703972811,3703972811 -.long 1761406390,1761406390 -.long 1676797112,1676797112 -.long 3403428311,3403428311 -.long 277177154,277177154 -.long 1076008723,1076008723 -.long 538035844,538035844 -.long 2099530373,2099530373 -.long 4164795346,4164795346 -.long 288553390,288553390 -.long 1839278535,1839278535 -.long 1261411869,1261411869 -.long 4080055004,4080055004 -.long 3964831245,3964831245 -.long 3504587127,3504587127 -.long 1813426987,1813426987 -.long 2579067049,2579067049 -.long 4199060497,4199060497 -.long 577038663,577038663 -.long 3297574056,3297574056 -.long 440397984,440397984 -.long 3626794326,3626794326 -.long 4019204898,4019204898 -.long 3343796615,3343796615 -.long 3251714265,3251714265 -.long 4272081548,4272081548 -.long 906744984,906744984 -.long 3481400742,3481400742 -.long 685669029,685669029 -.long 646887386,646887386 -.long 2764025151,2764025151 -.long 3835509292,3835509292 -.long 227702864,227702864 -.long 2613862250,2613862250 -.long 1648787028,1648787028 -.long 3256061430,3256061430 -.long 3904428176,3904428176 -.long 1593260334,1593260334 -.long 4121936770,4121936770 -.long 3196083615,3196083615 -.long 2090061929,2090061929 -.long 2838353263,2838353263 -.long 3004310991,3004310991 -.long 999926984,999926984 -.long 2809993232,2809993232 -.long 1852021992,1852021992 -.long 2075868123,2075868123 -.long 158869197,158869197 -.long 4095236462,4095236462 -.long 28809964,28809964 -.long 2828685187,2828685187 -.long 1701746150,1701746150 -.long 2129067946,2129067946 -.long 147831841,147831841 -.long 3873969647,3873969647 -.long 3650873274,3650873274 -.long 3459673930,3459673930 -.long 3557400554,3557400554 -.long 3598495785,3598495785 -.long 2947720241,2947720241 -.long 824393514,824393514 -.long 815048134,815048134 -.long 3227951669,3227951669 -.long 935087732,935087732 -.long 2798289660,2798289660 -.long 2966458592,2966458592 -.long 366520115,366520115 -.long 1251476721,1251476721 -.long 4158319681,4158319681 -.long 240176511,240176511 -.long 804688151,804688151 -.long 2379631990,2379631990 -.long 1303441219,1303441219 -.long 1414376140,1414376140 -.long 3741619940,3741619940 -.long 3820343710,3820343710 -.long 461924940,461924940 -.long 3089050817,3089050817 -.long 2136040774,2136040774 -.long 82468509,82468509 -.long 1563790337,1563790337 -.long 1937016826,1937016826 -.long 776014843,776014843 -.long 1511876531,1511876531 -.long 1389550482,1389550482 -.long 861278441,861278441 -.long 323475053,323475053 -.long 2355222426,2355222426 -.long 2047648055,2047648055 -.long 2383738969,2383738969 -.long 2302415851,2302415851 -.long 3995576782,3995576782 -.long 902390199,902390199 -.long 3991215329,3991215329 -.long 1018251130,1018251130 -.long 1507840668,1507840668 -.long 1064563285,1064563285 -.long 2043548696,2043548696 -.long 3208103795,3208103795 -.long 3939366739,3939366739 -.long 1537932639,1537932639 -.long 342834655,342834655 -.long 2262516856,2262516856 -.long 2180231114,2180231114 -.long 1053059257,1053059257 -.long 741614648,741614648 -.long 1598071746,1598071746 -.long 1925389590,1925389590 -.long 203809468,203809468 -.long 2336832552,2336832552 -.long 1100287487,1100287487 -.long 1895934009,1895934009 -.long 3736275976,3736275976 -.long 2632234200,2632234200 -.long 2428589668,2428589668 -.long 1636092795,1636092795 -.long 1890988757,1890988757 -.long 1952214088,1952214088 -.long 1113045200,1113045200 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.byte 82,9,106,213,48,54,165,56 -.byte 191,64,163,158,129,243,215,251 -.byte 124,227,57,130,155,47,255,135 -.byte 52,142,67,68,196,222,233,203 -.byte 84,123,148,50,166,194,35,61 -.byte 238,76,149,11,66,250,195,78 -.byte 8,46,161,102,40,217,36,178 -.byte 118,91,162,73,109,139,209,37 -.byte 114,248,246,100,134,104,152,22 -.byte 212,164,92,204,93,101,182,146 -.byte 108,112,72,80,253,237,185,218 -.byte 94,21,70,87,167,141,157,132 -.byte 144,216,171,0,140,188,211,10 -.byte 247,228,88,5,184,179,69,6 -.byte 208,44,30,143,202,63,15,2 -.byte 193,175,189,3,1,19,138,107 -.byte 58,145,17,65,79,103,220,234 -.byte 151,242,207,206,240,180,230,115 -.byte 150,172,116,34,231,173,53,133 -.byte 226,249,55,232,28,117,223,110 -.byte 71,241,26,113,29,41,197,137 -.byte 111,183,98,14,170,24,190,27 -.byte 252,86,62,75,198,210,121,32 -.byte 154,219,192,254,120,205,90,244 -.byte 31,221,168,51,136,7,199,49 -.byte 177,18,16,89,39,128,236,95 -.byte 96,81,127,169,25,181,74,13 -.byte 45,229,122,159,147,201,156,239 -.byte 160,224,59,77,174,42,245,176 -.byte 200,235,187,60,131,83,153,97 -.byte 23,43,4,126,186,119,214,38 -.byte 225,105,20,99,85,33,12,125 -.size _x86_AES_decrypt,.-_x86_AES_decrypt -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -AES_decrypt: -.L_AES_decrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 20(%esp),%esi - movl 28(%esp),%edi - movl %esp,%eax - subl $36,%esp - andl $-64,%esp - leal -127(%edi),%ebx - subl %esp,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esp - addl $4,%esp - movl %eax,28(%esp) - call .L010pic_point -.L010pic_point: - popl %ebp - leal OPENSSL_ia32cap_P-.L010pic_point(%ebp),%eax - leal .LAES_Td-.L010pic_point(%ebp),%ebp - leal 764(%esp),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - btl $25,(%eax) - jnc .L011x86 - movq (%esi),%mm0 - movq 8(%esi),%mm4 - call _sse_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.align 16 -.L011x86: - movl %ebp,24(%esp) - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - call _x86_AES_decrypt_compact - movl 28(%esp),%esp - movl 24(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_decrypt,.-.L_AES_decrypt_begin -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 -AES_cbc_encrypt: -.L_AES_cbc_encrypt_begin: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%ecx - cmpl $0,%ecx - je .L012drop_out - call .L013pic_point -.L013pic_point: - popl %ebp - leal OPENSSL_ia32cap_P-.L013pic_point(%ebp),%eax - cmpl $0,40(%esp) - leal .LAES_Te-.L013pic_point(%ebp),%ebp - jne .L014picked_te - leal .LAES_Td-.LAES_Te(%ebp),%ebp -.L014picked_te: - pushfl - cld - cmpl $512,%ecx - jb .L015slow_way - testl $15,%ecx - jnz .L015slow_way - btl $28,(%eax) - jc .L015slow_way - leal -324(%esp),%esi - andl $-64,%esi - movl %ebp,%eax - leal 2304(%ebp),%ebx - movl %esi,%edx - andl $4095,%eax - andl $4095,%ebx - andl $4095,%edx - cmpl %ebx,%edx - jb .L016tbl_break_out - subl %ebx,%edx - subl %edx,%esi - jmp .L017tbl_ok -.align 4 -.L016tbl_break_out: - subl %eax,%edx - andl $4095,%edx - addl $384,%edx - subl %edx,%esi -.align 4 -.L017tbl_ok: - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 12(%edx),%edi - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl $0,316(%esp) - movl %edi,%ebx - movl $61,%ecx - subl %ebp,%ebx - movl %edi,%esi - andl $4095,%ebx - leal 76(%esp),%edi - cmpl $2304,%ebx - jb .L018do_copy - cmpl $3852,%ebx - jb .L019skip_copy -.align 4 -.L018do_copy: - movl %edi,44(%esp) -.long 2784229001 -.L019skip_copy: - movl $16,%edi -.align 4 -.L020prefetch_tbl: - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%esi - leal 128(%ebp),%ebp - subl $1,%edi - jnz .L020prefetch_tbl - subl $2048,%ebp - movl 32(%esp),%esi - movl 48(%esp),%edi - cmpl $0,%edx - je .L021fast_decrypt - movl (%edi),%eax - movl 4(%edi),%ebx -.align 16 -.L022fast_enc_loop: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call _x86_AES_encrypt - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - leal 16(%esi),%esi - movl 40(%esp),%ecx - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz .L022fast_enc_loop - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - cmpl $0,316(%esp) - movl 44(%esp),%edi - je .L023skip_ezero - movl $60,%ecx - xorl %eax,%eax -.align 4 -.long 2884892297 -.L023skip_ezero: - movl 28(%esp),%esp - popfl -.L012drop_out: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L021fast_decrypt: - cmpl 36(%esp),%esi - je .L024fast_dec_in_place - movl %edi,52(%esp) -.align 4 -.align 16 -.L025fast_dec_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl 44(%esp),%edi - call _x86_AES_decrypt - movl 52(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl 36(%esp),%edi - movl 32(%esp),%esi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl %esi,52(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edi - movl %edi,36(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz .L025fast_dec_loop - movl 52(%esp),%edi - movl 48(%esp),%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - jmp .L026fast_dec_out -.align 16 -.L024fast_dec_in_place: -.L027fast_dec_in_place_loop: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call _x86_AES_decrypt - movl 48(%esp),%edi - movl 36(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - subl $16,%ecx - movl %ecx,40(%esp) - jnz .L027fast_dec_in_place_loop -.align 4 -.L026fast_dec_out: - cmpl $0,316(%esp) - movl 44(%esp),%edi - je .L028skip_dzero - movl $60,%ecx - xorl %eax,%eax -.align 4 -.long 2884892297 -.L028skip_dzero: - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L015slow_way: - movl (%eax),%eax - movl 36(%esp),%edi - leal -80(%esp),%esi - andl $-64,%esi - leal -143(%edi),%ebx - subl %esi,%ebx - negl %ebx - andl $960,%ebx - subl %ebx,%esi - leal 768(%esi),%ebx - subl %ebp,%ebx - andl $768,%ebx - leal 2176(%ebp,%ebx,1),%ebp - leal 24(%esp),%edx - xchgl %esi,%esp - addl $4,%esp - movl %ebp,24(%esp) - movl %esi,28(%esp) - movl %eax,52(%esp) - movl (%edx),%eax - movl 4(%edx),%ebx - movl 16(%edx),%esi - movl 20(%edx),%edx - movl %eax,32(%esp) - movl %ebx,36(%esp) - movl %ecx,40(%esp) - movl %edi,44(%esp) - movl %esi,48(%esp) - movl %esi,%edi - movl %eax,%esi - cmpl $0,%edx - je .L029slow_decrypt - cmpl $16,%ecx - movl %ebx,%edx - jb .L030slow_enc_tail - btl $25,52(%esp) - jnc .L031slow_enc_x86 - movq (%edi),%mm0 - movq 8(%edi),%mm4 -.align 16 -.L032slow_enc_loop_sse: - pxor (%esi),%mm0 - pxor 8(%esi),%mm4 - movl 44(%esp),%edi - call _sse_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl 40(%esp),%ecx - movq %mm0,(%edi) - movq %mm4,8(%edi) - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae .L032slow_enc_loop_sse - testl $15,%ecx - jnz .L030slow_enc_tail - movl 48(%esp),%esi - movq %mm0,(%esi) - movq %mm4,8(%esi) - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L031slow_enc_x86: - movl (%edi),%eax - movl 4(%edi),%ebx -.align 4 -.L033slow_enc_loop_x86: - movl 8(%edi),%ecx - movl 12(%edi),%edx - xorl (%esi),%eax - xorl 4(%esi),%ebx - xorl 8(%esi),%ecx - xorl 12(%esi),%edx - movl 44(%esp),%edi - call _x86_AES_encrypt_compact - movl 32(%esp),%esi - movl 36(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - leal 16(%esi),%esi - movl %esi,32(%esp) - leal 16(%edi),%edx - movl %edx,36(%esp) - subl $16,%ecx - cmpl $16,%ecx - movl %ecx,40(%esp) - jae .L033slow_enc_loop_x86 - testl $15,%ecx - jnz .L030slow_enc_tail - movl 48(%esp),%esi - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L030slow_enc_tail: - emms - movl %edx,%edi - movl $16,%ebx - subl %ecx,%ebx - cmpl %esi,%edi - je .L034enc_in_place -.align 4 -.long 2767451785 - jmp .L035enc_skip_in_place -.L034enc_in_place: - leal (%edi,%ecx,1),%edi -.L035enc_skip_in_place: - movl %ebx,%ecx - xorl %eax,%eax -.align 4 -.long 2868115081 - movl 48(%esp),%edi - movl %edx,%esi - movl (%edi),%eax - movl 4(%edi),%ebx - movl $16,40(%esp) - jmp .L033slow_enc_loop_x86 -.align 16 -.L029slow_decrypt: - btl $25,52(%esp) - jnc .L036slow_dec_loop_x86 -.align 4 -.L037slow_dec_loop_sse: - movq (%esi),%mm0 - movq 8(%esi),%mm4 - movl 44(%esp),%edi - call _sse_AES_decrypt_compact - movl 32(%esp),%esi - leal 60(%esp),%eax - movl 36(%esp),%ebx - movl 40(%esp),%ecx - movl 48(%esp),%edi - movq (%esi),%mm1 - movq 8(%esi),%mm5 - pxor (%edi),%mm0 - pxor 8(%edi),%mm4 - movq %mm1,(%edi) - movq %mm5,8(%edi) - subl $16,%ecx - jc .L038slow_dec_partial_sse - movq %mm0,(%ebx) - movq %mm4,8(%ebx) - leal 16(%ebx),%ebx - movl %ebx,36(%esp) - leal 16(%esi),%esi - movl %esi,32(%esp) - movl %ecx,40(%esp) - jnz .L037slow_dec_loop_sse - emms - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L038slow_dec_partial_sse: - movq %mm0,(%eax) - movq %mm4,8(%eax) - emms - addl $16,%ecx - movl %ebx,%edi - movl %eax,%esi -.align 4 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L036slow_dec_loop_x86: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - leal 60(%esp),%edi - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 44(%esp),%edi - call _x86_AES_decrypt_compact - movl 48(%esp),%edi - movl 40(%esp),%esi - xorl (%edi),%eax - xorl 4(%edi),%ebx - xorl 8(%edi),%ecx - xorl 12(%edi),%edx - subl $16,%esi - jc .L039slow_dec_partial_x86 - movl %esi,40(%esp) - movl 36(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - leal 16(%esi),%esi - movl %esi,36(%esp) - leal 60(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 32(%esp),%esi - leal 16(%esi),%esi - movl %esi,32(%esp) - jnz .L036slow_dec_loop_x86 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret - pushfl -.align 16 -.L039slow_dec_partial_x86: - leal 60(%esp),%esi - movl %eax,(%esi) - movl %ebx,4(%esi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - movl 32(%esp),%esi - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 40(%esp),%ecx - movl 36(%esp),%edi - leal 60(%esp),%esi -.align 4 -.long 2767451785 - movl 28(%esp),%esp - popfl - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_cbc_encrypt,.-.L_AES_cbc_encrypt_begin -.type _x86_AES_set_encrypt_key,@function -.align 16 -_x86_AES_set_encrypt_key: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 24(%esp),%esi - movl 32(%esp),%edi - testl $-1,%esi - jz .L040badpointer - testl $-1,%edi - jz .L040badpointer - call .L041pic_point -.L041pic_point: - popl %ebp - leal .LAES_Te-.L041pic_point(%ebp),%ebp - leal 2176(%ebp),%ebp - movl -128(%ebp),%eax - movl -96(%ebp),%ebx - movl -64(%ebp),%ecx - movl -32(%ebp),%edx - movl (%ebp),%eax - movl 32(%ebp),%ebx - movl 64(%ebp),%ecx - movl 96(%ebp),%edx - movl 28(%esp),%ecx - cmpl $128,%ecx - je .L04210rounds - cmpl $192,%ecx - je .L04312rounds - cmpl $256,%ecx - je .L04414rounds - movl $-2,%eax - jmp .L045exit -.L04210rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - xorl %ecx,%ecx - jmp .L04610shortcut -.align 4 -.L04710loop: - movl (%edi),%eax - movl 12(%edi),%edx -.L04610shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,16(%edi) - xorl 4(%edi),%eax - movl %eax,20(%edi) - xorl 8(%edi),%eax - movl %eax,24(%edi) - xorl 12(%edi),%eax - movl %eax,28(%edi) - incl %ecx - addl $16,%edi - cmpl $10,%ecx - jl .L04710loop - movl $10,80(%edi) - xorl %eax,%eax - jmp .L045exit -.L04312rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%ecx - movl 20(%esi),%edx - movl %ecx,16(%edi) - movl %edx,20(%edi) - xorl %ecx,%ecx - jmp .L04812shortcut -.align 4 -.L04912loop: - movl (%edi),%eax - movl 20(%edi),%edx -.L04812shortcut: - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,24(%edi) - xorl 4(%edi),%eax - movl %eax,28(%edi) - xorl 8(%edi),%eax - movl %eax,32(%edi) - xorl 12(%edi),%eax - movl %eax,36(%edi) - cmpl $7,%ecx - je .L05012break - incl %ecx - xorl 16(%edi),%eax - movl %eax,40(%edi) - xorl 20(%edi),%eax - movl %eax,44(%edi) - addl $24,%edi - jmp .L04912loop -.L05012break: - movl $12,72(%edi) - xorl %eax,%eax - jmp .L045exit -.L04414rounds: - movl (%esi),%eax - movl 4(%esi),%ebx - movl 8(%esi),%ecx - movl 12(%esi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,8(%edi) - movl %edx,12(%edi) - movl 16(%esi),%eax - movl 20(%esi),%ebx - movl 24(%esi),%ecx - movl 28(%esi),%edx - movl %eax,16(%edi) - movl %ebx,20(%edi) - movl %ecx,24(%edi) - movl %edx,28(%edi) - xorl %ecx,%ecx - jmp .L05114shortcut -.align 4 -.L05214loop: - movl 28(%edi),%edx -.L05114shortcut: - movl (%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - xorl 896(%ebp,%ecx,4),%eax - movl %eax,32(%edi) - xorl 4(%edi),%eax - movl %eax,36(%edi) - xorl 8(%edi),%eax - movl %eax,40(%edi) - xorl 12(%edi),%eax - movl %eax,44(%edi) - cmpl $6,%ecx - je .L05314break - incl %ecx - movl %eax,%edx - movl 16(%edi),%eax - movzbl %dl,%esi - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - movzbl -128(%ebp,%esi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - movl %eax,48(%edi) - xorl 20(%edi),%eax - movl %eax,52(%edi) - xorl 24(%edi),%eax - movl %eax,56(%edi) - xorl 28(%edi),%eax - movl %eax,60(%edi) - addl $32,%edi - jmp .L05214loop -.L05314break: - movl $14,48(%edi) - xorl %eax,%eax - jmp .L045exit -.L040badpointer: - movl $-1,%eax -.L045exit: - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size _x86_AES_set_encrypt_key,.-_x86_AES_set_encrypt_key -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.L_AES_set_encrypt_key_begin: - call _x86_AES_set_encrypt_key - ret -.size AES_set_encrypt_key,.-.L_AES_set_encrypt_key_begin -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.L_AES_set_decrypt_key_begin: - call _x86_AES_set_encrypt_key - cmpl $0,%eax - je .L054proceed - ret -.L054proceed: - pushl %ebp - pushl %ebx - pushl %esi - pushl %edi - movl 28(%esp),%esi - movl 240(%esi),%ecx - leal (,%ecx,4),%ecx - leal (%esi,%ecx,4),%edi -.align 4 -.L055invert: - movl (%esi),%eax - movl 4(%esi),%ebx - movl (%edi),%ecx - movl 4(%edi),%edx - movl %eax,(%edi) - movl %ebx,4(%edi) - movl %ecx,(%esi) - movl %edx,4(%esi) - movl 8(%esi),%eax - movl 12(%esi),%ebx - movl 8(%edi),%ecx - movl 12(%edi),%edx - movl %eax,8(%edi) - movl %ebx,12(%edi) - movl %ecx,8(%esi) - movl %edx,12(%esi) - addl $16,%esi - subl $16,%edi - cmpl %edi,%esi - jne .L055invert - movl 28(%esp),%edi - movl 240(%edi),%esi - leal -2(%esi,%esi,1),%esi - leal (%edi,%esi,8),%esi - movl %esi,28(%esp) - movl 16(%edi),%eax -.align 4 -.L056permute: - addl $16,%edi - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %eax,%ebx - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - xorl %eax,%ecx - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - roll $8,%eax - xorl %esi,%edx - movl 4(%edi),%ebp - xorl %ebx,%eax - xorl %edx,%ebx - xorl %ecx,%eax - roll $24,%ebx - xorl %edx,%ecx - xorl %edx,%eax - roll $16,%ecx - xorl %ebx,%eax - roll $8,%edx - xorl %ecx,%eax - movl %ebp,%ebx - xorl %edx,%eax - movl %eax,(%edi) - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - xorl %esi,%ecx - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %ebx,%ecx - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - xorl %ebx,%edx - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - roll $8,%ebx - xorl %esi,%eax - movl 8(%edi),%ebp - xorl %ecx,%ebx - xorl %eax,%ecx - xorl %edx,%ebx - roll $24,%ecx - xorl %eax,%edx - xorl %eax,%ebx - roll $16,%edx - xorl %ecx,%ebx - roll $8,%eax - xorl %edx,%ebx - movl %ebp,%ecx - xorl %eax,%ebx - movl %ebx,4(%edi) - movl $2155905152,%ebp - andl %ecx,%ebp - leal (%ecx,%ecx,1),%edx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%edx - andl $454761243,%esi - xorl %esi,%edx - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %ecx,%edx - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - xorl %ecx,%eax - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - roll $8,%ecx - xorl %esi,%ebx - movl 12(%edi),%ebp - xorl %edx,%ecx - xorl %ebx,%edx - xorl %eax,%ecx - roll $24,%edx - xorl %ebx,%eax - xorl %ebx,%ecx - roll $16,%eax - xorl %edx,%ecx - roll $8,%ebx - xorl %eax,%ecx - movl %ebp,%edx - xorl %ebx,%ecx - movl %ecx,8(%edi) - movl $2155905152,%ebp - andl %edx,%ebp - leal (%edx,%edx,1),%eax - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%eax - andl $454761243,%esi - xorl %esi,%eax - movl $2155905152,%ebp - andl %eax,%ebp - leal (%eax,%eax,1),%ebx - movl %ebp,%esi - shrl $7,%ebp - subl %ebp,%esi - andl $4278124286,%ebx - andl $454761243,%esi - xorl %edx,%eax - xorl %esi,%ebx - movl $2155905152,%ebp - andl %ebx,%ebp - leal (%ebx,%ebx,1),%ecx - movl %ebp,%esi - shrl $7,%ebp - xorl %edx,%ebx - subl %ebp,%esi - andl $4278124286,%ecx - andl $454761243,%esi - roll $8,%edx - xorl %esi,%ecx - movl 16(%edi),%ebp - xorl %eax,%edx - xorl %ecx,%eax - xorl %ebx,%edx - roll $24,%eax - xorl %ecx,%ebx - xorl %ecx,%edx - roll $16,%ebx - xorl %eax,%edx - roll $8,%ecx - xorl %ebx,%edx - movl %ebp,%eax - xorl %ecx,%edx - movl %edx,12(%edi) - cmpl 28(%esp),%edi - jb .L056permute - xorl %eax,%eax - popl %edi - popl %esi - popl %ebx - popl %ebp - ret -.size AES_set_decrypt_key,.-.L_AES_set_decrypt_key_begin -.byte 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89 -.byte 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114 -.byte 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.comm OPENSSL_ia32cap_P,16,4 diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h index 153225532e4c1c..c7df3525a0d884 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Fri Sep 13 15:59:33 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:30 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -39,10 +39,11 @@ static const char compiler_flags[] = { '2','5','6','_','A','S','M',' ','-','D','S','H','A','5','1','2', '_','A','S','M',' ','-','D','R','C','4','_','A','S','M',' ','-', 'D','M','D','5','_','A','S','M',' ','-','D','R','M','D','1','6', - '0','_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S', - 'M',' ','-','D','W','H','I','R','L','P','O','O','L','_','A','S', - 'M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D', - 'E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M', - ' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ', - '-','D','N','D','E','B','U','G','\0' + '0','_','A','S','M',' ','-','D','A','E','S','N','I','_','A','S', + 'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D', + 'W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-','D', + 'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_', + 'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','P', + 'O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N','D', + 'E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s index da9b3a7ee1dc57..4cec24f4e21cf7 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s @@ -4419,19 +4419,15 @@ ecp_nistz256_point_add: orl 4(%edi),%eax orl 8(%edi),%eax orl 12(%edi),%eax + movl 576(%esp),%ebx + notl %ebx + orl %ebx,%eax + movl 580(%esp),%ebx + notl %ebx + orl %ebx,%eax + orl 584(%esp),%eax .byte 62 jnz .L010add_proceed - movl 576(%esp),%eax - andl 580(%esp),%eax - movl 584(%esp),%ebx - jz .L010add_proceed - testl %ebx,%ebx - jz .L011add_double - movl 616(%esp),%edi - xorl %eax,%eax - movl $24,%ecx -.byte 252,243,171 - jmp .L012add_done .align 16 .L011add_double: movl 620(%esp),%esi diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h index c43f2272966f7a..da0b080ce0c7a3 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi index e2fe28d73a968d..37aa910e1d975f 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi @@ -16,6 +16,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi index 5cfdf4bbe688ae..dd0ac7456b6840 100644 --- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi @@ -713,6 +713,7 @@ 'RC4_ASM', 'MD5_ASM', 'RMD160_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'WHIRLPOOL_ASM', 'GHASH_ASM', diff --git a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm index 0c657bee8b914c..cd93118c7746ca 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-elf", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -354,8 +355,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -623,14 +624,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -706,6 +699,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1503,6 +1504,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3221,7 +3228,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3229,6 +3235,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3727,14 +3734,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4175,6 +4174,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4869,49 +4876,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4933,7 +4932,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4947,613 +4945,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5571,188 +5467,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5782,13 +5647,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5798,43 +5661,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5844,31 +5700,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5886,278 +5737,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6167,301 +5972,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6469,7 +6224,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6477,7 +6231,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6485,7 +6238,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6493,7 +6245,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6501,7 +6252,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6509,163 +6259,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6683,223 +6406,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6907,21 +6593,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6929,13 +6612,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6943,81 +6624,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7025,328 +6693,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7356,85 +6963,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7457,361 +7050,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7833,259 +7366,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8095,31 +7585,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8129,7 +7614,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8155,13 +7639,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8187,7 +7669,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8213,709 +7694,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8966,6 +8329,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9210,7 +8581,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9536,7 +8906,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9582,7 +8951,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9648,7 +9016,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9673,7 +9040,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9771,7 +9137,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9821,18 +9186,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9843,6 +9205,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9906,10 +9272,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9938,6 +9300,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10202,6 +9568,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15092,7 +14459,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15100,6 +14466,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15327,6 +14694,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15429,10 +14804,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15461,6 +14832,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h index 39469e8298ae17..7dbb94e08737c2 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-elf" -#define DATE "built on: Fri Sep 13 15:59:39 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:37 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h index f1f7572f38d64a..6db191cd5cb1fe 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm index 47234ab9177f5b..1afb56190cf72d 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3236,7 +3243,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3244,6 +3250,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3742,14 +3749,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4190,6 +4189,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4876,7 +4883,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4890,49 +4896,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4942,7 +4940,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4960,13 +4957,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4980,613 +4975,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5604,188 +5497,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5795,7 +5657,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5821,13 +5682,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5837,43 +5696,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5883,31 +5735,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5921,7 +5768,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5931,272 +5777,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6206,301 +6007,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6508,7 +6259,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6516,7 +6266,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6524,7 +6273,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6532,7 +6280,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6540,7 +6287,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6548,163 +6294,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6722,223 +6441,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6946,21 +6628,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6968,13 +6647,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6982,81 +6659,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7064,328 +6728,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7395,79 +6998,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7486,7 +7076,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7496,361 +7085,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7868,13 +7397,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7884,271 +7411,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8158,31 +7640,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8192,7 +7669,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8210,7 +7686,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8224,13 +7699,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8248,7 +7721,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8262,13 +7734,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8286,7 +7756,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8300,715 +7769,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9059,6 +8409,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9303,7 +8661,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9629,7 +8986,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9675,7 +9031,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9741,7 +9096,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9766,7 +9120,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9864,7 +9217,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9914,18 +9266,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9936,6 +9285,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9999,10 +9352,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10031,6 +9380,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10295,6 +9648,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15250,7 +14604,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15258,6 +14611,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15485,6 +14839,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15587,10 +14949,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15619,6 +14977,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s deleted file mode 100644 index 774b4c4dea1cd5..00000000000000 --- a/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s +++ /dev/null @@ -1,969 +0,0 @@ -.machine "any" -.text - -.globl bn_mul_mont_fpu64 -.type bn_mul_mont_fpu64,@function -.align 5 -bn_mul_mont_fpu64: - cmpwi 8,6 - mr 9,3 - li 3,0 - .long 0x4dc00020 - andi. 0,8,3 - .long 0x4cc20020 - - slwi 8,8,2 - li 12,-4096 - slwi 10,8,2 - add 10,10,8 - addi 10,10,488 - subf 10,10,1 - and 10,10,12 - subf 10,1,10 - mr 12,1 - stwux 1,1,10 - - stw 19,-148(12) - stw 20,-144(12) - stw 21,-140(12) - stw 22,-136(12) - stw 23,-132(12) - stw 24,-128(12) - stw 25,-124(12) - stw 26,-120(12) - stw 27,-116(12) - stw 28,-112(12) - stw 29,-108(12) - stw 30,-104(12) - stw 31,-100(12) - stfd 20,-96(12) - stfd 21,-88(12) - stfd 22,-80(12) - stfd 23,-72(12) - stfd 24,-64(12) - stfd 25,-56(12) - stfd 26,-48(12) - stfd 27,-40(12) - stfd 28,-32(12) - stfd 29,-24(12) - stfd 30,-16(12) - stfd 31,-8(12) - - addi 10,1,264 - li 12,-64 - add 22,10,8 - and 22,22,12 - - addi 22,22,-8 - srwi 11,8,4 - addi 11,11,-1 - addi 10,1,184 - li 0,0 - mtctr 11 - lwz 23,0(4) - mr 20,7 - lwz 21,4(4) - li 19,0 - lwz 25,0(5) - lwz 27,4(5) - lwz 7,0(20) - lwz 20,4(20) - - mullw 28,23,25 - mulhwu 29,23,25 - mullw 30,21,25 - mullw 31,23,27 - add 29,29,30 - add 29,29,31 - - extrwi 24,25,16,16 - extrwi 25,25,16,0 - extrwi 26,27,16,16 - extrwi 27,27,16,0 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mullw 24,28,7 - mulhwu 25,28,7 - mullw 26,29,7 - mullw 27,28,20 - add 25,25,26 - add 25,25,27 - - extrwi 28,24,16,16 - extrwi 29,24,16,0 - extrwi 30,25,16,16 - extrwi 31,25,16,0 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - - mr 24,23 - mr 25,21 - lwz 26,8(4) - lwz 27,12(4) - lwz 28,0(6) - lwz 29,4(6) - lwz 30,8(6) - lwz 31,12(6) - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 28,12,0 - fmul 29,12,1 - stfd 12,24(22) - stfd 13,32(22) - fmul 30,13,0 - fmul 31,13,1 - stfd 20,40(22) - stfd 21,48(22) - fmul 24,10,0 - fmul 25,10,1 - stfd 22,56(22) - stfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -.L1st: - lwz 24,0(4) - lwz 25,4(4) - lwz 26,8(4) - lwz 27,12(4) - lwz 28,0(6) - lwz 29,4(6) - lwz 30,8(6) - lwz 31,12(6) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - lwz 25,64(1) - lwz 24,68(1) - lwz 27,72(1) - lwz 26,76(1) - lwz 29,80(1) - lwz 28,84(1) - lwz 31,88(1) - lwz 30,92(1) - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - stfd 12,24(22) - stfd 13,32(22) - fmadd 26,10,2,26 - fmadd 27,10,3,27 - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - stfd 20,40(22) - stfd 21,48(22) - srwi 19,25,16 - insrwi 0,25,16,0 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - fmul 8,13,2 - fmul 9,13,3 - stfd 22,56(22) - stfdu 23,64(22) - insrwi 24,26,16,0 - srwi 19,27,16 - insrwi 0,27,16,0 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lwz 27,96(1) - lwz 26,100(1) - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - srwi 19,29,16 - insrwi 0,29,16,0 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - insrwi 28,30,16,0 - srwi 19,31,16 - insrwi 0,31,16,0 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - lwz 31,104(1) - lwz 30,108(1) - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - stw 24,12(10) - stw 28,8(10) - srwi 19,27,16 - insrwi 0,27,16,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - lwz 25,112(1) - lwz 24,116(1) - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - insrwi 26,30,16,0 - srwi 19,31,16 - insrwi 0,31,16,0 - - fctid 24,24 - fctid 25,25 - lwz 29,120(1) - lwz 28,124(1) - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - fctid 26,26 - fctid 27,27 - srwi 19,25,16 - insrwi 0,25,16,0 - fctid 28,28 - fctid 29,29 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - fctid 30,30 - fctid 31,31 - insrwi 24,28,16,0 - srwi 19,29,16 - insrwi 0,29,16,0 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - stw 26,20(10) - stwu 24,16(10) - bdnz .L1st - - fctid 8,8 - fctid 9,9 - lwz 25,64(1) - lwz 24,68(1) - lwz 27,72(1) - lwz 26,76(1) - lwz 29,80(1) - lwz 28,84(1) - lwz 31,88(1) - lwz 30,92(1) - stfd 8,128(1) - stfd 9,136(1) - - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 24,26,16,0 - insrwi 0,27,16,0 - srwi 19,27,16 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 0,29,16,0 - srwi 19,29,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 28,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - stw 24,12(10) - stw 28,8(10) - - lwz 27,96(1) - lwz 26,100(1) - lwz 31,104(1) - lwz 30,108(1) - lwz 25,112(1) - lwz 24,116(1) - lwz 29,120(1) - lwz 28,124(1) - - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 0,27,16,0 - srwi 19,27,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 26,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 24,28,16,0 - insrwi 0,29,16,0 - srwi 19,29,16 - stw 26,20(10) - stwu 24,16(10) - - lwz 31,128(1) - lwz 30,132(1) - lwz 29,136(1) - lwz 28,140(1) - - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 0,31,16,0 - srwi 19,31,16 - addc 28,28,0 - adde 29,29,19 - - insrwi 30,28,16,0 - srwi 28,28,16 - insrwi 28,29,16,0 - srwi 3,29,16 - stw 30,12(10) - stw 28,8(10) - slwi 31,8,2 - subf 22,31,22 - - li 12,8 -.align 5 -.Louter: - addi 10,1,192 - li 0,0 - mtctr 11 - add 24,5,12 - li 19,0 - lwz 25,0(24) - lwz 27,4(24) - - mullw 28,23,25 - lwz 24,204(1) - mulhwu 29,23,25 - lwz 26,200(1) - mullw 30,21,25 - mullw 31,23,27 - add 29,29,30 - add 29,29,31 - addc 28,28,24 - adde 29,29,26 - - extrwi 24,25,16,16 - extrwi 25,25,16,0 - extrwi 26,27,16,16 - extrwi 27,27,16,0 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mullw 24,28,7 - mulhwu 25,28,7 - mullw 26,29,7 - mullw 27,28,20 - add 25,25,26 - add 25,25,27 - - extrwi 28,24,16,16 - extrwi 29,24,16,0 - extrwi 30,25,16,16 - extrwi 31,25,16,0 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - lfd 10,8(22) - lfd 11,16(22) - lfd 12,24(22) - lfd 13,32(22) - lfd 20,40(22) - lfd 21,48(22) - lfd 22,56(22) - lfdu 23,64(22) - - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - fmul 30,13,0 - fmul 31,13,1 - fmul 24,10,0 - fmul 25,10,1 - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lfd 10,8(22) - lfd 11,16(22) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - lfd 12,24(22) - lfd 13,32(22) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -.Linner: - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - lfd 20,40(22) - lfd 21,48(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - lfd 22,56(22) - lfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - lfd 10,8(22) - lfd 11,16(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - lfd 12,24(22) - lfd 13,32(22) - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lwz 25,64(1) - lwz 24,68(1) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - lwz 27,72(1) - lwz 26,76(1) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - lwz 29,80(1) - lwz 28,84(1) - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - lwz 31,88(1) - lwz 30,92(1) - srwi 19,25,16 - insrwi 0,25,16,0 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - insrwi 24,26,16,0 - srwi 19,27,16 - insrwi 0,27,16,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - lwz 26,12(10) - lwz 27,8(10) - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - srwi 19,29,16 - insrwi 0,29,16,0 - - fctid 24,24 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - fctid 25,25 - insrwi 28,30,16,0 - srwi 19,31,16 - insrwi 0,31,16,0 - fctid 26,26 - addc 24,24,26 - adde 28,28,27 - lwz 27,96(1) - lwz 26,100(1) - fctid 27,27 - addze 0,0 - addze 19,19 - stw 24,4(10) - stw 28,0(10) - fctid 28,28 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - lwz 31,104(1) - lwz 30,108(1) - fctid 29,29 - srwi 19,27,16 - insrwi 0,27,16,0 - lwz 25,112(1) - lwz 24,116(1) - fctid 30,30 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - lwz 29,120(1) - lwz 28,124(1) - fctid 31,31 - - insrwi 26,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - lwz 30,20(10) - lwzu 31,16(10) - addc 24,24,0 - stfd 24,64(1) - adde 25,25,19 - srwi 0,24,16 - stfd 25,72(1) - insrwi 0,25,16,0 - srwi 19,25,16 - addc 28,28,0 - stfd 26,80(1) - adde 29,29,19 - srwi 0,28,16 - insrwi 24,28,16,0 - stfd 27,88(1) - insrwi 0,29,16,0 - srwi 19,29,16 - - addc 26,26,30 - stfd 28,96(1) - adde 24,24,31 - stfd 29,104(1) - addze 0,0 - stfd 30,112(1) - addze 19,19 - stfd 31,120(1) - stw 26,-4(10) - stw 24,-8(10) - bdnz .Linner - - fctid 8,8 - fctid 9,9 - lwz 25,64(1) - lwz 24,68(1) - lwz 27,72(1) - lwz 26,76(1) - lwz 29,80(1) - lwz 28,84(1) - lwz 31,88(1) - lwz 30,92(1) - stfd 8,128(1) - stfd 9,136(1) - - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 24,26,16,0 - lwz 26,12(10) - insrwi 0,27,16,0 - srwi 19,27,16 - lwz 27,8(10) - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 0,29,16,0 - srwi 19,29,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 28,30,16,0 - insrwi 0,31,16,0 - srwi 19,31,16 - - addc 24,24,26 - adde 28,28,27 - addze 0,0 - addze 19,19 - stw 24,4(10) - stw 28,0(10) - - lwz 27,96(1) - lwz 26,100(1) - lwz 31,104(1) - lwz 30,108(1) - lwz 25,112(1) - lwz 24,116(1) - lwz 29,120(1) - lwz 28,124(1) - - addc 26,26,0 - adde 27,27,19 - srwi 0,26,16 - insrwi 0,27,16,0 - srwi 19,27,16 - addc 30,30,0 - adde 31,31,19 - srwi 0,30,16 - insrwi 26,30,16,0 - lwz 30,20(10) - insrwi 0,31,16,0 - srwi 19,31,16 - lwzu 31,16(10) - addc 24,24,0 - adde 25,25,19 - srwi 0,24,16 - insrwi 0,25,16,0 - srwi 19,25,16 - addc 28,28,0 - adde 29,29,19 - srwi 0,28,16 - insrwi 24,28,16,0 - insrwi 0,29,16,0 - srwi 19,29,16 - - addc 26,26,30 - adde 24,24,31 - lwz 31,128(1) - lwz 30,132(1) - addze 0,0 - addze 19,19 - lwz 29,136(1) - lwz 28,140(1) - - addc 30,30,0 - adde 31,31,19 - stw 26,-4(10) - stw 24,-8(10) - addc 30,30,3 - addze 31,31 - srwi 0,30,16 - insrwi 0,31,16,0 - srwi 19,31,16 - addc 28,28,0 - adde 29,29,19 - - insrwi 30,28,16,0 - srwi 28,28,16 - insrwi 28,29,16,0 - srwi 3,29,16 - stw 30,4(10) - stw 28,0(10) - slwi 31,8,2 - addi 12,12,8 - subf 22,31,22 - cmpw 12,8 - blt- .Louter - subf 6,8,6 - addi 11,11,1 - subfc 12,12,12 - addi 10,1,192 - addi 6,6,-4 - addi 9,9,-4 - addi 4,1,196 - mtctr 11 - -.align 4 -.Lsub: lwz 24,12(10) - lwz 25,8(10) - lwz 26,20(10) - lwzu 27,16(10) - lwz 28,4(6) - lwz 29,8(6) - lwz 30,12(6) - lwzu 31,16(6) - subfe 28,28,24 - stw 24,4(4) - subfe 29,29,25 - stw 25,8(4) - subfe 30,30,26 - stw 26,12(4) - subfe 31,31,27 - stwu 27,16(4) - stw 28,4(9) - stw 29,8(9) - stw 30,12(9) - stwu 31,16(9) - bdnz .Lsub - - li 12,0 - subfe 3,12,3 - addi 4,1,196 - subf 9,8,9 - addi 10,1,192 - mtctr 11 - -.align 4 -.Lcopy: - lwz 24,4(4) - lwz 25,8(4) - lwz 26,12(4) - lwzu 27,16(4) - lwz 28,4(9) - lwz 29,8(9) - lwz 30,12(9) - lwz 31,16(9) - std 12,8(22) - std 12,16(22) - std 12,24(22) - std 12,32(22) - std 12,40(22) - std 12,48(22) - std 12,56(22) - stdu 12,64(22) - and 24,24,3 - and 25,25,3 - and 26,26,3 - and 27,27,3 - andc 28,28,3 - andc 29,29,3 - andc 30,30,3 - andc 31,31,3 - or 24,24,28 - or 25,25,29 - or 26,26,30 - or 27,27,31 - stw 24,4(9) - stw 25,8(9) - stw 26,12(9) - stwu 27,16(9) - std 12,8(10) - stdu 12,16(10) - bdnz .Lcopy - lwz 12,0(1) - li 3,1 - lwz 19,-148(12) - lwz 20,-144(12) - lwz 21,-140(12) - lwz 22,-136(12) - lwz 23,-132(12) - lwz 24,-128(12) - lwz 25,-124(12) - lwz 26,-120(12) - lwz 27,-116(12) - lwz 28,-112(12) - lwz 29,-108(12) - lwz 30,-104(12) - lwz 31,-100(12) - lfd 20,-96(12) - lfd 21,-88(12) - lfd 22,-80(12) - lfd 23,-72(12) - lfd 24,-64(12) - lfd 25,-56(12) - lfd 26,-48(12) - lfd 27,-40(12) - lfd 28,-32(12) - lfd 29,-24(12) - lfd 30,-16(12) - lfd 31,-8(12) - mr 1,12 - blr -.long 0 -.byte 0,12,4,0,0x8c,13,6,0 -.long 0 -.size bn_mul_mont_fpu64,.-bn_mul_mont_fpu64 - -.byte 77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 2 diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h index af759c6bdab883..1072f9d31176ca 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Fri Sep 13 16:00:48 2019 UTC" +#define DATE "built on: Wed Mar 18 21:07:41 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h index 1a2b31bdc7008c..71c4fecc40cc4e 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm index 65b50577c3673c..ae2648d219adb7 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3236,7 +3243,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3244,6 +3250,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3742,14 +3749,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4190,6 +4189,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4876,7 +4883,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4890,49 +4896,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4942,7 +4940,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4960,13 +4957,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4980,613 +4975,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5604,188 +5497,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5795,7 +5657,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5821,13 +5682,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5837,43 +5696,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5883,31 +5735,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5921,7 +5768,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5931,272 +5777,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6206,301 +6007,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6508,7 +6259,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6516,7 +6266,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6524,7 +6273,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6532,7 +6280,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6540,7 +6287,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6548,163 +6294,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6722,223 +6441,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6946,21 +6628,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6968,13 +6647,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6982,81 +6659,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7064,328 +6728,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7395,79 +6998,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7486,7 +7076,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7496,361 +7085,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7868,13 +7397,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7884,271 +7411,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8158,31 +7640,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8192,7 +7669,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8210,7 +7686,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8224,13 +7699,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8248,7 +7721,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8262,13 +7734,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8286,7 +7756,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8300,715 +7769,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9059,6 +8409,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9303,7 +8661,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9629,7 +8986,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9675,7 +9031,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9741,7 +9096,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9766,7 +9120,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9864,7 +9217,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9914,18 +9266,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9936,6 +9285,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9999,10 +9352,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10031,6 +9380,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10295,6 +9648,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15250,7 +14604,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15258,6 +14611,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15485,6 +14839,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15587,10 +14949,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15619,6 +14977,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h index d91d124d0d95f7..559beb8cb0d6b1 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Fri Sep 13 16:00:53 2019 UTC" +#define DATE "built on: Wed Mar 18 21:07:49 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h index 1a2b31bdc7008c..71c4fecc40cc4e 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm index 41afbcc4445a44..30a59660025863 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -237,6 +237,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -355,8 +356,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -624,14 +625,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -707,6 +700,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1504,6 +1505,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3222,7 +3229,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3230,6 +3236,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3728,14 +3735,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4176,6 +4175,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4870,49 +4877,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4934,7 +4933,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4948,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5572,188 +5468,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5783,13 +5648,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5799,43 +5662,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5845,31 +5701,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5887,278 +5738,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6168,301 +5973,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6470,7 +6225,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6232,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6239,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6246,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,163 +6260,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6684,223 +6407,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6908,21 +6594,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6930,13 +6613,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6944,81 +6625,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7026,328 +6694,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7357,85 +6964,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7458,361 +7051,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7834,259 +7367,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8096,31 +7586,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8130,7 +7615,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8156,13 +7640,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8188,7 +7670,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8214,709 +7695,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8967,6 +8330,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9211,7 +8582,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9537,7 +8907,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9583,7 +8952,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9649,7 +9017,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9674,7 +9041,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9772,7 +9138,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9822,18 +9187,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9844,6 +9206,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9907,10 +9273,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9939,6 +9301,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10203,6 +9569,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15093,7 +14460,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15101,6 +14467,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15328,6 +14695,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15430,10 +14805,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15462,6 +14833,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h index feccd6e409e5d0..58a71fa717b68f 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc" -#define DATE "built on: Fri Sep 13 16:00:59 2019 UTC" +#define DATE "built on: Wed Mar 18 21:07:59 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h index 6419ec21a2675f..4cbafb777f2ce3 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm index a8105b72abd10d..1f45e9693072bd 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3240,7 +3247,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3248,6 +3254,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3746,14 +3753,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4194,6 +4193,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4880,7 +4887,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4894,49 +4900,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4946,7 +4944,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4964,13 +4961,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4984,613 +4979,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5608,188 +5501,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5799,7 +5661,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5825,13 +5686,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5841,43 +5700,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5887,31 +5739,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5925,7 +5772,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5935,272 +5781,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6210,301 +6011,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6512,7 +6263,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6520,7 +6270,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6528,7 +6277,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6536,7 +6284,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6544,7 +6291,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6552,163 +6298,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6722,7 +6441,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-sparcv9.o" => @@ -6732,235 +6450,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6968,21 +6647,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6990,13 +6666,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7004,81 +6678,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7086,328 +6747,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7417,79 +7017,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7508,7 +7095,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7518,361 +7104,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7890,13 +7416,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7906,271 +7430,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8180,31 +7659,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8214,7 +7688,6 @@ our %unified_info = ( "crypto/sha/keccak1600-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8232,7 +7705,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8246,13 +7718,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8270,7 +7740,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8284,13 +7753,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8308,7 +7775,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8322,715 +7788,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9081,6 +8428,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9325,7 +8680,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9651,7 +9005,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9697,7 +9050,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9763,7 +9115,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9788,7 +9139,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9886,7 +9236,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9936,18 +9285,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9958,6 +9304,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10021,10 +9371,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10053,6 +9399,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10317,6 +9667,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15287,7 +14638,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15295,6 +14645,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15522,6 +14873,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15624,10 +14983,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15656,6 +15011,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s deleted file mode 100644 index c8a045698b28f7..00000000000000 --- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s +++ /dev/null @@ -1,753 +0,0 @@ -.machine "any" -.text - -.globl bn_mul_mont_fpu64 -.type bn_mul_mont_fpu64,@function -.section ".opd","aw" -.align 3 -bn_mul_mont_fpu64: -.quad .bn_mul_mont_fpu64,.TOC.@tocbase,0 -.previous - -.align 5 -.bn_mul_mont_fpu64: - cmpwi 8,3 - mr 9,3 - li 3,0 - .long 0x4dc00020 - andi. 0,8,1 - .long 0x4cc20020 - - slwi 8,8,3 - li 12,-4096 - slwi 10,8,2 - add 10,10,8 - addi 10,10,552 - subf 10,10,1 - and 10,10,12 - subf 10,1,10 - mr 12,1 - stdux 1,1,10 - - std 19,-200(12) - std 20,-192(12) - std 21,-184(12) - std 22,-176(12) - std 23,-168(12) - std 24,-160(12) - std 25,-152(12) - std 26,-144(12) - std 27,-136(12) - std 28,-128(12) - std 29,-120(12) - std 30,-112(12) - std 31,-104(12) - stfd 20,-96(12) - stfd 21,-88(12) - stfd 22,-80(12) - stfd 23,-72(12) - stfd 24,-64(12) - stfd 25,-56(12) - stfd 26,-48(12) - stfd 27,-40(12) - stfd 28,-32(12) - stfd 29,-24(12) - stfd 30,-16(12) - stfd 31,-8(12) - - addi 10,1,264 - li 12,-64 - add 22,10,8 - and 22,22,12 - - addi 22,22,-8 - srwi 11,8,4 - addi 11,11,-1 - addi 10,1,184 - li 0,0 - mtctr 11 - ld 23,0(4) - ld 27,0(5) - ld 7,0(7) - - mulld 31,23,27 - - rldicl 24,27,0,48 - rldicl 25,27,48,48 - rldicl 26,27,32,48 - rldicl 27,27,16,48 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mulld 31,31,7 - - rldicl 28,31,0,48 - rldicl 29,31,48,48 - rldicl 30,31,32,48 - rldicl 31,31,16,48 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - - rldicl 24,23,0,32 - rldicl 25,23,32,32 - lwz 26,12(4) - lwz 27,8(4) - lwz 28,4(6) - lwz 29,0(6) - lwz 30,12(6) - lwz 31,8(6) - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 28,12,0 - fmul 29,12,1 - stfd 12,24(22) - stfd 13,32(22) - fmul 30,13,0 - fmul 31,13,1 - stfd 20,40(22) - stfd 21,48(22) - fmul 24,10,0 - fmul 25,10,1 - stfd 22,56(22) - stfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -.L1st: - lwz 24,4(4) - lwz 25,0(4) - lwz 26,12(4) - lwz 27,8(4) - lwz 28,4(6) - lwz 29,0(6) - lwz 30,12(6) - lwz 31,8(6) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - stfd 12,24(22) - stfd 13,32(22) - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - stfd 20,40(22) - stfd 21,48(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - add 24,24,0 - fmul 8,13,2 - fmul 9,13,3 - stfd 22,56(22) - stfdu 23,64(22) - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - insrdi 24,25,16,32 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - add 26,26,0 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - srdi 0,26,16 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - insrdi 24,26,16,16 - add 27,27,0 - srdi 0,27,16 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - insrdi 24,27,16,0 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - add 28,28,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - srdi 0,28,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - - fctid 24,24 - fctid 25,25 - add 30,30,0 - fctid 26,26 - fctid 27,27 - srdi 0,30,16 - fctid 28,28 - fctid 29,29 - insrdi 28,30,16,16 - fctid 30,30 - fctid 31,31 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - std 24,8(10) - stdu 28,16(10) - bdnz .L1st - - fctid 8,8 - fctid 9,9 - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - stfd 8,128(1) - stfd 9,136(1) - - add 24,24,0 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - insrdi 24,25,16,32 - add 26,26,0 - srdi 0,26,16 - insrdi 24,26,16,16 - add 27,27,0 - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - srdi 0,28,16 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - ld 30,128(1) - ld 31,136(1) - - std 24,8(10) - stdu 28,16(10) - - add 30,30,0 - srdi 0,30,16 - add 31,31,0 - insrdi 30,31,48,0 - srdi 3,31,48 - std 30,8(10) - slwi 31,8,2 - subf 22,31,22 - - li 12,8 -.align 5 -.Louter: - addi 10,1,192 - li 0,0 - mtctr 11 - ldx 27,5,12 - - ld 30,200(1) - mulld 31,23,27 - add 31,31,30 - - rldicl 24,27,0,48 - rldicl 25,27,48,48 - rldicl 26,27,32,48 - rldicl 27,27,16,48 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mulld 31,31,7 - - rldicl 28,31,0,48 - rldicl 29,31,48,48 - rldicl 30,31,32,48 - rldicl 31,31,16,48 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - lfd 10,8(22) - lfd 11,16(22) - lfd 12,24(22) - lfd 13,32(22) - lfd 20,40(22) - lfd 21,48(22) - lfd 22,56(22) - lfdu 23,64(22) - - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - fmul 30,13,0 - fmul 31,13,1 - fmul 24,10,0 - fmul 25,10,1 - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lfd 10,8(22) - lfd 11,16(22) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - lfd 12,24(22) - lfd 13,32(22) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -.Linner: - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - lfd 20,40(22) - lfd 21,48(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - lfd 22,56(22) - lfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - lfd 10,8(22) - lfd 11,16(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - lfd 12,24(22) - lfd 13,32(22) - fmadd 26,21,4,26 - fmadd 27,21,5,27 - ld 24,64(1) - ld 25,72(1) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - ld 26,80(1) - ld 27,88(1) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - add 24,24,0 - ld 28,96(1) - ld 29,104(1) - fmadd 24,20,4,24 - fmadd 25,20,5,25 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - ld 30,112(1) - ld 31,120(1) - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - insrdi 24,25,16,32 - ld 25,8(10) - fmadd 28,21,6,28 - fmadd 29,21,7,29 - add 26,26,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - srdi 0,26,16 - insrdi 24,26,16,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - add 27,27,0 - ldu 26,16(10) - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - - fctid 24,24 - fctid 25,25 - srdi 0,28,16 - fctid 26,26 - fctid 27,27 - add 29,29,0 - fctid 28,28 - fctid 29,29 - srdi 0,29,16 - insrdi 28,29,16,32 - fctid 30,30 - fctid 31,31 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - - stfd 24,64(1) - stfd 25,72(1) - add 31,31,0 - addc 27,24,25 - stfd 26,80(1) - stfd 27,88(1) - insrdi 28,31,16,0 - srdi 0,31,16 - stfd 28,96(1) - stfd 29,104(1) - adde 29,28,26 - stfd 30,112(1) - stfd 31,120(1) - addze 0,0 - std 27,-16(10) - std 29,-8(10) - bdnz .Linner - - fctid 8,8 - fctid 9,9 - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - stfd 8,128(1) - stfd 9,136(1) - - add 24,24,0 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - insrdi 24,25,16,32 - add 26,26,0 - ld 25,8(10) - srdi 0,26,16 - insrdi 24,26,16,16 - add 27,27,0 - ldu 26,16(10) - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - srdi 0,28,16 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - ld 30,128(1) - ld 31,136(1) - - addc 27,24,25 - adde 29,28,26 - addze 0,0 - - std 27,-16(10) - std 29,-8(10) - - add 0,0,3 - add 30,30,0 - srdi 0,30,16 - add 31,31,0 - insrdi 30,31,48,0 - srdi 3,31,48 - std 30,0(10) - slwi 31,8,2 - addi 12,12,8 - subf 22,31,22 - cmpw 12,8 - blt- .Louter - subf 6,8,6 - addi 11,11,1 - subfc 12,12,12 - addi 10,1,200 - addi 28,1,208 - addi 29,6,8 - addi 30,9,8 - mtctr 11 - -.align 4 -.Lsub: ldx 24,10,12 - ldx 25,6,12 - ldx 26,28,12 - ldx 27,29,12 - subfe 24,25,24 - subfe 26,27,26 - stdx 24,9,12 - stdx 26,30,12 - addi 12,12,16 - bdnz .Lsub - - li 12,0 - subfe 3,12,3 - mtctr 11 - -.align 4 -.Lcopy: - ldx 24,10,12 - ldx 25,28,12 - ldx 26,9,12 - ldx 27,30,12 - std 12,8(22) - std 12,16(22) - std 12,24(22) - std 12,32(22) - std 12,40(22) - std 12,48(22) - std 12,56(22) - stdu 12,64(22) - and 24,24,3 - and 25,25,3 - andc 26,26,3 - andc 27,27,3 - or 24,24,26 - or 25,25,27 - stdx 24,9,12 - stdx 25,30,12 - stdx 12,10,12 - stdx 12,28,12 - addi 12,12,16 - bdnz .Lcopy - ld 12,0(1) - li 3,1 - ld 19,-200(12) - ld 20,-192(12) - ld 21,-184(12) - ld 22,-176(12) - ld 23,-168(12) - ld 24,-160(12) - ld 25,-152(12) - ld 26,-144(12) - ld 27,-136(12) - ld 28,-128(12) - ld 29,-120(12) - ld 30,-112(12) - ld 31,-104(12) - lfd 20,-96(12) - lfd 21,-88(12) - lfd 22,-80(12) - lfd 23,-72(12) - lfd 24,-64(12) - lfd 25,-56(12) - lfd 26,-48(12) - lfd 27,-40(12) - lfd 28,-32(12) - lfd 29,-24(12) - lfd 30,-16(12) - lfd 31,-8(12) - mr 1,12 - blr -.long 0 -.byte 0,12,4,0,0x8c,13,6,0 -.long 0 -.size bn_mul_mont_fpu64,.-.bn_mul_mont_fpu64 -.size .bn_mul_mont_fpu64,.-.bn_mul_mont_fpu64 - -.byte 77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 2 diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h index 2c9f24fdee2e25..f367bbd3426450 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Fri Sep 13 16:01:02 2019 UTC" +#define DATE "built on: Wed Mar 18 21:08:05 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm index fa53549253d37e..d1cc20b09ef1a5 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3240,7 +3247,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3248,6 +3254,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3746,14 +3753,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4194,6 +4193,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4880,7 +4887,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4894,49 +4900,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4946,7 +4944,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4964,13 +4961,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4984,613 +4979,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5608,188 +5501,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5799,7 +5661,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5825,13 +5686,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5841,43 +5700,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5887,31 +5739,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5925,7 +5772,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5935,272 +5781,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6210,301 +6011,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6512,7 +6263,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6520,7 +6270,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6528,7 +6277,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6536,7 +6284,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6544,7 +6291,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6552,163 +6298,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6722,7 +6441,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-sparcv9.o" => @@ -6732,235 +6450,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6968,21 +6647,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6990,13 +6666,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7004,81 +6678,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7086,328 +6747,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7417,79 +7017,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7508,7 +7095,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7518,361 +7104,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7890,13 +7416,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7906,271 +7430,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8180,31 +7659,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8214,7 +7688,6 @@ our %unified_info = ( "crypto/sha/keccak1600-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8232,7 +7705,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8246,13 +7718,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8270,7 +7740,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8284,13 +7753,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8308,7 +7775,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8322,715 +7788,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9081,6 +8428,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9325,7 +8680,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9651,7 +9005,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9697,7 +9050,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9763,7 +9115,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9788,7 +9139,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9886,7 +9236,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9936,18 +9285,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9958,6 +9304,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10021,10 +9371,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10053,6 +9399,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10317,6 +9667,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15287,7 +14638,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15295,6 +14645,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15522,6 +14873,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15624,10 +14983,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15656,6 +15011,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h index 0e70ae12285ec6..dc7442135ad376 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Fri Sep 13 16:01:08 2019 UTC" +#define DATE "built on: Wed Mar 18 21:08:13 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm index 42b7f02251e94b..4b7653af00bde5 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -238,6 +238,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3223,7 +3230,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3231,6 +3237,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3729,14 +3736,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4177,6 +4176,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4871,49 +4878,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4935,7 +4934,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4949,613 +4947,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5573,188 +5469,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5784,13 +5649,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5800,43 +5663,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5846,31 +5702,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5888,278 +5739,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6169,301 +5974,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6471,7 +6226,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6479,7 +6233,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6487,7 +6240,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6495,7 +6247,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6254,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,163 +6261,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6685,223 +6408,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6909,21 +6595,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6931,13 +6614,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6945,81 +6626,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7027,328 +6695,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7358,85 +6965,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7459,361 +7052,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7835,259 +7368,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8097,31 +7587,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8131,7 +7616,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8157,13 +7641,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8189,7 +7671,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8215,709 +7696,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8968,6 +8331,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9212,7 +8583,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9538,7 +8908,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9584,7 +8953,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9650,7 +9018,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9675,7 +9042,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9773,7 +9139,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9823,18 +9188,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9845,6 +9207,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9908,10 +9274,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9940,6 +9302,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10204,6 +9570,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15094,7 +14461,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15102,6 +14468,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15329,6 +14696,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15431,10 +14806,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15463,6 +14834,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h index 50c645ff13a868..ca91089788aedd 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64" -#define DATE "built on: Fri Sep 13 16:01:14 2019 UTC" +#define DATE "built on: Wed Mar 18 21:08:25 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h index 212e3f67d8e568..781ef739dc2274 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm index aff8df2a584ca8..be34b5bfb58064 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc64le", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3239,7 +3246,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3247,6 +3253,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3745,14 +3752,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4193,6 +4192,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4879,7 +4886,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4893,49 +4899,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4945,7 +4943,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4963,13 +4960,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4983,613 +4978,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5607,188 +5500,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5798,7 +5660,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5824,13 +5685,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5840,43 +5699,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5886,31 +5738,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5924,7 +5771,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5934,272 +5780,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6209,301 +6010,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,7 +6262,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6519,7 +6269,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6527,7 +6276,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6535,7 +6283,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,7 +6290,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6551,163 +6297,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6721,7 +6440,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-sparcv9.o" => @@ -6731,235 +6449,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6967,21 +6646,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6989,13 +6665,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7003,81 +6677,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7085,328 +6746,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7416,79 +7016,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7507,7 +7094,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7517,361 +7103,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7889,13 +7415,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7905,271 +7429,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8179,31 +7658,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8213,7 +7687,6 @@ our %unified_info = ( "crypto/sha/keccak1600-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8231,7 +7704,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8245,13 +7717,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8269,7 +7739,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8283,13 +7752,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8307,7 +7774,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8321,715 +7787,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9080,6 +8427,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9324,7 +8679,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9650,7 +9004,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9696,7 +9049,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9762,7 +9114,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9787,7 +9138,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9885,7 +9235,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9935,18 +9284,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9957,6 +9303,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10020,10 +9370,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10052,6 +9398,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10316,6 +9666,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15286,7 +14637,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15294,6 +14644,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15521,6 +14872,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15623,10 +14982,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15655,6 +15010,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s deleted file mode 100644 index 5bafae2b278d41..00000000000000 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s +++ /dev/null @@ -1,748 +0,0 @@ -.machine "any" -.abiversion 2 -.text - -.globl bn_mul_mont_fpu64 -.type bn_mul_mont_fpu64,@function -.align 5 -bn_mul_mont_fpu64: -.localentry bn_mul_mont_fpu64,0 - cmpwi 8,3 - mr 9,3 - li 3,0 - .long 0x4dc00020 - andi. 0,8,1 - .long 0x4cc20020 - - slwi 8,8,3 - li 12,-4096 - slwi 10,8,2 - add 10,10,8 - addi 10,10,552 - subf 10,10,1 - and 10,10,12 - subf 10,1,10 - mr 12,1 - stdux 1,1,10 - - std 19,-200(12) - std 20,-192(12) - std 21,-184(12) - std 22,-176(12) - std 23,-168(12) - std 24,-160(12) - std 25,-152(12) - std 26,-144(12) - std 27,-136(12) - std 28,-128(12) - std 29,-120(12) - std 30,-112(12) - std 31,-104(12) - stfd 20,-96(12) - stfd 21,-88(12) - stfd 22,-80(12) - stfd 23,-72(12) - stfd 24,-64(12) - stfd 25,-56(12) - stfd 26,-48(12) - stfd 27,-40(12) - stfd 28,-32(12) - stfd 29,-24(12) - stfd 30,-16(12) - stfd 31,-8(12) - - addi 10,1,264 - li 12,-64 - add 22,10,8 - and 22,22,12 - - addi 22,22,-8 - srwi 11,8,4 - addi 11,11,-1 - addi 10,1,184 - li 0,0 - mtctr 11 - ld 23,0(4) - ld 27,0(5) - ld 7,0(7) - - mulld 31,23,27 - - rldicl 24,27,0,48 - rldicl 25,27,48,48 - rldicl 26,27,32,48 - rldicl 27,27,16,48 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mulld 31,31,7 - - rldicl 28,31,0,48 - rldicl 29,31,48,48 - rldicl 30,31,32,48 - rldicl 31,31,16,48 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - - rldicl 24,23,0,32 - rldicl 25,23,32,32 - lwz 26,8(4) - lwz 27,12(4) - lwz 28,0(6) - lwz 29,4(6) - lwz 30,8(6) - lwz 31,12(6) - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 28,12,0 - fmul 29,12,1 - stfd 12,24(22) - stfd 13,32(22) - fmul 30,13,0 - fmul 31,13,1 - stfd 20,40(22) - stfd 21,48(22) - fmul 24,10,0 - fmul 25,10,1 - stfd 22,56(22) - stfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -.L1st: - lwz 24,0(4) - lwz 25,4(4) - lwz 26,8(4) - lwz 27,12(4) - lwz 28,0(6) - lwz 29,4(6) - lwz 30,8(6) - lwz 31,12(6) - std 24,128(1) - std 25,136(1) - std 26,144(1) - std 27,152(1) - std 28,160(1) - std 29,168(1) - std 30,176(1) - std 31,184(1) - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - lfd 10,128(1) - lfd 11,136(1) - lfd 12,144(1) - lfd 13,152(1) - lfd 20,160(1) - lfd 21,168(1) - lfd 22,176(1) - lfd 23,184(1) - fcfid 10,10 - fcfid 11,11 - fcfid 12,12 - fcfid 13,13 - fcfid 20,20 - fcfid 21,21 - fcfid 22,22 - fcfid 23,23 - addi 4,4,16 - addi 6,6,16 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - stfd 10,8(22) - stfd 11,16(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - stfd 12,24(22) - stfd 13,32(22) - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - stfd 20,40(22) - stfd 21,48(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - add 24,24,0 - fmul 8,13,2 - fmul 9,13,3 - stfd 22,56(22) - stfdu 23,64(22) - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - insrdi 24,25,16,32 - fmadd 28,22,4,28 - fmadd 29,22,5,29 - add 26,26,0 - fmadd 30,23,4,30 - fmadd 31,23,5,31 - srdi 0,26,16 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - insrdi 24,26,16,16 - add 27,27,0 - srdi 0,27,16 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - insrdi 24,27,16,0 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - add 28,28,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - srdi 0,28,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - - fctid 24,24 - fctid 25,25 - add 30,30,0 - fctid 26,26 - fctid 27,27 - srdi 0,30,16 - fctid 28,28 - fctid 29,29 - insrdi 28,30,16,16 - fctid 30,30 - fctid 31,31 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - std 24,8(10) - stdu 28,16(10) - bdnz .L1st - - fctid 8,8 - fctid 9,9 - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - stfd 8,128(1) - stfd 9,136(1) - - add 24,24,0 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - insrdi 24,25,16,32 - add 26,26,0 - srdi 0,26,16 - insrdi 24,26,16,16 - add 27,27,0 - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - srdi 0,28,16 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - ld 30,128(1) - ld 31,136(1) - - std 24,8(10) - stdu 28,16(10) - - add 30,30,0 - srdi 0,30,16 - add 31,31,0 - insrdi 30,31,48,0 - srdi 3,31,48 - std 30,8(10) - slwi 31,8,2 - subf 22,31,22 - - li 12,8 -.align 5 -.Louter: - addi 10,1,192 - li 0,0 - mtctr 11 - ldx 27,5,12 - - ld 30,200(1) - mulld 31,23,27 - add 31,31,30 - - rldicl 24,27,0,48 - rldicl 25,27,48,48 - rldicl 26,27,32,48 - rldicl 27,27,16,48 - std 24,64(1) - std 25,72(1) - std 26,80(1) - std 27,88(1) - - mulld 31,31,7 - - rldicl 28,31,0,48 - rldicl 29,31,48,48 - rldicl 30,31,32,48 - rldicl 31,31,16,48 - std 28,96(1) - std 29,104(1) - std 30,112(1) - std 31,120(1) - lfd 10,8(22) - lfd 11,16(22) - lfd 12,24(22) - lfd 13,32(22) - lfd 20,40(22) - lfd 21,48(22) - lfd 22,56(22) - lfdu 23,64(22) - - lfd 0,64(1) - lfd 1,72(1) - lfd 2,80(1) - lfd 3,88(1) - lfd 4,96(1) - lfd 5,104(1) - lfd 6,112(1) - lfd 7,120(1) - - fcfid 0,0 - fcfid 1,1 - fcfid 2,2 - fcfid 3,3 - fcfid 4,4 - fcfid 5,5 - fcfid 6,6 - fcfid 7,7 - - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - fmul 30,13,0 - fmul 31,13,1 - fmul 24,10,0 - fmul 25,10,1 - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - - fmadd 26,21,4,26 - fmadd 27,21,5,27 - lfd 10,8(22) - lfd 11,16(22) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - lfd 12,24(22) - lfd 13,32(22) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - fmadd 24,20,4,24 - fmadd 25,20,5,25 - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - fmadd 28,21,6,28 - fmadd 29,21,7,29 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - - fctid 24,24 - fctid 25,25 - fctid 26,26 - fctid 27,27 - fctid 28,28 - fctid 29,29 - fctid 30,30 - fctid 31,31 - - stfd 24,64(1) - stfd 25,72(1) - stfd 26,80(1) - stfd 27,88(1) - stfd 28,96(1) - stfd 29,104(1) - stfd 30,112(1) - stfd 31,120(1) - -.align 5 -.Linner: - fmul 26,11,0 - fmul 27,11,1 - fmul 28,12,0 - fmul 29,12,1 - lfd 20,40(22) - lfd 21,48(22) - fmul 30,13,0 - fmul 31,13,1 - fmadd 24,10,0,8 - fmadd 25,10,1,9 - lfd 22,56(22) - lfdu 23,64(22) - - fmadd 26,10,2,26 - fmadd 27,10,3,27 - fmadd 28,11,2,28 - fmadd 29,11,3,29 - lfd 10,8(22) - lfd 11,16(22) - fmadd 30,12,2,30 - fmadd 31,12,3,31 - fmul 8,13,2 - fmul 9,13,3 - lfd 12,24(22) - lfd 13,32(22) - fmadd 26,21,4,26 - fmadd 27,21,5,27 - ld 24,64(1) - ld 25,72(1) - fmadd 28,22,4,28 - fmadd 29,22,5,29 - ld 26,80(1) - ld 27,88(1) - fmadd 30,23,4,30 - fmadd 31,23,5,31 - add 24,24,0 - ld 28,96(1) - ld 29,104(1) - fmadd 24,20,4,24 - fmadd 25,20,5,25 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - ld 30,112(1) - ld 31,120(1) - - fmadd 26,20,6,26 - fmadd 27,20,7,27 - insrdi 24,25,16,32 - ld 25,8(10) - fmadd 28,21,6,28 - fmadd 29,21,7,29 - add 26,26,0 - fmadd 30,22,6,30 - fmadd 31,22,7,31 - srdi 0,26,16 - insrdi 24,26,16,16 - fmadd 8,23,6,8 - fmadd 9,23,7,9 - add 27,27,0 - ldu 26,16(10) - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - - fctid 24,24 - fctid 25,25 - srdi 0,28,16 - fctid 26,26 - fctid 27,27 - add 29,29,0 - fctid 28,28 - fctid 29,29 - srdi 0,29,16 - insrdi 28,29,16,32 - fctid 30,30 - fctid 31,31 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - - stfd 24,64(1) - stfd 25,72(1) - add 31,31,0 - addc 27,24,25 - stfd 26,80(1) - stfd 27,88(1) - insrdi 28,31,16,0 - srdi 0,31,16 - stfd 28,96(1) - stfd 29,104(1) - adde 29,28,26 - stfd 30,112(1) - stfd 31,120(1) - addze 0,0 - std 27,-16(10) - std 29,-8(10) - bdnz .Linner - - fctid 8,8 - fctid 9,9 - ld 24,64(1) - ld 25,72(1) - ld 26,80(1) - ld 27,88(1) - ld 28,96(1) - ld 29,104(1) - ld 30,112(1) - ld 31,120(1) - stfd 8,128(1) - stfd 9,136(1) - - add 24,24,0 - srdi 0,24,16 - add 25,25,0 - srdi 0,25,16 - insrdi 24,25,16,32 - add 26,26,0 - ld 25,8(10) - srdi 0,26,16 - insrdi 24,26,16,16 - add 27,27,0 - ldu 26,16(10) - srdi 0,27,16 - insrdi 24,27,16,0 - add 28,28,0 - srdi 0,28,16 - add 29,29,0 - srdi 0,29,16 - insrdi 28,29,16,32 - add 30,30,0 - srdi 0,30,16 - insrdi 28,30,16,16 - add 31,31,0 - insrdi 28,31,16,0 - srdi 0,31,16 - ld 30,128(1) - ld 31,136(1) - - addc 27,24,25 - adde 29,28,26 - addze 0,0 - - std 27,-16(10) - std 29,-8(10) - - add 0,0,3 - add 30,30,0 - srdi 0,30,16 - add 31,31,0 - insrdi 30,31,48,0 - srdi 3,31,48 - std 30,0(10) - slwi 31,8,2 - addi 12,12,8 - subf 22,31,22 - cmpw 12,8 - blt- .Louter - subf 6,8,6 - addi 11,11,1 - subfc 12,12,12 - addi 10,1,200 - addi 28,1,208 - addi 29,6,8 - addi 30,9,8 - mtctr 11 - -.align 4 -.Lsub: ldx 24,10,12 - ldx 25,6,12 - ldx 26,28,12 - ldx 27,29,12 - subfe 24,25,24 - subfe 26,27,26 - stdx 24,9,12 - stdx 26,30,12 - addi 12,12,16 - bdnz .Lsub - - li 12,0 - subfe 3,12,3 - mtctr 11 - -.align 4 -.Lcopy: - ldx 24,10,12 - ldx 25,28,12 - ldx 26,9,12 - ldx 27,30,12 - std 12,8(22) - std 12,16(22) - std 12,24(22) - std 12,32(22) - std 12,40(22) - std 12,48(22) - std 12,56(22) - stdu 12,64(22) - and 24,24,3 - and 25,25,3 - andc 26,26,3 - andc 27,27,3 - or 24,24,26 - or 25,25,27 - stdx 24,9,12 - stdx 25,30,12 - stdx 12,10,12 - stdx 12,28,12 - addi 12,12,16 - bdnz .Lcopy - ld 12,0(1) - li 3,1 - ld 19,-200(12) - ld 20,-192(12) - ld 21,-184(12) - ld 22,-176(12) - ld 23,-168(12) - ld 24,-160(12) - ld 25,-152(12) - ld 26,-144(12) - ld 27,-136(12) - ld 28,-128(12) - ld 29,-120(12) - ld 30,-112(12) - ld 31,-104(12) - lfd 20,-96(12) - lfd 21,-88(12) - lfd 22,-80(12) - lfd 23,-72(12) - lfd 24,-64(12) - lfd 25,-56(12) - lfd 26,-48(12) - lfd 27,-40(12) - lfd 28,-32(12) - lfd 29,-24(12) - lfd 30,-16(12) - lfd 31,-8(12) - mr 1,12 - blr -.long 0 -.byte 0,12,4,0,0x8c,13,6,0 -.long 0 -.size bn_mul_mont_fpu64,.-bn_mul_mont_fpu64 - -.byte 77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 2 diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h index e7003954bb1a42..1dbf68d3564b60 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Fri Sep 13 16:01:17 2019 UTC" +#define DATE "built on: Wed Mar 18 21:08:32 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm index a92bb250672e06..f007db765e180d 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc64le", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -239,6 +239,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3239,7 +3246,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3247,6 +3253,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3745,14 +3752,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4193,6 +4192,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4879,7 +4886,6 @@ our %unified_info = ( "crypto/aes/aes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes-s390x.o" => @@ -4893,49 +4899,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4945,7 +4943,6 @@ our %unified_info = ( "crypto/aes/aesp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4963,13 +4960,11 @@ our %unified_info = ( "crypto/aes/vpaes-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4983,613 +4978,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5607,188 +5500,157 @@ our %unified_info = ( "crypto/bn/bn-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5798,7 +5660,6 @@ our %unified_info = ( "crypto/bn/ppc-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5824,13 +5685,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5840,43 +5699,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5886,31 +5738,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5924,7 +5771,6 @@ our %unified_info = ( "crypto/chacha/chacha-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-s390x.o" => @@ -5934,272 +5780,227 @@ our %unified_info = ( "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6209,301 +6010,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,7 +6262,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6519,7 +6269,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6527,7 +6276,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6535,7 +6283,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6543,7 +6290,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6551,163 +6297,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6721,7 +6440,6 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-sparcv9.o" => @@ -6731,235 +6449,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6967,21 +6646,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6989,13 +6665,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7003,81 +6677,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7085,328 +6746,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7416,79 +7016,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7507,7 +7094,6 @@ our %unified_info = ( "crypto/modes/ghashp8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7517,361 +7103,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7889,13 +7415,11 @@ our %unified_info = ( "crypto/poly1305/poly1305-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-ppcfp.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7905,271 +7429,226 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccap.o" => [ ".", - "crypto/include", "include", ], "crypto/ppccpuid.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8179,31 +7658,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8213,7 +7687,6 @@ our %unified_info = ( "crypto/sha/keccak1600-ppc64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8231,7 +7704,6 @@ our %unified_info = ( "crypto/sha/sha1-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-s390x.o" => @@ -8245,13 +7717,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8269,7 +7739,6 @@ our %unified_info = ( "crypto/sha/sha256-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-s390x.o" => @@ -8283,13 +7752,11 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8307,7 +7774,6 @@ our %unified_info = ( "crypto/sha/sha512-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-s390x.o" => @@ -8321,715 +7787,596 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512p8-ppc.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9080,6 +8427,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9324,7 +8679,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9650,7 +9004,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9696,7 +9049,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9762,7 +9114,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9787,7 +9138,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9885,7 +9235,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9935,18 +9284,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9957,6 +9303,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10020,10 +9370,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10052,6 +9398,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10316,6 +9666,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15286,7 +14637,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15294,6 +14644,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15521,6 +14872,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15623,10 +14982,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15655,6 +15010,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h index e8e073c0d22a9f..2bb616361144e4 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Fri Sep 13 16:01:23 2019 UTC" +#define DATE "built on: Wed Mar 18 21:08:43 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm index 9d91dea1de5354..b63dcfe765aa5e 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-ppc64le", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -237,6 +237,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -355,8 +356,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -624,14 +625,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -707,6 +700,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1504,6 +1505,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3222,7 +3229,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3230,6 +3236,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3728,14 +3735,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4176,6 +4175,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4870,49 +4877,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4934,7 +4933,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4948,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5572,188 +5468,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5783,13 +5648,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5799,43 +5662,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5845,31 +5701,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5887,278 +5738,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6168,301 +5973,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6470,7 +6225,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6232,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6239,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6246,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,163 +6260,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6684,223 +6407,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6908,21 +6594,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6930,13 +6613,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6944,81 +6625,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7026,328 +6694,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7357,85 +6964,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7458,361 +7051,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7834,259 +7367,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8096,31 +7586,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8130,7 +7615,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8156,13 +7640,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8188,7 +7670,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8214,709 +7695,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8967,6 +8330,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9211,7 +8582,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9537,7 +8907,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9583,7 +8952,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9649,7 +9017,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9674,7 +9041,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9772,7 +9138,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9822,18 +9187,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9844,6 +9206,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9907,10 +9273,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9939,6 +9301,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10203,6 +9569,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15093,7 +14460,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15101,6 +14467,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15328,6 +14695,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15430,10 +14805,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15462,6 +14833,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h index aebc739df4d2c0..98bbd243c19c9a 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-ppc64le" -#define DATE "built on: Fri Sep 13 16:01:29 2019 UTC" +#define DATE "built on: Wed Mar 18 21:08:54 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h index 212e3f67d8e568..781ef739dc2274 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x32/asm/configdata.pm b/deps/openssl/config/archs/linux-x32/asm/configdata.pm index 58a473be95a3e6..87cae322cfb182 100644 --- a/deps/openssl/config/archs/linux-x32/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/asm/configdata.pm @@ -49,14 +49,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -112,8 +112,8 @@ our %config = ( sourcedir => ".", target => "linux-x32", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -241,6 +241,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -358,8 +359,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -627,14 +628,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -710,6 +703,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1507,6 +1508,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3261,7 +3268,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3269,6 +3275,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3767,14 +3774,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4215,6 +4214,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4909,49 +4916,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4961,25 +4960,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4997,13 +4992,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5017,613 +5010,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5637,7 +5528,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5647,182 +5537,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5832,19 +5692,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5870,31 +5727,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5904,37 +5756,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5944,31 +5790,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5986,278 +5827,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6267,301 +6062,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6569,7 +6314,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6577,7 +6321,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6585,7 +6328,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6593,7 +6335,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6601,7 +6342,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6609,163 +6349,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6783,241 +6496,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7025,21 +6698,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7047,13 +6717,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7061,81 +6729,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7143,328 +6798,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7474,91 +7068,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7577,7 +7156,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7587,361 +7165,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7963,265 +7481,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8231,31 +7705,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8265,7 +7734,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8279,7 +7747,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8297,19 +7764,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8323,7 +7787,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8341,13 +7804,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8373,727 +7834,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9144,6 +8484,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9388,7 +8736,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9714,7 +9061,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9760,7 +9106,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9826,7 +9171,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9851,7 +9195,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9949,7 +9292,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9999,18 +9341,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10021,6 +9360,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10084,10 +9427,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10116,6 +9455,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10380,6 +9723,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15385,7 +14729,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15393,6 +14736,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15620,6 +14964,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15722,10 +15074,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15754,6 +15102,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s deleted file mode 100644 index f0c1685fb93450..00000000000000 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2649 +0,0 @@ -.text -.type _x86_64_AES_encrypt,@function -.align 16 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Lenc_loop -.align 16 -.Lenc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz .Lenc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_encrypt,.-_x86_64_AES_encrypt -.type _x86_64_AES_encrypt_compact,@function -.align 16 -_x86_64_AES_encrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Lenc_loop_compact -.align 16 -.Lenc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Lenc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp .Lenc_loop_compact -.align 16 -.Lenc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -.globl asm_AES_encrypt -.hidden asm_AES_encrypt -asm_AES_encrypt: -AES_encrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Lenc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Lenc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_encrypt,.-AES_encrypt -.type _x86_64_AES_decrypt,@function -.align 16 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Ldec_loop -.align 16 -.Ldec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz .Ldec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_decrypt,.-_x86_64_AES_decrypt -.type _x86_64_AES_decrypt_compact,@function -.align 16 -_x86_64_AES_decrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Ldec_loop_compact - -.align 16 -.Ldec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Ldec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp .Ldec_loop_compact -.align 16 -.Ldec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -.globl asm_AES_decrypt -.hidden asm_AES_decrypt -asm_AES_decrypt: -AES_decrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Ldec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Ldec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_decrypt,.-AES_decrypt -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - subq $8,%rsp -.cfi_adjust_cfa_offset 8 -.Lenc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Lenc_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_encrypt_key,.-AES_set_encrypt_key - -.type _x86_64_AES_set_encrypt_key,@function -.align 16 -_x86_64_AES_set_encrypt_key: -.cfi_startproc - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz .Lbadpointer - testq $-1,%rdi - jz .Lbadpointer - - leaq .LAES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je .L10rounds - cmpl $192,%ecx - je .L12rounds - cmpl $256,%ecx - je .L14rounds - movq $-2,%rax - jmp .Lexit - -.L10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L10shortcut -.align 4 -.L10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -.L10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl .L10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L12shortcut -.align 4 -.L12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -.L12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je .L12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp .L12loop -.L12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L14shortcut -.align 4 -.L14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -.L14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je .L14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp .L14loop -.L14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp .Lexit - -.Lbadpointer: - movq $-1,%rax -.Lexit: -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - pushq %rdx -.cfi_adjust_cfa_offset 8 -.Ldec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne .Labort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.align 4 -.Linvert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne .Linvert - - leaq .LAES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.align 4 -.Lpermute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz .Lpermute - - xorq %rax,%rax -.Labort: - movq 8(%rsp),%r15 -.cfi_restore %r15 - movq 16(%rsp),%r14 -.cfi_restore %r14 - movq 24(%rsp),%r13 -.cfi_restore %r13 - movq 32(%rsp),%r12 -.cfi_restore %r12 - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Ldec_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_decrypt_key,.-AES_set_decrypt_key -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 - -.globl asm_AES_cbc_encrypt -.hidden asm_AES_cbc_encrypt -asm_AES_cbc_encrypt: -AES_cbc_encrypt: -.cfi_startproc - cmpq $0,%rdx - je .Lcbc_epilogue - pushfq - - -.cfi_adjust_cfa_offset 8 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-32 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-40 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-48 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-56 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-64 -.Lcbc_prologue: - - cld - movl %r9d,%r9d - - leaq .LAES_Te(%rip),%r14 - leaq .LAES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - -.cfi_remember_state - movl OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb .Lcbc_slow_prologue - testq $15,%rdx - jnz .Lcbc_slow_prologue - btl $28,%r10d - jc .Lcbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb .Lcbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp .Lcbc_te_ok -.Lcbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.align 4 -.Lcbc_te_ok: - - xchgq %rsp,%r15 -.cfi_def_cfa_register %r15 - - movq %r15,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb .Lcbc_do_ecopy - cmpq $4096-248,%r10 - jb .Lcbc_skip_ecopy -.align 4 -.Lcbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -.Lcbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.align 4 -.Lcbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz .Lcbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je .LFAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.align 4 -.Lcbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz .Lcbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_fast_cleanup - - -.align 16 -.LFAST_DECRYPT: - cmpq %r8,%r9 - je .Lcbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.align 4 -.Lcbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz .Lcbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp .Lcbc_fast_cleanup - -.align 16 -.Lcbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.align 4 -.Lcbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz .Lcbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp .Lcbc_fast_dec_in_place_loop -.Lcbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.align 4 -.Lcbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je .Lcbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp .Lcbc_exit - - -.align 16 -.Lcbc_slow_prologue: -.cfi_restore_state - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp -.cfi_def_cfa_register %rbp - - movq %rbp,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je .LSLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz .Lcbc_slow_enc_tail - -.align 4 -.Lcbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz .Lcbc_slow_enc_loop - testq $15,%r10 - jnz .Lcbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp .Lcbc_slow_enc_loop - -.align 16 -.LSLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.align 4 -.Lcbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc .Lcbc_slow_dec_partial - jz .Lcbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp .Lcbc_slow_dec_loop -.Lcbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp .Lcbc_exit - -.align 16 -.Lcbc_exit: - movq 16(%rsp),%rsi -.cfi_def_cfa %rsi,64 - movq (%rsi),%r15 -.cfi_restore %r15 - movq 8(%rsi),%r14 -.cfi_restore %r14 - movq 16(%rsi),%r13 -.cfi_restore %r13 - movq 24(%rsi),%r12 -.cfi_restore %r12 - movq 32(%rsi),%rbp -.cfi_restore %rbp - movq 40(%rsi),%rbx -.cfi_restore %rbx - leaq 48(%rsi),%rsp -.cfi_def_cfa %rsp,16 -.Lcbc_popfq: - popfq - - -.cfi_adjust_cfa_offset -8 -.Lcbc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_cbc_encrypt,.-AES_cbc_encrypt -.align 64 -.LAES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.align 64 -.LAES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 64 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s index 4d2dfe44898fd5..978bd2b6239c15 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha1_enc,@function .align 32 aesni_cbc_sha1_enc: +.cfi_startproc movl OPENSSL_ia32cap_P+0(%rip),%r10d movq OPENSSL_ia32cap_P+4(%rip),%r11 @@ -17,6 +18,7 @@ aesni_cbc_sha1_enc: je aesni_cbc_sha1_enc_avx jmp aesni_cbc_sha1_enc_ssse3 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc .type aesni_cbc_sha1_enc_ssse3,@function .align 32 @@ -2730,6 +2732,7 @@ K_XX_XX: .type aesni_cbc_sha1_enc_shaext,@function .align 32 aesni_cbc_sha1_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 @@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s index 5a47b3ee51b741..dd09f1b290af62 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha256_enc,@function .align 16 aesni_cbc_sha256_enc: +.cfi_startproc leaq OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -30,6 +31,7 @@ aesni_cbc_sha256_enc: ud2 .Lprobe: .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc .align 64 @@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi +.cfi_def_cfa %rsi,8 leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi .cfi_def_cfa %rsi,8 vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2: .type aesni_cbc_sha256_enc_shaext,@function .align 32 aesni_cbc_sha256_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 @@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s index 2986a647c1bb05..c1e791eff59235 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ aesni_ecb_encrypt: .type aesni_ccm64_encrypt_blocks,@function .align 16 aesni_ccm64_encrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa .Lincrement64(%rip),%xmm9 @@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks .globl aesni_ccm64_decrypt_blocks .type aesni_ccm64_decrypt_blocks,@function .align 16 aesni_ccm64_decrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks .globl aesni_ctr32_encrypt_blocks .type aesni_ctr32_encrypt_blocks,@function @@ -2790,6 +2794,7 @@ aesni_ocb_encrypt: .type __ocb_encrypt6,@function .align 32 __ocb_encrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2887,11 +2892,13 @@ __ocb_encrypt6: .byte 102,65,15,56,221,246 .byte 102,65,15,56,221,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt6,.-__ocb_encrypt6 .type __ocb_encrypt4,@function .align 32 __ocb_encrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2956,11 +2963,13 @@ __ocb_encrypt4: .byte 102,65,15,56,221,228 .byte 102,65,15,56,221,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt4,.-__ocb_encrypt4 .type __ocb_encrypt1,@function .align 32 __ocb_encrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2991,6 +3000,7 @@ __ocb_encrypt1: .byte 102,15,56,221,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt1,.-__ocb_encrypt1 .globl aesni_ocb_decrypt @@ -3233,6 +3243,7 @@ aesni_ocb_decrypt: .type __ocb_decrypt6,@function .align 32 __ocb_decrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3324,11 +3335,13 @@ __ocb_decrypt6: .byte 102,65,15,56,223,246 .byte 102,65,15,56,223,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt6,.-__ocb_decrypt6 .type __ocb_decrypt4,@function .align 32 __ocb_decrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3389,11 +3402,13 @@ __ocb_decrypt4: .byte 102,65,15,56,223,228 .byte 102,65,15,56,223,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt4,.-__ocb_decrypt4 .type __ocb_decrypt1,@function .align 32 __ocb_decrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3423,6 +3438,7 @@ __ocb_decrypt1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt1,.-__ocb_decrypt1 .globl aesni_cbc_encrypt .type aesni_cbc_encrypt,@function @@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key: addq $8,%rsp .cfi_adjust_cfa_offset -8 .byte 0xf3,0xc3 -.cfi_endproc .LSEH_end_set_encrypt_key: .align 16 @@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key: shufps $170,%xmm1,%xmm1 xorps %xmm1,%xmm2 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_set_encrypt_key,.-aesni_set_encrypt_key .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key .align 64 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index e1f3abadbc7214..00000000000000 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2595 +0,0 @@ -.text - - - - -.type _bsaes_encrypt8,@function -.align 64 -_bsaes_encrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Lenc_sbox -.align 16 -.Lenc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Lenc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl .Lenc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz .Lenc_loop - movdqa 64(%r11),%xmm7 - jmp .Lenc_loop -.align 16 -.Lenc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_encrypt8,.-_bsaes_encrypt8 - -.type _bsaes_decrypt8,@function -.align 64 -_bsaes_decrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Ldec_sbox -.align 16 -.Ldec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Ldec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl .Ldec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz .Ldec_loop - movdqa -32(%r11),%xmm7 - jmp .Ldec_loop -.align 16 -.Ldec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_decrypt8,.-_bsaes_decrypt8 -.type _bsaes_key_convert,@function -.align 16 -_bsaes_key_convert: -.cfi_startproc - leaq .Lmasks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp .Lkey_loop -.align 16 -.Lkey_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz .Lkey_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_key_convert,.-_bsaes_key_convert - -.globl bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,@function -.align 16 -bsaes_cbc_encrypt: -.cfi_startproc - cmpl $0,%r9d - jne asm_AES_cbc_encrypt - cmpq $128,%rdx - jb asm_AES_cbc_encrypt - - movq %rsp,%rax -.Lcbc_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -.Lcbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc .Lcbc_dec_loop - - addq $8,%r14 - jz .Lcbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb .Lcbc_dec_one - movdqu 16(%r12),%xmm0 - je .Lcbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb .Lcbc_dec_three - movdqu 48(%r12),%xmm2 - je .Lcbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb .Lcbc_dec_five - movdqu 80(%r12),%xmm4 - je .Lcbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -.Lcbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lcbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lcbc_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lcbc_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt - -.globl bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,@function -.align 16 -bsaes_ctr32_encrypt_blocks: -.cfi_startproc - movq %rsp,%rax -.Lctr_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb .Lctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq .LADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp .Lctr_enc_loop -.align 16 -.Lctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq .LBS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc .Lctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq .LADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz .Lctr_enc_loop - - jmp .Lctr_enc_done -.align 16 -.Lctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb .Lctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je .Lctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb .Lctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je .Lctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb .Lctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je .Lctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp .Lctr_enc_done - -.align 16 -.Lctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz .Lctr_enc_short - -.Lctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lctr_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lctr_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,@function -.align 16 -bsaes_xts_encrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_enc_short - jmp .Lxts_enc_loop - -.align 16 -.Lxts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_enc_loop - -.Lxts_enc_short: - addq $0x80,%r14 - jz .Lxts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_enc_done: - andl $15,%ebx - jz .Lxts_enc_ret - movq %r13,%rdx - -.Lxts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -.Lxts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt - -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,@function -.align 16 -bsaes_xts_decrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_dec_short - jmp .Lxts_dec_loop - -.align 16 -.Lxts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_dec_loop - -.Lxts_dec_short: - addq $0x80,%r14 - jz .Lxts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_dec_done: - andl $15,%ebx - jz .Lxts_dec_ret - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -.Lxts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -.Lxts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt -.type _bsaes_const,@object -.align 64 -_bsaes_const: -.LM0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -.LISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -.LISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -.LBS0: -.quad 0x5555555555555555, 0x5555555555555555 -.LBS1: -.quad 0x3333333333333333, 0x3333333333333333 -.LBS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -.LSR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -.LSRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -.LM0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -.LSWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -.LSWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -.LADD1: -.quad 0x0000000000000000, 0x0000000100000000 -.LADD2: -.quad 0x0000000000000000, 0x0000000200000000 -.LADD3: -.quad 0x0000000000000000, 0x0000000300000000 -.LADD4: -.quad 0x0000000000000000, 0x0000000400000000 -.LADD5: -.quad 0x0000000000000000, 0x0000000500000000 -.LADD6: -.quad 0x0000000000000000, 0x0000000600000000 -.LADD7: -.quad 0x0000000000000000, 0x0000000700000000 -.LADD8: -.quad 0x0000000000000000, 0x0000000800000000 -.Lxts_magic: -.long 0x87,0,1,0 -.Lmasks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -.LM0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -.L63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.align 64 -.size _bsaes_const,.-_bsaes_const diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s index f8e4a805887366..7876e0b8f93d9c 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s @@ -29,7 +29,7 @@ rsaz_512_sqr: subq $128+24,%rsp .cfi_adjust_cfa_offset 128+24 .Lsqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -44,6 +44,7 @@ rsaz_512_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -82,31 +83,29 @@ rsaz_512_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -114,7 +113,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -122,7 +121,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -130,7 +129,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -138,39 +137,39 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -178,7 +177,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -186,9 +185,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -196,36 +193,40 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -234,9 +235,8 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -245,32 +245,33 @@ rsaz_512_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -278,97 +279,99 @@ rsaz_512_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -378,6 +381,10 @@ rsaz_512_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -406,9 +413,9 @@ rsaz_512_sqr: .Loop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -416,40 +423,39 @@ rsaz_512_sqr: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -467,24 +473,25 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -492,7 +499,7 @@ rsaz_512_sqr: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -500,27 +507,28 @@ rsaz_512_sqr: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -535,25 +543,25 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -564,18 +572,19 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -588,18 +597,19 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -609,31 +619,31 @@ rsaz_512_sqr: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -647,6 +657,9 @@ rsaz_512_sqr: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one: .type __rsaz_512_reduce,@function .align 32 __rsaz_512_reduce: +.cfi_startproc movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1519,10 +1533,12 @@ __rsaz_512_reduce: jne .Lreduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reduce,.-__rsaz_512_reduce .type __rsaz_512_reducex,@function .align 32 __rsaz_512_reducex: +.cfi_startproc imulq %r8,%rdx xorq %rsi,%rsi @@ -1575,10 +1591,12 @@ __rsaz_512_reducex: jne .Lreduction_loopx .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reducex,.-__rsaz_512_reducex .type __rsaz_512_subtract,@function .align 32 __rsaz_512_subtract: +.cfi_startproc movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1632,10 +1650,12 @@ __rsaz_512_subtract: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_subtract,.-__rsaz_512_subtract .type __rsaz_512_mul,@function .align 32 __rsaz_512_mul: +.cfi_startproc leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1774,10 +1794,12 @@ __rsaz_512_mul: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mul,.-__rsaz_512_mul .type __rsaz_512_mulx,@function .align 32 __rsaz_512_mulx: +.cfi_startproc mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1894,11 +1916,13 @@ __rsaz_512_mulx: movq %r15,8+64+56(%rsp) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mulx,.-__rsaz_512_mulx .globl rsaz_512_scatter4 .type rsaz_512_scatter4,@function .align 16 rsaz_512_scatter4: +.cfi_startproc leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp .Loop_scatter @@ -1911,12 +1935,14 @@ rsaz_512_scatter4: decl %r9d jnz .Loop_scatter .byte 0xf3,0xc3 +.cfi_endproc .size rsaz_512_scatter4,.-rsaz_512_scatter4 .globl rsaz_512_gather4 .type rsaz_512_gather4,@function .align 16 rsaz_512_gather4: +.cfi_startproc movd %edx,%xmm8 movdqa .Linc+16(%rip),%xmm1 movdqa .Linc(%rip),%xmm0 @@ -1980,6 +2006,7 @@ rsaz_512_gather4: jnz .Loop_gather .byte 0xf3,0xc3 .LSEH_end_rsaz_512_gather4: +.cfi_endproc .size rsaz_512_gather4,.-rsaz_512_gather4 .align 64 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s index df4b6610a02a47..40a60a3c8fc6b9 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ bn_mul4x_mont_gather5: .type mul4x_internal,@function .align 32 mul4x_internal: +.cfi_startproc shlq $5,%r9 movd 8(%rax),%xmm5 leaq .Linc(%rip),%rax @@ -1071,6 +1072,7 @@ mul4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqr4x_sub_entry +.cfi_endproc .size mul4x_internal,.-mul4x_internal .globl bn_power5 .type bn_power5,@function @@ -1213,6 +1215,7 @@ bn_power5: .align 32 bn_sqr8x_internal: __bn_sqr8x_internal: +.cfi_startproc @@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction: cmpq %rdx,%rdi jb .L8x_reduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size bn_sqr8x_internal,.-bn_sqr8x_internal .type __bn_post4x_internal,@function .align 32 __bn_post4x_internal: +.cfi_startproc movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2041,15 +2046,18 @@ __bn_post4x_internal: movq %r9,%r10 negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_post4x_internal,.-__bn_post4x_internal .globl bn_from_montgomery .type bn_from_montgomery,@function .align 32 bn_from_montgomery: +.cfi_startproc testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_from_montgomery,.-bn_from_montgomery .type bn_from_mont8x,@function @@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5: .type mulx4x_internal,@function .align 32 mulx4x_internal: +.cfi_startproc movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2751,6 +2760,7 @@ mulx4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqrx4x_sub_entry +.cfi_endproc .size mulx4x_internal,.-mulx4x_internal .type bn_powerx5,@function .align 32 @@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction: .size bn_sqrx8x_internal,.-bn_sqrx8x_internal .align 32 __bn_postx4x_internal: +.cfi_startproc movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3556,11 +3567,13 @@ __bn_postx4x_internal: negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_postx4x_internal,.-__bn_postx4x_internal .globl bn_get_bits5 .type bn_get_bits5,@function .align 16 bn_get_bits5: +.cfi_startproc leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3574,12 +3587,14 @@ bn_get_bits5: shrl %cl,%eax andl $31,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_get_bits5,.-bn_get_bits5 .globl bn_scatter5 .type bn_scatter5,@function .align 16 bn_scatter5: +.cfi_startproc cmpl $0,%esi jz .Lscatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3592,6 +3607,7 @@ bn_scatter5: jnz .Lscatter .Lscatter_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size bn_scatter5,.-bn_scatter5 .globl bn_gather5 @@ -3599,6 +3615,7 @@ bn_scatter5: .align 32 bn_gather5: .LSEH_begin_bn_gather5: +.cfi_startproc .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 @@ -3756,6 +3773,7 @@ bn_gather5: leaq (%r10),%rsp .byte 0xf3,0xc3 .LSEH_end_bn_gather5: +.cfi_endproc .size bn_gather5,.-bn_gather5 .align 64 .Linc: diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h index c9b1f198949916..2dbe97005cf8ad 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x32" -#define DATE "built on: Fri Sep 13 15:59:43 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:40 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -37,10 +37,10 @@ static const char compiler_flags[] = { 'M',' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-', 'D','K','E','C','C','A','K','1','6','0','0','_','A','S','M',' ', '-','D','R','C','4','_','A','S','M',' ','-','D','M','D','5','_', - 'A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ', - '-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C', - 'P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-', - 'D','X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O', - 'L','Y','1','3','0','5','_','A','S','M',' ','-','D','N','D','E', - 'B','U','G','\0' + 'A','S','M',' ','-','D','A','E','S','N','I','_','A','S','M',' ', + '-','D','V','P','A','E','S','_','A','S','M',' ','-','D','G','H', + 'A','S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I', + 'S','T','Z','2','5','6','_','A','S','M',' ','-','D','X','2','5', + '5','1','9','_','A','S','M',' ','-','D','P','O','L','Y','1','3', + '0','5','_','A','S','M',' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s index 405566b01cca6f..eeb20dd2291da7 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s @@ -5,11 +5,13 @@ .type Camellia_EncryptBlock,@function .align 16 Camellia_EncryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Lenc_rounds +.cfi_endproc .size Camellia_EncryptBlock,.-Camellia_EncryptBlock .globl Camellia_EncryptBlock_Rounds @@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds: .type _x86_64_Camellia_encrypt,@function .align 16 _x86_64_Camellia_encrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt: movl %edx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt @@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt: .type Camellia_DecryptBlock,@function .align 16 Camellia_DecryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Ldec_rounds +.cfi_endproc .size Camellia_DecryptBlock,.-Camellia_DecryptBlock .globl Camellia_DecryptBlock_Rounds @@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds: .type _x86_64_Camellia_decrypt,@function .align 16 _x86_64_Camellia_decrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt: movl %ebx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt .globl Camellia_Ekeygen .type Camellia_Ekeygen,@function diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s index 62b9ac6616ba72..5c9e4050416212 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx: .type ecp_nistz256_to_mont,@function .align 32 ecp_nistz256_to_mont: +.cfi_startproc movl $0x80100,%ecx andl OPENSSL_ia32cap_P+8(%rip),%ecx leaq .LRR(%rip),%rdx jmp .Lmul_mont +.cfi_endproc .size ecp_nistz256_to_mont,.-ecp_nistz256_to_mont @@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont: .type ecp_nistz256_scatter_w5,@function .align 32 ecp_nistz256_scatter_w5: +.cfi_startproc leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5: movdqa %xmm5,80(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5 @@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5: .type ecp_nistz256_scatter_w7,@function .align 32 ecp_nistz256_scatter_w7: +.cfi_startproc movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7: movdqa %xmm3,48(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7 @@ -5655,26 +5661,16 @@ ecp_nistz256_point_add: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedq - testq %r9,%r9 - jz .Ladd_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedq -.align 32 .Ladd_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedx - testq %r9,%r9 - jz .Ladd_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedx -.align 32 .Ladd_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s index 2a18eaee288ce7..1788e568cda5d2 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s @@ -400,12 +400,14 @@ x25519_fe51_mul121666: .type x25519_fe64_eligible,@function .align 32 x25519_fe64_eligible: +.cfi_startproc movl OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx cmpl $0x80100,%ecx cmovel %ecx,%eax .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_eligible,.-x25519_fe64_eligible .globl x25519_fe64_mul @@ -648,6 +650,7 @@ x25519_fe64_sqr: .align 32 x25519_fe64_mul121666: .Lfe64_mul121666_body: +.cfi_startproc movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -676,6 +679,7 @@ x25519_fe64_mul121666: .Lfe64_mul121666_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_mul121666,.-x25519_fe64_mul121666 .globl x25519_fe64_add @@ -683,6 +687,7 @@ x25519_fe64_mul121666: .align 32 x25519_fe64_add: .Lfe64_add_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -711,6 +716,7 @@ x25519_fe64_add: .Lfe64_add_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_add,.-x25519_fe64_add .globl x25519_fe64_sub @@ -718,6 +724,7 @@ x25519_fe64_add: .align 32 x25519_fe64_sub: .Lfe64_sub_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -746,6 +753,7 @@ x25519_fe64_sub: .Lfe64_sub_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_sub,.-x25519_fe64_sub .globl x25519_fe64_tobytes @@ -753,6 +761,7 @@ x25519_fe64_sub: .align 32 x25519_fe64_tobytes: .Lfe64_to_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -788,5 +797,6 @@ x25519_fe64_tobytes: .Lfe64_to_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_tobytes,.-x25519_fe64_tobytes .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h index 0d071bda66fd8e..93f75e2e1512cb 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s index 6a7a9577c7142f..01d89630a42f73 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .type _aesni_ctr32_ghash_6x,@function .align 32 _aesni_ctr32_ghash_6x: +.cfi_startproc vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x: vpxor %xmm4,%xmm8,%xmm8 .byte 0xf3,0xc3 +.cfi_endproc .size _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x .globl aesni_gcm_decrypt .type aesni_gcm_decrypt,@function @@ -416,6 +418,7 @@ aesni_gcm_decrypt: .type _aesni_ctr32_6x,@function .align 32 _aesni_ctr32_6x: +.cfi_startproc vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -502,6 +505,7 @@ _aesni_ctr32_6x: vpshufb %xmm0,%xmm1,%xmm1 vpxor %xmm4,%xmm14,%xmm14 jmp .Loop_ctr32 +.cfi_endproc .size _aesni_ctr32_6x,.-_aesni_ctr32_6x .globl aesni_gcm_encrypt diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s index 0e08513b6637c9..0cdd406e84740d 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .type poly1305_init,@function .align 32 poly1305_init: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -47,6 +48,7 @@ poly1305_init: movl $1,%eax .Lno_key: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init,.-poly1305_init .type poly1305_blocks,@function @@ -167,6 +169,7 @@ poly1305_blocks: .type poly1305_emit,@function .align 32 poly1305_emit: +.cfi_startproc .Lemit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -187,10 +190,12 @@ poly1305_emit: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit,.-poly1305_emit .type __poly1305_block,@function .align 32 __poly1305_block: +.cfi_startproc mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -230,11 +235,13 @@ __poly1305_block: adcq $0,%rbx adcq $0,%rbp .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_block,.-__poly1305_block .type __poly1305_init_avx,@function .align 32 __poly1305_init_avx: +.cfi_startproc movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -392,6 +399,7 @@ __poly1305_init_avx: leaq -48-64(%rdi),%rdi .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_init_avx,.-__poly1305_init_avx .type poly1305_blocks_avx,@function @@ -1232,6 +1240,7 @@ poly1305_blocks_avx: .type poly1305_emit_avx,@function .align 32 poly1305_emit_avx: +.cfi_startproc cmpl $0,20(%rdi) je .Lemit @@ -1282,6 +1291,7 @@ poly1305_emit_avx: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_avx,.-poly1305_emit_avx .type poly1305_blocks_avx2,@function .align 32 @@ -2478,6 +2488,7 @@ poly1305_blocks_avx512: .type poly1305_init_base2_44,@function .align 32 poly1305_init_base2_44: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -2511,10 +2522,12 @@ poly1305_init_base2_44: movl %r11d,4(%rdx) movl $1,%eax .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init_base2_44,.-poly1305_init_base2_44 .type poly1305_blocks_vpmadd52,@function .align 32 poly1305_blocks_vpmadd52: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52 @@ -2621,10 +2634,12 @@ poly1305_blocks_vpmadd52: .Lno_data_vpmadd52: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52 .type poly1305_blocks_vpmadd52_4x,@function .align 32 poly1305_blocks_vpmadd52_4x: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52_4x @@ -3049,10 +3064,12 @@ poly1305_blocks_vpmadd52_4x: .Lno_data_vpmadd52_4x: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x .type poly1305_blocks_vpmadd52_8x,@function .align 32 poly1305_blocks_vpmadd52_8x: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52_8x @@ -3393,10 +3410,12 @@ poly1305_blocks_vpmadd52_8x: .Lno_data_vpmadd52_8x: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x .type poly1305_emit_base2_44,@function .align 32 poly1305_emit_base2_44: +.cfi_startproc movq 0(%rdi),%r8 movq 8(%rdi),%r9 movq 16(%rdi),%r10 @@ -3427,6 +3446,7 @@ poly1305_emit_base2_44: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_base2_44,.-poly1305_emit_base2_44 .align 64 .Lconst: @@ -3465,6 +3485,7 @@ poly1305_emit_base2_44: .type xor128_encrypt_n_pad,@function .align 16 xor128_encrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -3506,12 +3527,14 @@ xor128_encrypt_n_pad: .Ldone_enc: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_encrypt_n_pad,.-xor128_encrypt_n_pad .globl xor128_decrypt_n_pad .type xor128_decrypt_n_pad,@function .align 16 xor128_decrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -3557,4 +3580,5 @@ xor128_decrypt_n_pad: .Ldone_dec: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_decrypt_n_pad,.-xor128_decrypt_n_pad diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s index fba70351d48d5c..b97c757550aad0 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl RC4 .type RC4,@function .align 16 -RC4: orq %rsi,%rsi +RC4: +.cfi_startproc + orq %rsi,%rsi jne .Lentry .byte 0xf3,0xc3 .Lentry: -.cfi_startproc pushq %rbx .cfi_adjust_cfa_offset 8 .cfi_offset %rbx,-16 @@ -533,6 +534,7 @@ RC4: orq %rsi,%rsi .type RC4_set_key,@function .align 16 RC4_set_key: +.cfi_startproc leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -599,12 +601,14 @@ RC4_set_key: movl %eax,-8(%rdi) movl %eax,-4(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size RC4_set_key,.-RC4_set_key .globl RC4_options .type RC4_options,@function .align 16 RC4_options: +.cfi_startproc leaq .Lopts(%rip),%rax movl OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -617,6 +621,7 @@ RC4_options: addq $12,%rax .Ldone: .byte 0xf3,0xc3 +.cfi_endproc .align 64 .Lopts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s index e511f25035b2b8..09617d014bdb7b 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .type __KeccakF1600,@function .align 32 __KeccakF1600: +.cfi_startproc movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -255,6 +256,7 @@ __KeccakF1600: leaq -192(%r15),%r15 .byte 0xf3,0xc3 +.cfi_endproc .size __KeccakF1600,.-__KeccakF1600 .type KeccakF1600,@function diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s index e436521a040f66..98541727e555da 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s @@ -1421,8 +1421,8 @@ _shaext_shortcut: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) -.cfi_endproc .byte 0xf3,0xc3 +.cfi_endproc .size sha1_block_data_order_shaext,.-sha1_block_data_order_shaext .type sha1_block_data_order_ssse3,@function .align 16 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s index 42b24df18e5afe..9357385da3c49b 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .align 64 sha256_block_data_order_shaext: _shaext_shortcut: +.cfi_startproc leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1977,6 +1978,7 @@ _shaext_shortcut: movdqu %xmm1,(%rdi) movdqu %xmm2,16(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size sha256_block_data_order_shaext,.-sha256_block_data_order_shaext .type sha256_block_data_order_ssse3,@function .align 64 @@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2: leaq 448(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08 + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s index 5931a2a93234d0..939f1ca71c9394 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2: leaq 1152(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08 + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s index fd17eaaba49576..9268ce8c9a9d63 100644 --- a/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s @@ -12,6 +12,7 @@ .type OPENSSL_atomic_add,@function .align 16 OPENSSL_atomic_add: +.cfi_startproc movl (%rdi),%eax .Lspin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -20,16 +21,19 @@ OPENSSL_atomic_add: movl %r8d,%eax .byte 0x48,0x98 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_atomic_add,.-OPENSSL_atomic_add .globl OPENSSL_rdtsc .type OPENSSL_rdtsc,@function .align 16 OPENSSL_rdtsc: +.cfi_startproc rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_rdtsc,.-OPENSSL_rdtsc .globl OPENSSL_ia32_cpuid @@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid: .type OPENSSL_cleanse,@function .align 16 OPENSSL_cleanse: +.cfi_startproc xorq %rax,%rax cmpq $15,%rsi jae .Lot @@ -234,12 +239,14 @@ OPENSSL_cleanse: cmpq $0,%rsi jne .Little .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_cleanse,.-OPENSSL_cleanse .globl CRYPTO_memcmp .type CRYPTO_memcmp,@function .align 16 CRYPTO_memcmp: +.cfi_startproc xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -268,11 +275,13 @@ CRYPTO_memcmp: shrq $63,%rax .Lno_data: .byte 0xf3,0xc3 +.cfi_endproc .size CRYPTO_memcmp,.-CRYPTO_memcmp .globl OPENSSL_wipe_cpu .type OPENSSL_wipe_cpu,@function .align 16 OPENSSL_wipe_cpu: +.cfi_startproc pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -299,11 +308,13 @@ OPENSSL_wipe_cpu: xorq %r11,%r11 leaq 8(%rsp),%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu .globl OPENSSL_instrument_bus .type OPENSSL_instrument_bus,@function .align 16 OPENSSL_instrument_bus: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -330,12 +341,14 @@ OPENSSL_instrument_bus: movq %r11,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus .globl OPENSSL_instrument_bus2 .type OPENSSL_instrument_bus2,@function .align 16 OPENSSL_instrument_bus2: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -378,11 +391,13 @@ OPENSSL_instrument_bus2: movq 8(%rsp),%rax subq %rcx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 .globl OPENSSL_ia32_rdrand_bytes .type OPENSSL_ia32_rdrand_bytes,@function .align 16 OPENSSL_ia32_rdrand_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdrand_bytes @@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes: .Ldone_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes .globl OPENSSL_ia32_rdseed_bytes .type OPENSSL_ia32_rdseed_bytes,@function .align 16 OPENSSL_ia32_rdseed_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdseed_bytes @@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes: .Ldone_rdseed_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes diff --git a/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h index 7dda69d359d2ac..992473943e5da4 100644 --- a/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-x32/asm/include/progs.h b/deps/openssl/config/archs/linux-x32/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-x32/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x32/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi index 859eb1a3691ebf..8e2deecf8481f7 100644 --- a/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi @@ -16,6 +16,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x32/asm/openssl.gypi b/deps/openssl/config/archs/linux-x32/asm/openssl.gypi index 5faef9c0e48f51..98d69c56a70e8b 100644 --- a/deps/openssl/config/archs/linux-x32/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x32/asm/openssl.gypi @@ -723,6 +723,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm index c85073cdc5ea14..73d49d831b99b4 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm @@ -49,14 +49,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -112,8 +112,8 @@ our %config = ( sourcedir => ".", target => "linux-x32", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -241,6 +241,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -358,8 +359,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -627,14 +628,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -710,6 +703,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1507,6 +1508,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3261,7 +3268,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3269,6 +3275,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3767,14 +3774,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4215,6 +4214,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4909,49 +4916,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4961,25 +4960,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4997,13 +4992,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5017,613 +5010,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5637,7 +5528,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5647,182 +5537,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5832,19 +5692,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5870,31 +5727,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5904,37 +5756,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5944,31 +5790,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5986,278 +5827,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6267,301 +6062,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6569,7 +6314,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6577,7 +6321,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6585,7 +6328,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6593,7 +6335,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6601,7 +6342,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6609,163 +6349,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6783,241 +6496,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7025,21 +6698,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7047,13 +6717,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7061,81 +6729,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7143,328 +6798,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7474,91 +7068,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7577,7 +7156,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7587,361 +7165,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7963,265 +7481,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8231,31 +7705,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8265,7 +7734,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8279,7 +7747,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8297,19 +7764,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8323,7 +7787,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8341,13 +7804,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8373,727 +7834,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9144,6 +8484,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9388,7 +8736,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9714,7 +9061,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9760,7 +9106,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9826,7 +9171,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9851,7 +9195,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9949,7 +9292,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9999,18 +9341,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10021,6 +9360,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10084,10 +9427,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10116,6 +9455,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10380,6 +9723,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15385,7 +14729,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15393,6 +14736,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15620,6 +14964,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15722,10 +15074,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15754,6 +15102,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aes-x86_64.s deleted file mode 100644 index f0c1685fb93450..00000000000000 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2649 +0,0 @@ -.text -.type _x86_64_AES_encrypt,@function -.align 16 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Lenc_loop -.align 16 -.Lenc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz .Lenc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_encrypt,.-_x86_64_AES_encrypt -.type _x86_64_AES_encrypt_compact,@function -.align 16 -_x86_64_AES_encrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Lenc_loop_compact -.align 16 -.Lenc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Lenc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp .Lenc_loop_compact -.align 16 -.Lenc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -.globl asm_AES_encrypt -.hidden asm_AES_encrypt -asm_AES_encrypt: -AES_encrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Lenc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Lenc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_encrypt,.-AES_encrypt -.type _x86_64_AES_decrypt,@function -.align 16 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Ldec_loop -.align 16 -.Ldec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz .Ldec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_decrypt,.-_x86_64_AES_decrypt -.type _x86_64_AES_decrypt_compact,@function -.align 16 -_x86_64_AES_decrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Ldec_loop_compact - -.align 16 -.Ldec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Ldec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp .Ldec_loop_compact -.align 16 -.Ldec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -.globl asm_AES_decrypt -.hidden asm_AES_decrypt -asm_AES_decrypt: -AES_decrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Ldec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Ldec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_decrypt,.-AES_decrypt -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - subq $8,%rsp -.cfi_adjust_cfa_offset 8 -.Lenc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Lenc_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_encrypt_key,.-AES_set_encrypt_key - -.type _x86_64_AES_set_encrypt_key,@function -.align 16 -_x86_64_AES_set_encrypt_key: -.cfi_startproc - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz .Lbadpointer - testq $-1,%rdi - jz .Lbadpointer - - leaq .LAES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je .L10rounds - cmpl $192,%ecx - je .L12rounds - cmpl $256,%ecx - je .L14rounds - movq $-2,%rax - jmp .Lexit - -.L10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L10shortcut -.align 4 -.L10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -.L10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl .L10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L12shortcut -.align 4 -.L12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -.L12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je .L12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp .L12loop -.L12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L14shortcut -.align 4 -.L14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -.L14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je .L14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp .L14loop -.L14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp .Lexit - -.Lbadpointer: - movq $-1,%rax -.Lexit: -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - pushq %rdx -.cfi_adjust_cfa_offset 8 -.Ldec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne .Labort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.align 4 -.Linvert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne .Linvert - - leaq .LAES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.align 4 -.Lpermute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz .Lpermute - - xorq %rax,%rax -.Labort: - movq 8(%rsp),%r15 -.cfi_restore %r15 - movq 16(%rsp),%r14 -.cfi_restore %r14 - movq 24(%rsp),%r13 -.cfi_restore %r13 - movq 32(%rsp),%r12 -.cfi_restore %r12 - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Ldec_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_decrypt_key,.-AES_set_decrypt_key -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 - -.globl asm_AES_cbc_encrypt -.hidden asm_AES_cbc_encrypt -asm_AES_cbc_encrypt: -AES_cbc_encrypt: -.cfi_startproc - cmpq $0,%rdx - je .Lcbc_epilogue - pushfq - - -.cfi_adjust_cfa_offset 8 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-32 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-40 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-48 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-56 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-64 -.Lcbc_prologue: - - cld - movl %r9d,%r9d - - leaq .LAES_Te(%rip),%r14 - leaq .LAES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - -.cfi_remember_state - movl OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb .Lcbc_slow_prologue - testq $15,%rdx - jnz .Lcbc_slow_prologue - btl $28,%r10d - jc .Lcbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb .Lcbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp .Lcbc_te_ok -.Lcbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.align 4 -.Lcbc_te_ok: - - xchgq %rsp,%r15 -.cfi_def_cfa_register %r15 - - movq %r15,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb .Lcbc_do_ecopy - cmpq $4096-248,%r10 - jb .Lcbc_skip_ecopy -.align 4 -.Lcbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -.Lcbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.align 4 -.Lcbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz .Lcbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je .LFAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.align 4 -.Lcbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz .Lcbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_fast_cleanup - - -.align 16 -.LFAST_DECRYPT: - cmpq %r8,%r9 - je .Lcbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.align 4 -.Lcbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz .Lcbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp .Lcbc_fast_cleanup - -.align 16 -.Lcbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.align 4 -.Lcbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz .Lcbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp .Lcbc_fast_dec_in_place_loop -.Lcbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.align 4 -.Lcbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je .Lcbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp .Lcbc_exit - - -.align 16 -.Lcbc_slow_prologue: -.cfi_restore_state - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp -.cfi_def_cfa_register %rbp - - movq %rbp,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je .LSLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz .Lcbc_slow_enc_tail - -.align 4 -.Lcbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz .Lcbc_slow_enc_loop - testq $15,%r10 - jnz .Lcbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp .Lcbc_slow_enc_loop - -.align 16 -.LSLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.align 4 -.Lcbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc .Lcbc_slow_dec_partial - jz .Lcbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp .Lcbc_slow_dec_loop -.Lcbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp .Lcbc_exit - -.align 16 -.Lcbc_exit: - movq 16(%rsp),%rsi -.cfi_def_cfa %rsi,64 - movq (%rsi),%r15 -.cfi_restore %r15 - movq 8(%rsi),%r14 -.cfi_restore %r14 - movq 16(%rsi),%r13 -.cfi_restore %r13 - movq 24(%rsi),%r12 -.cfi_restore %r12 - movq 32(%rsi),%rbp -.cfi_restore %rbp - movq 40(%rsi),%rbx -.cfi_restore %rbx - leaq 48(%rsi),%rsp -.cfi_def_cfa %rsp,16 -.Lcbc_popfq: - popfq - - -.cfi_adjust_cfa_offset -8 -.Lcbc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_cbc_encrypt,.-AES_cbc_encrypt -.align 64 -.LAES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.align 64 -.LAES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 64 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s index 4d2dfe44898fd5..978bd2b6239c15 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha1_enc,@function .align 32 aesni_cbc_sha1_enc: +.cfi_startproc movl OPENSSL_ia32cap_P+0(%rip),%r10d movq OPENSSL_ia32cap_P+4(%rip),%r11 @@ -17,6 +18,7 @@ aesni_cbc_sha1_enc: je aesni_cbc_sha1_enc_avx jmp aesni_cbc_sha1_enc_ssse3 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc .type aesni_cbc_sha1_enc_ssse3,@function .align 32 @@ -2730,6 +2732,7 @@ K_XX_XX: .type aesni_cbc_sha1_enc_shaext,@function .align 32 aesni_cbc_sha1_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 @@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s index 5a47b3ee51b741..dd09f1b290af62 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha256_enc,@function .align 16 aesni_cbc_sha256_enc: +.cfi_startproc leaq OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -30,6 +31,7 @@ aesni_cbc_sha256_enc: ud2 .Lprobe: .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc .align 64 @@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi +.cfi_def_cfa %rsi,8 leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi .cfi_def_cfa %rsi,8 vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2: .type aesni_cbc_sha256_enc_shaext,@function .align 32 aesni_cbc_sha256_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 @@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s index 2986a647c1bb05..c1e791eff59235 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ aesni_ecb_encrypt: .type aesni_ccm64_encrypt_blocks,@function .align 16 aesni_ccm64_encrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa .Lincrement64(%rip),%xmm9 @@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks .globl aesni_ccm64_decrypt_blocks .type aesni_ccm64_decrypt_blocks,@function .align 16 aesni_ccm64_decrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks .globl aesni_ctr32_encrypt_blocks .type aesni_ctr32_encrypt_blocks,@function @@ -2790,6 +2794,7 @@ aesni_ocb_encrypt: .type __ocb_encrypt6,@function .align 32 __ocb_encrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2887,11 +2892,13 @@ __ocb_encrypt6: .byte 102,65,15,56,221,246 .byte 102,65,15,56,221,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt6,.-__ocb_encrypt6 .type __ocb_encrypt4,@function .align 32 __ocb_encrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2956,11 +2963,13 @@ __ocb_encrypt4: .byte 102,65,15,56,221,228 .byte 102,65,15,56,221,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt4,.-__ocb_encrypt4 .type __ocb_encrypt1,@function .align 32 __ocb_encrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2991,6 +3000,7 @@ __ocb_encrypt1: .byte 102,15,56,221,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt1,.-__ocb_encrypt1 .globl aesni_ocb_decrypt @@ -3233,6 +3243,7 @@ aesni_ocb_decrypt: .type __ocb_decrypt6,@function .align 32 __ocb_decrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3324,11 +3335,13 @@ __ocb_decrypt6: .byte 102,65,15,56,223,246 .byte 102,65,15,56,223,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt6,.-__ocb_decrypt6 .type __ocb_decrypt4,@function .align 32 __ocb_decrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3389,11 +3402,13 @@ __ocb_decrypt4: .byte 102,65,15,56,223,228 .byte 102,65,15,56,223,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt4,.-__ocb_decrypt4 .type __ocb_decrypt1,@function .align 32 __ocb_decrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3423,6 +3438,7 @@ __ocb_decrypt1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt1,.-__ocb_decrypt1 .globl aesni_cbc_encrypt .type aesni_cbc_encrypt,@function @@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key: addq $8,%rsp .cfi_adjust_cfa_offset -8 .byte 0xf3,0xc3 -.cfi_endproc .LSEH_end_set_encrypt_key: .align 16 @@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key: shufps $170,%xmm1,%xmm1 xorps %xmm1,%xmm2 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_set_encrypt_key,.-aesni_set_encrypt_key .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key .align 64 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index e1f3abadbc7214..00000000000000 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2595 +0,0 @@ -.text - - - - -.type _bsaes_encrypt8,@function -.align 64 -_bsaes_encrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Lenc_sbox -.align 16 -.Lenc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Lenc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl .Lenc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz .Lenc_loop - movdqa 64(%r11),%xmm7 - jmp .Lenc_loop -.align 16 -.Lenc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_encrypt8,.-_bsaes_encrypt8 - -.type _bsaes_decrypt8,@function -.align 64 -_bsaes_decrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Ldec_sbox -.align 16 -.Ldec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Ldec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl .Ldec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz .Ldec_loop - movdqa -32(%r11),%xmm7 - jmp .Ldec_loop -.align 16 -.Ldec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_decrypt8,.-_bsaes_decrypt8 -.type _bsaes_key_convert,@function -.align 16 -_bsaes_key_convert: -.cfi_startproc - leaq .Lmasks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp .Lkey_loop -.align 16 -.Lkey_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz .Lkey_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_key_convert,.-_bsaes_key_convert - -.globl bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,@function -.align 16 -bsaes_cbc_encrypt: -.cfi_startproc - cmpl $0,%r9d - jne asm_AES_cbc_encrypt - cmpq $128,%rdx - jb asm_AES_cbc_encrypt - - movq %rsp,%rax -.Lcbc_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -.Lcbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc .Lcbc_dec_loop - - addq $8,%r14 - jz .Lcbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb .Lcbc_dec_one - movdqu 16(%r12),%xmm0 - je .Lcbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb .Lcbc_dec_three - movdqu 48(%r12),%xmm2 - je .Lcbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb .Lcbc_dec_five - movdqu 80(%r12),%xmm4 - je .Lcbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -.Lcbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lcbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lcbc_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lcbc_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt - -.globl bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,@function -.align 16 -bsaes_ctr32_encrypt_blocks: -.cfi_startproc - movq %rsp,%rax -.Lctr_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb .Lctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq .LADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp .Lctr_enc_loop -.align 16 -.Lctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq .LBS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc .Lctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq .LADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz .Lctr_enc_loop - - jmp .Lctr_enc_done -.align 16 -.Lctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb .Lctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je .Lctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb .Lctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je .Lctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb .Lctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je .Lctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp .Lctr_enc_done - -.align 16 -.Lctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz .Lctr_enc_short - -.Lctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lctr_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lctr_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,@function -.align 16 -bsaes_xts_encrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_enc_short - jmp .Lxts_enc_loop - -.align 16 -.Lxts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_enc_loop - -.Lxts_enc_short: - addq $0x80,%r14 - jz .Lxts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_enc_done: - andl $15,%ebx - jz .Lxts_enc_ret - movq %r13,%rdx - -.Lxts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -.Lxts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt - -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,@function -.align 16 -bsaes_xts_decrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_dec_short - jmp .Lxts_dec_loop - -.align 16 -.Lxts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_dec_loop - -.Lxts_dec_short: - addq $0x80,%r14 - jz .Lxts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_dec_done: - andl $15,%ebx - jz .Lxts_dec_ret - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -.Lxts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -.Lxts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt -.type _bsaes_const,@object -.align 64 -_bsaes_const: -.LM0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -.LISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -.LISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -.LBS0: -.quad 0x5555555555555555, 0x5555555555555555 -.LBS1: -.quad 0x3333333333333333, 0x3333333333333333 -.LBS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -.LSR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -.LSRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -.LM0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -.LSWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -.LSWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -.LADD1: -.quad 0x0000000000000000, 0x0000000100000000 -.LADD2: -.quad 0x0000000000000000, 0x0000000200000000 -.LADD3: -.quad 0x0000000000000000, 0x0000000300000000 -.LADD4: -.quad 0x0000000000000000, 0x0000000400000000 -.LADD5: -.quad 0x0000000000000000, 0x0000000500000000 -.LADD6: -.quad 0x0000000000000000, 0x0000000600000000 -.LADD7: -.quad 0x0000000000000000, 0x0000000700000000 -.LADD8: -.quad 0x0000000000000000, 0x0000000800000000 -.Lxts_magic: -.long 0x87,0,1,0 -.Lmasks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -.LM0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -.L63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.align 64 -.size _bsaes_const,.-_bsaes_const diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s index f8e4a805887366..7876e0b8f93d9c 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s @@ -29,7 +29,7 @@ rsaz_512_sqr: subq $128+24,%rsp .cfi_adjust_cfa_offset 128+24 .Lsqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -44,6 +44,7 @@ rsaz_512_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -82,31 +83,29 @@ rsaz_512_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -114,7 +113,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -122,7 +121,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -130,7 +129,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -138,39 +137,39 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -178,7 +177,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -186,9 +185,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -196,36 +193,40 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -234,9 +235,8 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -245,32 +245,33 @@ rsaz_512_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -278,97 +279,99 @@ rsaz_512_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -378,6 +381,10 @@ rsaz_512_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -406,9 +413,9 @@ rsaz_512_sqr: .Loop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -416,40 +423,39 @@ rsaz_512_sqr: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -467,24 +473,25 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -492,7 +499,7 @@ rsaz_512_sqr: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -500,27 +507,28 @@ rsaz_512_sqr: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -535,25 +543,25 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -564,18 +572,19 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -588,18 +597,19 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -609,31 +619,31 @@ rsaz_512_sqr: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -647,6 +657,9 @@ rsaz_512_sqr: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one: .type __rsaz_512_reduce,@function .align 32 __rsaz_512_reduce: +.cfi_startproc movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1519,10 +1533,12 @@ __rsaz_512_reduce: jne .Lreduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reduce,.-__rsaz_512_reduce .type __rsaz_512_reducex,@function .align 32 __rsaz_512_reducex: +.cfi_startproc imulq %r8,%rdx xorq %rsi,%rsi @@ -1575,10 +1591,12 @@ __rsaz_512_reducex: jne .Lreduction_loopx .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reducex,.-__rsaz_512_reducex .type __rsaz_512_subtract,@function .align 32 __rsaz_512_subtract: +.cfi_startproc movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1632,10 +1650,12 @@ __rsaz_512_subtract: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_subtract,.-__rsaz_512_subtract .type __rsaz_512_mul,@function .align 32 __rsaz_512_mul: +.cfi_startproc leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1774,10 +1794,12 @@ __rsaz_512_mul: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mul,.-__rsaz_512_mul .type __rsaz_512_mulx,@function .align 32 __rsaz_512_mulx: +.cfi_startproc mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1894,11 +1916,13 @@ __rsaz_512_mulx: movq %r15,8+64+56(%rsp) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mulx,.-__rsaz_512_mulx .globl rsaz_512_scatter4 .type rsaz_512_scatter4,@function .align 16 rsaz_512_scatter4: +.cfi_startproc leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp .Loop_scatter @@ -1911,12 +1935,14 @@ rsaz_512_scatter4: decl %r9d jnz .Loop_scatter .byte 0xf3,0xc3 +.cfi_endproc .size rsaz_512_scatter4,.-rsaz_512_scatter4 .globl rsaz_512_gather4 .type rsaz_512_gather4,@function .align 16 rsaz_512_gather4: +.cfi_startproc movd %edx,%xmm8 movdqa .Linc+16(%rip),%xmm1 movdqa .Linc(%rip),%xmm0 @@ -1980,6 +2006,7 @@ rsaz_512_gather4: jnz .Loop_gather .byte 0xf3,0xc3 .LSEH_end_rsaz_512_gather4: +.cfi_endproc .size rsaz_512_gather4,.-rsaz_512_gather4 .align 64 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s index df4b6610a02a47..40a60a3c8fc6b9 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ bn_mul4x_mont_gather5: .type mul4x_internal,@function .align 32 mul4x_internal: +.cfi_startproc shlq $5,%r9 movd 8(%rax),%xmm5 leaq .Linc(%rip),%rax @@ -1071,6 +1072,7 @@ mul4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqr4x_sub_entry +.cfi_endproc .size mul4x_internal,.-mul4x_internal .globl bn_power5 .type bn_power5,@function @@ -1213,6 +1215,7 @@ bn_power5: .align 32 bn_sqr8x_internal: __bn_sqr8x_internal: +.cfi_startproc @@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction: cmpq %rdx,%rdi jb .L8x_reduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size bn_sqr8x_internal,.-bn_sqr8x_internal .type __bn_post4x_internal,@function .align 32 __bn_post4x_internal: +.cfi_startproc movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2041,15 +2046,18 @@ __bn_post4x_internal: movq %r9,%r10 negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_post4x_internal,.-__bn_post4x_internal .globl bn_from_montgomery .type bn_from_montgomery,@function .align 32 bn_from_montgomery: +.cfi_startproc testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_from_montgomery,.-bn_from_montgomery .type bn_from_mont8x,@function @@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5: .type mulx4x_internal,@function .align 32 mulx4x_internal: +.cfi_startproc movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2751,6 +2760,7 @@ mulx4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqrx4x_sub_entry +.cfi_endproc .size mulx4x_internal,.-mulx4x_internal .type bn_powerx5,@function .align 32 @@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction: .size bn_sqrx8x_internal,.-bn_sqrx8x_internal .align 32 __bn_postx4x_internal: +.cfi_startproc movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3556,11 +3567,13 @@ __bn_postx4x_internal: negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_postx4x_internal,.-__bn_postx4x_internal .globl bn_get_bits5 .type bn_get_bits5,@function .align 16 bn_get_bits5: +.cfi_startproc leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3574,12 +3587,14 @@ bn_get_bits5: shrl %cl,%eax andl $31,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_get_bits5,.-bn_get_bits5 .globl bn_scatter5 .type bn_scatter5,@function .align 16 bn_scatter5: +.cfi_startproc cmpl $0,%esi jz .Lscatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3592,6 +3607,7 @@ bn_scatter5: jnz .Lscatter .Lscatter_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size bn_scatter5,.-bn_scatter5 .globl bn_gather5 @@ -3599,6 +3615,7 @@ bn_scatter5: .align 32 bn_gather5: .LSEH_begin_bn_gather5: +.cfi_startproc .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 @@ -3756,6 +3773,7 @@ bn_gather5: leaq (%r10),%rsp .byte 0xf3,0xc3 .LSEH_end_bn_gather5: +.cfi_endproc .size bn_gather5,.-bn_gather5 .align 64 .Linc: diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h index f567041169936f..5b88a094e60a2d 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x32" -#define DATE "built on: Fri Sep 13 15:59:58 2019 UTC" +#define DATE "built on: Wed Mar 18 21:06:52 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -38,10 +38,11 @@ static const char compiler_flags[] = { 'A','S','M',' ','-','D','S','H','A','5','1','2','_','A','S','M', ' ','-','D','K','E','C','C','A','K','1','6','0','0','_','A','S', 'M',' ','-','D','R','C','4','_','A','S','M',' ','-','D','M','D', - '5','_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S', - 'M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D', - 'E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M', - ' ','-','D','X','2','5','5','1','9','_','A','S','M',' ','-','D', - 'P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N', - 'D','E','B','U','G','\0' + '5','_','A','S','M',' ','-','D','A','E','S','N','I','_','A','S', + 'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D', + 'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_', + 'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','X', + '2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L','Y', + '1','3','0','5','_','A','S','M',' ','-','D','N','D','E','B','U', + 'G','\0' }; diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s index 405566b01cca6f..eeb20dd2291da7 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s @@ -5,11 +5,13 @@ .type Camellia_EncryptBlock,@function .align 16 Camellia_EncryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Lenc_rounds +.cfi_endproc .size Camellia_EncryptBlock,.-Camellia_EncryptBlock .globl Camellia_EncryptBlock_Rounds @@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds: .type _x86_64_Camellia_encrypt,@function .align 16 _x86_64_Camellia_encrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt: movl %edx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt @@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt: .type Camellia_DecryptBlock,@function .align 16 Camellia_DecryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Ldec_rounds +.cfi_endproc .size Camellia_DecryptBlock,.-Camellia_DecryptBlock .globl Camellia_DecryptBlock_Rounds @@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds: .type _x86_64_Camellia_decrypt,@function .align 16 _x86_64_Camellia_decrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt: movl %ebx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt .globl Camellia_Ekeygen .type Camellia_Ekeygen,@function diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s index 62b9ac6616ba72..5c9e4050416212 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s @@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx: .type ecp_nistz256_to_mont,@function .align 32 ecp_nistz256_to_mont: +.cfi_startproc movl $0x80100,%ecx andl OPENSSL_ia32cap_P+8(%rip),%ecx leaq .LRR(%rip),%rdx jmp .Lmul_mont +.cfi_endproc .size ecp_nistz256_to_mont,.-ecp_nistz256_to_mont @@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont: .type ecp_nistz256_scatter_w5,@function .align 32 ecp_nistz256_scatter_w5: +.cfi_startproc leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5: movdqa %xmm5,80(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5 @@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5: .type ecp_nistz256_scatter_w7,@function .align 32 ecp_nistz256_scatter_w7: +.cfi_startproc movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7: movdqa %xmm3,48(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7 @@ -5655,26 +5661,16 @@ ecp_nistz256_point_add: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedq - testq %r9,%r9 - jz .Ladd_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedq -.align 32 .Ladd_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedx - testq %r9,%r9 - jz .Ladd_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedx -.align 32 .Ladd_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s index 2a18eaee288ce7..1788e568cda5d2 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s @@ -400,12 +400,14 @@ x25519_fe51_mul121666: .type x25519_fe64_eligible,@function .align 32 x25519_fe64_eligible: +.cfi_startproc movl OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx cmpl $0x80100,%ecx cmovel %ecx,%eax .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_eligible,.-x25519_fe64_eligible .globl x25519_fe64_mul @@ -648,6 +650,7 @@ x25519_fe64_sqr: .align 32 x25519_fe64_mul121666: .Lfe64_mul121666_body: +.cfi_startproc movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -676,6 +679,7 @@ x25519_fe64_mul121666: .Lfe64_mul121666_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_mul121666,.-x25519_fe64_mul121666 .globl x25519_fe64_add @@ -683,6 +687,7 @@ x25519_fe64_mul121666: .align 32 x25519_fe64_add: .Lfe64_add_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -711,6 +716,7 @@ x25519_fe64_add: .Lfe64_add_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_add,.-x25519_fe64_add .globl x25519_fe64_sub @@ -718,6 +724,7 @@ x25519_fe64_add: .align 32 x25519_fe64_sub: .Lfe64_sub_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -746,6 +753,7 @@ x25519_fe64_sub: .Lfe64_sub_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_sub,.-x25519_fe64_sub .globl x25519_fe64_tobytes @@ -753,6 +761,7 @@ x25519_fe64_sub: .align 32 x25519_fe64_tobytes: .Lfe64_to_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -788,5 +797,6 @@ x25519_fe64_tobytes: .Lfe64_to_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_tobytes,.-x25519_fe64_tobytes .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h index 0d071bda66fd8e..93f75e2e1512cb 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s index 6a7a9577c7142f..01d89630a42f73 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .type _aesni_ctr32_ghash_6x,@function .align 32 _aesni_ctr32_ghash_6x: +.cfi_startproc vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x: vpxor %xmm4,%xmm8,%xmm8 .byte 0xf3,0xc3 +.cfi_endproc .size _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x .globl aesni_gcm_decrypt .type aesni_gcm_decrypt,@function @@ -416,6 +418,7 @@ aesni_gcm_decrypt: .type _aesni_ctr32_6x,@function .align 32 _aesni_ctr32_6x: +.cfi_startproc vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -502,6 +505,7 @@ _aesni_ctr32_6x: vpshufb %xmm0,%xmm1,%xmm1 vpxor %xmm4,%xmm14,%xmm14 jmp .Loop_ctr32 +.cfi_endproc .size _aesni_ctr32_6x,.-_aesni_ctr32_6x .globl aesni_gcm_encrypt diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s index 2d829b713b866a..505c06471d45b0 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .type poly1305_init,@function .align 32 poly1305_init: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -42,6 +43,7 @@ poly1305_init: movl $1,%eax .Lno_key: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init,.-poly1305_init .type poly1305_blocks,@function @@ -162,6 +164,7 @@ poly1305_blocks: .type poly1305_emit,@function .align 32 poly1305_emit: +.cfi_startproc .Lemit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -182,10 +185,12 @@ poly1305_emit: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit,.-poly1305_emit .type __poly1305_block,@function .align 32 __poly1305_block: +.cfi_startproc mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -225,11 +230,13 @@ __poly1305_block: adcq $0,%rbx adcq $0,%rbp .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_block,.-__poly1305_block .type __poly1305_init_avx,@function .align 32 __poly1305_init_avx: +.cfi_startproc movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -387,6 +394,7 @@ __poly1305_init_avx: leaq -48-64(%rdi),%rdi .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_init_avx,.-__poly1305_init_avx .type poly1305_blocks_avx,@function @@ -1227,6 +1235,7 @@ poly1305_blocks_avx: .type poly1305_emit_avx,@function .align 32 poly1305_emit_avx: +.cfi_startproc cmpl $0,20(%rdi) je .Lemit @@ -1277,6 +1286,7 @@ poly1305_emit_avx: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_avx,.-poly1305_emit_avx .type poly1305_blocks_avx2,@function .align 32 @@ -1959,6 +1969,7 @@ poly1305_blocks_avx2: .type xor128_encrypt_n_pad,@function .align 16 xor128_encrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -2000,12 +2011,14 @@ xor128_encrypt_n_pad: .Ldone_enc: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_encrypt_n_pad,.-xor128_encrypt_n_pad .globl xor128_decrypt_n_pad .type xor128_decrypt_n_pad,@function .align 16 xor128_decrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -2051,4 +2064,5 @@ xor128_decrypt_n_pad: .Ldone_dec: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_decrypt_n_pad,.-xor128_decrypt_n_pad diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s index fba70351d48d5c..b97c757550aad0 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl RC4 .type RC4,@function .align 16 -RC4: orq %rsi,%rsi +RC4: +.cfi_startproc + orq %rsi,%rsi jne .Lentry .byte 0xf3,0xc3 .Lentry: -.cfi_startproc pushq %rbx .cfi_adjust_cfa_offset 8 .cfi_offset %rbx,-16 @@ -533,6 +534,7 @@ RC4: orq %rsi,%rsi .type RC4_set_key,@function .align 16 RC4_set_key: +.cfi_startproc leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -599,12 +601,14 @@ RC4_set_key: movl %eax,-8(%rdi) movl %eax,-4(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size RC4_set_key,.-RC4_set_key .globl RC4_options .type RC4_options,@function .align 16 RC4_options: +.cfi_startproc leaq .Lopts(%rip),%rax movl OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -617,6 +621,7 @@ RC4_options: addq $12,%rax .Ldone: .byte 0xf3,0xc3 +.cfi_endproc .align 64 .Lopts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s index e511f25035b2b8..09617d014bdb7b 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .type __KeccakF1600,@function .align 32 __KeccakF1600: +.cfi_startproc movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -255,6 +256,7 @@ __KeccakF1600: leaq -192(%r15),%r15 .byte 0xf3,0xc3 +.cfi_endproc .size __KeccakF1600,.-__KeccakF1600 .type KeccakF1600,@function diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s index e436521a040f66..98541727e555da 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s @@ -1421,8 +1421,8 @@ _shaext_shortcut: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) -.cfi_endproc .byte 0xf3,0xc3 +.cfi_endproc .size sha1_block_data_order_shaext,.-sha1_block_data_order_shaext .type sha1_block_data_order_ssse3,@function .align 16 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s index 42b24df18e5afe..9357385da3c49b 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .align 64 sha256_block_data_order_shaext: _shaext_shortcut: +.cfi_startproc leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1977,6 +1978,7 @@ _shaext_shortcut: movdqu %xmm1,(%rdi) movdqu %xmm2,16(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size sha256_block_data_order_shaext,.-sha256_block_data_order_shaext .type sha256_block_data_order_ssse3,@function .align 64 @@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2: leaq 448(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08 + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s index 5931a2a93234d0..939f1ca71c9394 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2: leaq 1152(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08 + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s index fd17eaaba49576..9268ce8c9a9d63 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s @@ -12,6 +12,7 @@ .type OPENSSL_atomic_add,@function .align 16 OPENSSL_atomic_add: +.cfi_startproc movl (%rdi),%eax .Lspin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -20,16 +21,19 @@ OPENSSL_atomic_add: movl %r8d,%eax .byte 0x48,0x98 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_atomic_add,.-OPENSSL_atomic_add .globl OPENSSL_rdtsc .type OPENSSL_rdtsc,@function .align 16 OPENSSL_rdtsc: +.cfi_startproc rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_rdtsc,.-OPENSSL_rdtsc .globl OPENSSL_ia32_cpuid @@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid: .type OPENSSL_cleanse,@function .align 16 OPENSSL_cleanse: +.cfi_startproc xorq %rax,%rax cmpq $15,%rsi jae .Lot @@ -234,12 +239,14 @@ OPENSSL_cleanse: cmpq $0,%rsi jne .Little .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_cleanse,.-OPENSSL_cleanse .globl CRYPTO_memcmp .type CRYPTO_memcmp,@function .align 16 CRYPTO_memcmp: +.cfi_startproc xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -268,11 +275,13 @@ CRYPTO_memcmp: shrq $63,%rax .Lno_data: .byte 0xf3,0xc3 +.cfi_endproc .size CRYPTO_memcmp,.-CRYPTO_memcmp .globl OPENSSL_wipe_cpu .type OPENSSL_wipe_cpu,@function .align 16 OPENSSL_wipe_cpu: +.cfi_startproc pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -299,11 +308,13 @@ OPENSSL_wipe_cpu: xorq %r11,%r11 leaq 8(%rsp),%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu .globl OPENSSL_instrument_bus .type OPENSSL_instrument_bus,@function .align 16 OPENSSL_instrument_bus: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -330,12 +341,14 @@ OPENSSL_instrument_bus: movq %r11,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus .globl OPENSSL_instrument_bus2 .type OPENSSL_instrument_bus2,@function .align 16 OPENSSL_instrument_bus2: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -378,11 +391,13 @@ OPENSSL_instrument_bus2: movq 8(%rsp),%rax subq %rcx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 .globl OPENSSL_ia32_rdrand_bytes .type OPENSSL_ia32_rdrand_bytes,@function .align 16 OPENSSL_ia32_rdrand_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdrand_bytes @@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes: .Ldone_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes .globl OPENSSL_ia32_rdseed_bytes .type OPENSSL_ia32_rdseed_bytes,@function .align 16 OPENSSL_ia32_rdseed_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdseed_bytes @@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes: .Ldone_rdseed_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h index 7dda69d359d2ac..992473943e5da4 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi index 859eb1a3691ebf..8e2deecf8481f7 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi @@ -16,6 +16,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi index 7dd6ee5dda657f..d907f1f290cb30 100644 --- a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi @@ -723,6 +723,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm index b9a8bebaa20a64..7943ec12dfc802 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-x32", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -238,6 +238,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3223,7 +3230,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3231,6 +3237,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3729,14 +3736,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4177,6 +4176,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4871,49 +4878,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4935,7 +4934,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4949,613 +4947,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5573,188 +5469,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5784,13 +5649,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5800,43 +5663,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5846,31 +5702,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5888,278 +5739,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6169,301 +5974,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6471,7 +6226,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6479,7 +6233,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6487,7 +6240,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6495,7 +6247,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6254,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,163 +6261,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6685,223 +6408,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6909,21 +6595,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6931,13 +6614,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6945,81 +6626,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7027,328 +6695,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7358,85 +6965,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7459,361 +7052,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7835,259 +7368,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8097,31 +7587,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8131,7 +7616,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8157,13 +7641,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8189,7 +7671,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8215,709 +7696,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8968,6 +8331,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9212,7 +8583,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9538,7 +8908,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9584,7 +8953,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9650,7 +9018,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9675,7 +9042,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9773,7 +9139,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9823,18 +9188,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9845,6 +9207,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9908,10 +9274,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9940,6 +9302,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10204,6 +9570,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15094,7 +14461,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15102,6 +14468,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15329,6 +14696,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15431,10 +14806,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15463,6 +14834,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h index 369ee613964bf0..fb611fa2c2e720 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x32" -#define DATE "built on: Fri Sep 13 16:00:12 2019 UTC" +#define DATE "built on: Wed Mar 18 21:07:03 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h index 0d071bda66fd8e..93f75e2e1512cb 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h index 6ab9dc309c4861..3d85365931bc40 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h b/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm index 6eac1af414f413..6962df4c99b6be 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm @@ -49,14 +49,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -112,8 +112,8 @@ our %config = ( sourcedir => ".", target => "linux-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -241,6 +241,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -358,8 +359,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -627,14 +628,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -710,6 +703,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1507,6 +1508,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3261,7 +3268,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3269,6 +3275,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3767,14 +3774,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4215,6 +4214,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4909,49 +4916,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4961,25 +4960,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4997,13 +4992,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5017,613 +5010,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5637,7 +5528,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5647,182 +5537,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5832,19 +5692,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5870,31 +5727,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5904,37 +5756,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5944,31 +5790,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5986,278 +5827,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6267,301 +6062,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6569,7 +6314,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6577,7 +6321,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6585,7 +6328,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6593,7 +6335,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6601,7 +6342,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6609,163 +6349,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6783,241 +6496,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7025,21 +6698,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7047,13 +6717,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7061,81 +6729,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7143,328 +6798,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7474,91 +7068,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7577,7 +7156,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7587,361 +7165,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7963,265 +7481,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8231,31 +7705,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8265,7 +7734,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8279,7 +7747,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8297,19 +7764,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8323,7 +7787,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8341,13 +7804,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8373,727 +7834,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9144,6 +8484,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9388,7 +8736,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9714,7 +9061,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9760,7 +9106,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9826,7 +9171,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9851,7 +9195,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9949,7 +9292,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9999,18 +9341,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10021,6 +9360,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10084,10 +9427,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10116,6 +9455,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10380,6 +9723,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15385,7 +14729,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15393,6 +14736,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15620,6 +14964,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15722,10 +15074,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15754,6 +15102,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s deleted file mode 100644 index f0c1685fb93450..00000000000000 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2649 +0,0 @@ -.text -.type _x86_64_AES_encrypt,@function -.align 16 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Lenc_loop -.align 16 -.Lenc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz .Lenc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_encrypt,.-_x86_64_AES_encrypt -.type _x86_64_AES_encrypt_compact,@function -.align 16 -_x86_64_AES_encrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Lenc_loop_compact -.align 16 -.Lenc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Lenc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp .Lenc_loop_compact -.align 16 -.Lenc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -.globl asm_AES_encrypt -.hidden asm_AES_encrypt -asm_AES_encrypt: -AES_encrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Lenc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Lenc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_encrypt,.-AES_encrypt -.type _x86_64_AES_decrypt,@function -.align 16 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Ldec_loop -.align 16 -.Ldec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz .Ldec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_decrypt,.-_x86_64_AES_decrypt -.type _x86_64_AES_decrypt_compact,@function -.align 16 -_x86_64_AES_decrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Ldec_loop_compact - -.align 16 -.Ldec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Ldec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp .Ldec_loop_compact -.align 16 -.Ldec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -.globl asm_AES_decrypt -.hidden asm_AES_decrypt -asm_AES_decrypt: -AES_decrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Ldec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Ldec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_decrypt,.-AES_decrypt -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - subq $8,%rsp -.cfi_adjust_cfa_offset 8 -.Lenc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Lenc_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_encrypt_key,.-AES_set_encrypt_key - -.type _x86_64_AES_set_encrypt_key,@function -.align 16 -_x86_64_AES_set_encrypt_key: -.cfi_startproc - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz .Lbadpointer - testq $-1,%rdi - jz .Lbadpointer - - leaq .LAES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je .L10rounds - cmpl $192,%ecx - je .L12rounds - cmpl $256,%ecx - je .L14rounds - movq $-2,%rax - jmp .Lexit - -.L10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L10shortcut -.align 4 -.L10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -.L10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl .L10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L12shortcut -.align 4 -.L12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -.L12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je .L12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp .L12loop -.L12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L14shortcut -.align 4 -.L14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -.L14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je .L14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp .L14loop -.L14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp .Lexit - -.Lbadpointer: - movq $-1,%rax -.Lexit: -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - pushq %rdx -.cfi_adjust_cfa_offset 8 -.Ldec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne .Labort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.align 4 -.Linvert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne .Linvert - - leaq .LAES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.align 4 -.Lpermute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz .Lpermute - - xorq %rax,%rax -.Labort: - movq 8(%rsp),%r15 -.cfi_restore %r15 - movq 16(%rsp),%r14 -.cfi_restore %r14 - movq 24(%rsp),%r13 -.cfi_restore %r13 - movq 32(%rsp),%r12 -.cfi_restore %r12 - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Ldec_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_decrypt_key,.-AES_set_decrypt_key -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 - -.globl asm_AES_cbc_encrypt -.hidden asm_AES_cbc_encrypt -asm_AES_cbc_encrypt: -AES_cbc_encrypt: -.cfi_startproc - cmpq $0,%rdx - je .Lcbc_epilogue - pushfq - - -.cfi_adjust_cfa_offset 8 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-32 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-40 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-48 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-56 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-64 -.Lcbc_prologue: - - cld - movl %r9d,%r9d - - leaq .LAES_Te(%rip),%r14 - leaq .LAES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - -.cfi_remember_state - movl OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb .Lcbc_slow_prologue - testq $15,%rdx - jnz .Lcbc_slow_prologue - btl $28,%r10d - jc .Lcbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb .Lcbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp .Lcbc_te_ok -.Lcbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.align 4 -.Lcbc_te_ok: - - xchgq %rsp,%r15 -.cfi_def_cfa_register %r15 - - movq %r15,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb .Lcbc_do_ecopy - cmpq $4096-248,%r10 - jb .Lcbc_skip_ecopy -.align 4 -.Lcbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -.Lcbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.align 4 -.Lcbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz .Lcbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je .LFAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.align 4 -.Lcbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz .Lcbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_fast_cleanup - - -.align 16 -.LFAST_DECRYPT: - cmpq %r8,%r9 - je .Lcbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.align 4 -.Lcbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz .Lcbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp .Lcbc_fast_cleanup - -.align 16 -.Lcbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.align 4 -.Lcbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz .Lcbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp .Lcbc_fast_dec_in_place_loop -.Lcbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.align 4 -.Lcbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je .Lcbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp .Lcbc_exit - - -.align 16 -.Lcbc_slow_prologue: -.cfi_restore_state - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp -.cfi_def_cfa_register %rbp - - movq %rbp,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je .LSLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz .Lcbc_slow_enc_tail - -.align 4 -.Lcbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz .Lcbc_slow_enc_loop - testq $15,%r10 - jnz .Lcbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp .Lcbc_slow_enc_loop - -.align 16 -.LSLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.align 4 -.Lcbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc .Lcbc_slow_dec_partial - jz .Lcbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp .Lcbc_slow_dec_loop -.Lcbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp .Lcbc_exit - -.align 16 -.Lcbc_exit: - movq 16(%rsp),%rsi -.cfi_def_cfa %rsi,64 - movq (%rsi),%r15 -.cfi_restore %r15 - movq 8(%rsi),%r14 -.cfi_restore %r14 - movq 16(%rsi),%r13 -.cfi_restore %r13 - movq 24(%rsi),%r12 -.cfi_restore %r12 - movq 32(%rsi),%rbp -.cfi_restore %rbp - movq 40(%rsi),%rbx -.cfi_restore %rbx - leaq 48(%rsi),%rsp -.cfi_def_cfa %rsp,16 -.Lcbc_popfq: - popfq - - -.cfi_adjust_cfa_offset -8 -.Lcbc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_cbc_encrypt,.-AES_cbc_encrypt -.align 64 -.LAES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.align 64 -.LAES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 64 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s index 4d2dfe44898fd5..978bd2b6239c15 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha1_enc,@function .align 32 aesni_cbc_sha1_enc: +.cfi_startproc movl OPENSSL_ia32cap_P+0(%rip),%r10d movq OPENSSL_ia32cap_P+4(%rip),%r11 @@ -17,6 +18,7 @@ aesni_cbc_sha1_enc: je aesni_cbc_sha1_enc_avx jmp aesni_cbc_sha1_enc_ssse3 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc .type aesni_cbc_sha1_enc_ssse3,@function .align 32 @@ -2730,6 +2732,7 @@ K_XX_XX: .type aesni_cbc_sha1_enc_shaext,@function .align 32 aesni_cbc_sha1_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 @@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s index 5a47b3ee51b741..dd09f1b290af62 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha256_enc,@function .align 16 aesni_cbc_sha256_enc: +.cfi_startproc leaq OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -30,6 +31,7 @@ aesni_cbc_sha256_enc: ud2 .Lprobe: .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc .align 64 @@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi +.cfi_def_cfa %rsi,8 leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi .cfi_def_cfa %rsi,8 vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2: .type aesni_cbc_sha256_enc_shaext,@function .align 32 aesni_cbc_sha256_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 @@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s index 2986a647c1bb05..c1e791eff59235 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ aesni_ecb_encrypt: .type aesni_ccm64_encrypt_blocks,@function .align 16 aesni_ccm64_encrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa .Lincrement64(%rip),%xmm9 @@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks .globl aesni_ccm64_decrypt_blocks .type aesni_ccm64_decrypt_blocks,@function .align 16 aesni_ccm64_decrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks .globl aesni_ctr32_encrypt_blocks .type aesni_ctr32_encrypt_blocks,@function @@ -2790,6 +2794,7 @@ aesni_ocb_encrypt: .type __ocb_encrypt6,@function .align 32 __ocb_encrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2887,11 +2892,13 @@ __ocb_encrypt6: .byte 102,65,15,56,221,246 .byte 102,65,15,56,221,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt6,.-__ocb_encrypt6 .type __ocb_encrypt4,@function .align 32 __ocb_encrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2956,11 +2963,13 @@ __ocb_encrypt4: .byte 102,65,15,56,221,228 .byte 102,65,15,56,221,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt4,.-__ocb_encrypt4 .type __ocb_encrypt1,@function .align 32 __ocb_encrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2991,6 +3000,7 @@ __ocb_encrypt1: .byte 102,15,56,221,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt1,.-__ocb_encrypt1 .globl aesni_ocb_decrypt @@ -3233,6 +3243,7 @@ aesni_ocb_decrypt: .type __ocb_decrypt6,@function .align 32 __ocb_decrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3324,11 +3335,13 @@ __ocb_decrypt6: .byte 102,65,15,56,223,246 .byte 102,65,15,56,223,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt6,.-__ocb_decrypt6 .type __ocb_decrypt4,@function .align 32 __ocb_decrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3389,11 +3402,13 @@ __ocb_decrypt4: .byte 102,65,15,56,223,228 .byte 102,65,15,56,223,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt4,.-__ocb_decrypt4 .type __ocb_decrypt1,@function .align 32 __ocb_decrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3423,6 +3438,7 @@ __ocb_decrypt1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt1,.-__ocb_decrypt1 .globl aesni_cbc_encrypt .type aesni_cbc_encrypt,@function @@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key: addq $8,%rsp .cfi_adjust_cfa_offset -8 .byte 0xf3,0xc3 -.cfi_endproc .LSEH_end_set_encrypt_key: .align 16 @@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key: shufps $170,%xmm1,%xmm1 xorps %xmm1,%xmm2 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_set_encrypt_key,.-aesni_set_encrypt_key .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key .align 64 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index e1f3abadbc7214..00000000000000 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2595 +0,0 @@ -.text - - - - -.type _bsaes_encrypt8,@function -.align 64 -_bsaes_encrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Lenc_sbox -.align 16 -.Lenc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Lenc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl .Lenc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz .Lenc_loop - movdqa 64(%r11),%xmm7 - jmp .Lenc_loop -.align 16 -.Lenc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_encrypt8,.-_bsaes_encrypt8 - -.type _bsaes_decrypt8,@function -.align 64 -_bsaes_decrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Ldec_sbox -.align 16 -.Ldec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Ldec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl .Ldec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz .Ldec_loop - movdqa -32(%r11),%xmm7 - jmp .Ldec_loop -.align 16 -.Ldec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_decrypt8,.-_bsaes_decrypt8 -.type _bsaes_key_convert,@function -.align 16 -_bsaes_key_convert: -.cfi_startproc - leaq .Lmasks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp .Lkey_loop -.align 16 -.Lkey_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz .Lkey_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_key_convert,.-_bsaes_key_convert - -.globl bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,@function -.align 16 -bsaes_cbc_encrypt: -.cfi_startproc - cmpl $0,%r9d - jne asm_AES_cbc_encrypt - cmpq $128,%rdx - jb asm_AES_cbc_encrypt - - movq %rsp,%rax -.Lcbc_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -.Lcbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc .Lcbc_dec_loop - - addq $8,%r14 - jz .Lcbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb .Lcbc_dec_one - movdqu 16(%r12),%xmm0 - je .Lcbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb .Lcbc_dec_three - movdqu 48(%r12),%xmm2 - je .Lcbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb .Lcbc_dec_five - movdqu 80(%r12),%xmm4 - je .Lcbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -.Lcbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lcbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lcbc_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lcbc_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt - -.globl bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,@function -.align 16 -bsaes_ctr32_encrypt_blocks: -.cfi_startproc - movq %rsp,%rax -.Lctr_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb .Lctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq .LADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp .Lctr_enc_loop -.align 16 -.Lctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq .LBS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc .Lctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq .LADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz .Lctr_enc_loop - - jmp .Lctr_enc_done -.align 16 -.Lctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb .Lctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je .Lctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb .Lctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je .Lctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb .Lctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je .Lctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp .Lctr_enc_done - -.align 16 -.Lctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz .Lctr_enc_short - -.Lctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lctr_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lctr_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,@function -.align 16 -bsaes_xts_encrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_enc_short - jmp .Lxts_enc_loop - -.align 16 -.Lxts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_enc_loop - -.Lxts_enc_short: - addq $0x80,%r14 - jz .Lxts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_enc_done: - andl $15,%ebx - jz .Lxts_enc_ret - movq %r13,%rdx - -.Lxts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -.Lxts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt - -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,@function -.align 16 -bsaes_xts_decrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_dec_short - jmp .Lxts_dec_loop - -.align 16 -.Lxts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_dec_loop - -.Lxts_dec_short: - addq $0x80,%r14 - jz .Lxts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_dec_done: - andl $15,%ebx - jz .Lxts_dec_ret - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -.Lxts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -.Lxts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt -.type _bsaes_const,@object -.align 64 -_bsaes_const: -.LM0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -.LISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -.LISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -.LBS0: -.quad 0x5555555555555555, 0x5555555555555555 -.LBS1: -.quad 0x3333333333333333, 0x3333333333333333 -.LBS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -.LSR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -.LSRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -.LM0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -.LSWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -.LSWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -.LADD1: -.quad 0x0000000000000000, 0x0000000100000000 -.LADD2: -.quad 0x0000000000000000, 0x0000000200000000 -.LADD3: -.quad 0x0000000000000000, 0x0000000300000000 -.LADD4: -.quad 0x0000000000000000, 0x0000000400000000 -.LADD5: -.quad 0x0000000000000000, 0x0000000500000000 -.LADD6: -.quad 0x0000000000000000, 0x0000000600000000 -.LADD7: -.quad 0x0000000000000000, 0x0000000700000000 -.LADD8: -.quad 0x0000000000000000, 0x0000000800000000 -.Lxts_magic: -.long 0x87,0,1,0 -.Lmasks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -.LM0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -.L63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.align 64 -.size _bsaes_const,.-_bsaes_const diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s index f8e4a805887366..7876e0b8f93d9c 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s @@ -29,7 +29,7 @@ rsaz_512_sqr: subq $128+24,%rsp .cfi_adjust_cfa_offset 128+24 .Lsqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -44,6 +44,7 @@ rsaz_512_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -82,31 +83,29 @@ rsaz_512_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -114,7 +113,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -122,7 +121,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -130,7 +129,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -138,39 +137,39 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -178,7 +177,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -186,9 +185,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -196,36 +193,40 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -234,9 +235,8 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -245,32 +245,33 @@ rsaz_512_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -278,97 +279,99 @@ rsaz_512_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -378,6 +381,10 @@ rsaz_512_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -406,9 +413,9 @@ rsaz_512_sqr: .Loop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -416,40 +423,39 @@ rsaz_512_sqr: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -467,24 +473,25 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -492,7 +499,7 @@ rsaz_512_sqr: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -500,27 +507,28 @@ rsaz_512_sqr: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -535,25 +543,25 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -564,18 +572,19 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -588,18 +597,19 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -609,31 +619,31 @@ rsaz_512_sqr: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -647,6 +657,9 @@ rsaz_512_sqr: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one: .type __rsaz_512_reduce,@function .align 32 __rsaz_512_reduce: +.cfi_startproc movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1519,10 +1533,12 @@ __rsaz_512_reduce: jne .Lreduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reduce,.-__rsaz_512_reduce .type __rsaz_512_reducex,@function .align 32 __rsaz_512_reducex: +.cfi_startproc imulq %r8,%rdx xorq %rsi,%rsi @@ -1575,10 +1591,12 @@ __rsaz_512_reducex: jne .Lreduction_loopx .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reducex,.-__rsaz_512_reducex .type __rsaz_512_subtract,@function .align 32 __rsaz_512_subtract: +.cfi_startproc movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1632,10 +1650,12 @@ __rsaz_512_subtract: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_subtract,.-__rsaz_512_subtract .type __rsaz_512_mul,@function .align 32 __rsaz_512_mul: +.cfi_startproc leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1774,10 +1794,12 @@ __rsaz_512_mul: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mul,.-__rsaz_512_mul .type __rsaz_512_mulx,@function .align 32 __rsaz_512_mulx: +.cfi_startproc mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1894,11 +1916,13 @@ __rsaz_512_mulx: movq %r15,8+64+56(%rsp) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mulx,.-__rsaz_512_mulx .globl rsaz_512_scatter4 .type rsaz_512_scatter4,@function .align 16 rsaz_512_scatter4: +.cfi_startproc leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp .Loop_scatter @@ -1911,12 +1935,14 @@ rsaz_512_scatter4: decl %r9d jnz .Loop_scatter .byte 0xf3,0xc3 +.cfi_endproc .size rsaz_512_scatter4,.-rsaz_512_scatter4 .globl rsaz_512_gather4 .type rsaz_512_gather4,@function .align 16 rsaz_512_gather4: +.cfi_startproc movd %edx,%xmm8 movdqa .Linc+16(%rip),%xmm1 movdqa .Linc(%rip),%xmm0 @@ -1980,6 +2006,7 @@ rsaz_512_gather4: jnz .Loop_gather .byte 0xf3,0xc3 .LSEH_end_rsaz_512_gather4: +.cfi_endproc .size rsaz_512_gather4,.-rsaz_512_gather4 .align 64 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s index df4b6610a02a47..40a60a3c8fc6b9 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ bn_mul4x_mont_gather5: .type mul4x_internal,@function .align 32 mul4x_internal: +.cfi_startproc shlq $5,%r9 movd 8(%rax),%xmm5 leaq .Linc(%rip),%rax @@ -1071,6 +1072,7 @@ mul4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqr4x_sub_entry +.cfi_endproc .size mul4x_internal,.-mul4x_internal .globl bn_power5 .type bn_power5,@function @@ -1213,6 +1215,7 @@ bn_power5: .align 32 bn_sqr8x_internal: __bn_sqr8x_internal: +.cfi_startproc @@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction: cmpq %rdx,%rdi jb .L8x_reduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size bn_sqr8x_internal,.-bn_sqr8x_internal .type __bn_post4x_internal,@function .align 32 __bn_post4x_internal: +.cfi_startproc movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2041,15 +2046,18 @@ __bn_post4x_internal: movq %r9,%r10 negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_post4x_internal,.-__bn_post4x_internal .globl bn_from_montgomery .type bn_from_montgomery,@function .align 32 bn_from_montgomery: +.cfi_startproc testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_from_montgomery,.-bn_from_montgomery .type bn_from_mont8x,@function @@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5: .type mulx4x_internal,@function .align 32 mulx4x_internal: +.cfi_startproc movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2751,6 +2760,7 @@ mulx4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqrx4x_sub_entry +.cfi_endproc .size mulx4x_internal,.-mulx4x_internal .type bn_powerx5,@function .align 32 @@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction: .size bn_sqrx8x_internal,.-bn_sqrx8x_internal .align 32 __bn_postx4x_internal: +.cfi_startproc movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3556,11 +3567,13 @@ __bn_postx4x_internal: negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_postx4x_internal,.-__bn_postx4x_internal .globl bn_get_bits5 .type bn_get_bits5,@function .align 16 bn_get_bits5: +.cfi_startproc leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3574,12 +3587,14 @@ bn_get_bits5: shrl %cl,%eax andl $31,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_get_bits5,.-bn_get_bits5 .globl bn_scatter5 .type bn_scatter5,@function .align 16 bn_scatter5: +.cfi_startproc cmpl $0,%esi jz .Lscatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3592,6 +3607,7 @@ bn_scatter5: jnz .Lscatter .Lscatter_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size bn_scatter5,.-bn_scatter5 .globl bn_gather5 @@ -3599,6 +3615,7 @@ bn_scatter5: .align 32 bn_gather5: .LSEH_begin_bn_gather5: +.cfi_startproc .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 @@ -3756,6 +3773,7 @@ bn_gather5: leaq (%r10),%rsp .byte 0xf3,0xc3 .LSEH_end_bn_gather5: +.cfi_endproc .size bn_gather5,.-bn_gather5 .align 64 .Linc: diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h index 17e89914852fb5..83d6c611ca4206 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Fri Sep 13 16:00:16 2019 UTC" +#define DATE "built on: Wed Mar 18 21:07:06 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -37,10 +37,10 @@ static const char compiler_flags[] = { ' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-','D', 'K','E','C','C','A','K','1','6','0','0','_','A','S','M',' ','-', 'D','R','C','4','_','A','S','M',' ','-','D','M','D','5','_','A', - 'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-', - 'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P', - '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D', - 'X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L', - 'Y','1','3','0','5','_','A','S','M',' ','-','D','N','D','E','B', - 'U','G','\0' + 'S','M',' ','-','D','A','E','S','N','I','_','A','S','M',' ','-', + 'D','V','P','A','E','S','_','A','S','M',' ','-','D','G','H','A', + 'S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I','S', + 'T','Z','2','5','6','_','A','S','M',' ','-','D','X','2','5','5', + '1','9','_','A','S','M',' ','-','D','P','O','L','Y','1','3','0', + '5','_','A','S','M',' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s index 405566b01cca6f..eeb20dd2291da7 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s @@ -5,11 +5,13 @@ .type Camellia_EncryptBlock,@function .align 16 Camellia_EncryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Lenc_rounds +.cfi_endproc .size Camellia_EncryptBlock,.-Camellia_EncryptBlock .globl Camellia_EncryptBlock_Rounds @@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds: .type _x86_64_Camellia_encrypt,@function .align 16 _x86_64_Camellia_encrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt: movl %edx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt @@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt: .type Camellia_DecryptBlock,@function .align 16 Camellia_DecryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Ldec_rounds +.cfi_endproc .size Camellia_DecryptBlock,.-Camellia_DecryptBlock .globl Camellia_DecryptBlock_Rounds @@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds: .type _x86_64_Camellia_decrypt,@function .align 16 _x86_64_Camellia_decrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt: movl %ebx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt .globl Camellia_Ekeygen .type Camellia_Ekeygen,@function diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s index 62b9ac6616ba72..5c9e4050416212 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s @@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx: .type ecp_nistz256_to_mont,@function .align 32 ecp_nistz256_to_mont: +.cfi_startproc movl $0x80100,%ecx andl OPENSSL_ia32cap_P+8(%rip),%ecx leaq .LRR(%rip),%rdx jmp .Lmul_mont +.cfi_endproc .size ecp_nistz256_to_mont,.-ecp_nistz256_to_mont @@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont: .type ecp_nistz256_scatter_w5,@function .align 32 ecp_nistz256_scatter_w5: +.cfi_startproc leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5: movdqa %xmm5,80(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5 @@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5: .type ecp_nistz256_scatter_w7,@function .align 32 ecp_nistz256_scatter_w7: +.cfi_startproc movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7: movdqa %xmm3,48(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7 @@ -5655,26 +5661,16 @@ ecp_nistz256_point_add: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedq - testq %r9,%r9 - jz .Ladd_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedq -.align 32 .Ladd_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedx - testq %r9,%r9 - jz .Ladd_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedx -.align 32 .Ladd_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s index 2a18eaee288ce7..1788e568cda5d2 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s @@ -400,12 +400,14 @@ x25519_fe51_mul121666: .type x25519_fe64_eligible,@function .align 32 x25519_fe64_eligible: +.cfi_startproc movl OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx cmpl $0x80100,%ecx cmovel %ecx,%eax .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_eligible,.-x25519_fe64_eligible .globl x25519_fe64_mul @@ -648,6 +650,7 @@ x25519_fe64_sqr: .align 32 x25519_fe64_mul121666: .Lfe64_mul121666_body: +.cfi_startproc movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -676,6 +679,7 @@ x25519_fe64_mul121666: .Lfe64_mul121666_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_mul121666,.-x25519_fe64_mul121666 .globl x25519_fe64_add @@ -683,6 +687,7 @@ x25519_fe64_mul121666: .align 32 x25519_fe64_add: .Lfe64_add_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -711,6 +716,7 @@ x25519_fe64_add: .Lfe64_add_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_add,.-x25519_fe64_add .globl x25519_fe64_sub @@ -718,6 +724,7 @@ x25519_fe64_add: .align 32 x25519_fe64_sub: .Lfe64_sub_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -746,6 +753,7 @@ x25519_fe64_sub: .Lfe64_sub_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_sub,.-x25519_fe64_sub .globl x25519_fe64_tobytes @@ -753,6 +761,7 @@ x25519_fe64_sub: .align 32 x25519_fe64_tobytes: .Lfe64_to_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -788,5 +797,6 @@ x25519_fe64_tobytes: .Lfe64_to_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_tobytes,.-x25519_fe64_tobytes .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s index 6a7a9577c7142f..01d89630a42f73 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .type _aesni_ctr32_ghash_6x,@function .align 32 _aesni_ctr32_ghash_6x: +.cfi_startproc vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x: vpxor %xmm4,%xmm8,%xmm8 .byte 0xf3,0xc3 +.cfi_endproc .size _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x .globl aesni_gcm_decrypt .type aesni_gcm_decrypt,@function @@ -416,6 +418,7 @@ aesni_gcm_decrypt: .type _aesni_ctr32_6x,@function .align 32 _aesni_ctr32_6x: +.cfi_startproc vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -502,6 +505,7 @@ _aesni_ctr32_6x: vpshufb %xmm0,%xmm1,%xmm1 vpxor %xmm4,%xmm14,%xmm14 jmp .Loop_ctr32 +.cfi_endproc .size _aesni_ctr32_6x,.-_aesni_ctr32_6x .globl aesni_gcm_encrypt diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s index deb4f74bfbcd1b..987a65aab38147 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .type poly1305_init,@function .align 32 poly1305_init: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -47,6 +48,7 @@ poly1305_init: movl $1,%eax .Lno_key: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init,.-poly1305_init .type poly1305_blocks,@function @@ -167,6 +169,7 @@ poly1305_blocks: .type poly1305_emit,@function .align 32 poly1305_emit: +.cfi_startproc .Lemit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -187,10 +190,12 @@ poly1305_emit: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit,.-poly1305_emit .type __poly1305_block,@function .align 32 __poly1305_block: +.cfi_startproc mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -230,11 +235,13 @@ __poly1305_block: adcq $0,%rbx adcq $0,%rbp .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_block,.-__poly1305_block .type __poly1305_init_avx,@function .align 32 __poly1305_init_avx: +.cfi_startproc movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -392,6 +399,7 @@ __poly1305_init_avx: leaq -48-64(%rdi),%rdi .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_init_avx,.-__poly1305_init_avx .type poly1305_blocks_avx,@function @@ -1232,6 +1240,7 @@ poly1305_blocks_avx: .type poly1305_emit_avx,@function .align 32 poly1305_emit_avx: +.cfi_startproc cmpl $0,20(%rdi) je .Lemit @@ -1282,6 +1291,7 @@ poly1305_emit_avx: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_avx,.-poly1305_emit_avx .type poly1305_blocks_avx2,@function .align 32 @@ -2478,6 +2488,7 @@ poly1305_blocks_avx512: .type poly1305_init_base2_44,@function .align 32 poly1305_init_base2_44: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -2511,10 +2522,12 @@ poly1305_init_base2_44: movq %r11,8(%rdx) movl $1,%eax .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init_base2_44,.-poly1305_init_base2_44 .type poly1305_blocks_vpmadd52,@function .align 32 poly1305_blocks_vpmadd52: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52 @@ -2621,10 +2634,12 @@ poly1305_blocks_vpmadd52: .Lno_data_vpmadd52: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52 .type poly1305_blocks_vpmadd52_4x,@function .align 32 poly1305_blocks_vpmadd52_4x: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52_4x @@ -3049,10 +3064,12 @@ poly1305_blocks_vpmadd52_4x: .Lno_data_vpmadd52_4x: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x .type poly1305_blocks_vpmadd52_8x,@function .align 32 poly1305_blocks_vpmadd52_8x: +.cfi_startproc shrq $4,%rdx jz .Lno_data_vpmadd52_8x @@ -3393,10 +3410,12 @@ poly1305_blocks_vpmadd52_8x: .Lno_data_vpmadd52_8x: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x .type poly1305_emit_base2_44,@function .align 32 poly1305_emit_base2_44: +.cfi_startproc movq 0(%rdi),%r8 movq 8(%rdi),%r9 movq 16(%rdi),%r10 @@ -3427,6 +3446,7 @@ poly1305_emit_base2_44: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_base2_44,.-poly1305_emit_base2_44 .align 64 .Lconst: @@ -3465,6 +3485,7 @@ poly1305_emit_base2_44: .type xor128_encrypt_n_pad,@function .align 16 xor128_encrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -3506,12 +3527,14 @@ xor128_encrypt_n_pad: .Ldone_enc: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_encrypt_n_pad,.-xor128_encrypt_n_pad .globl xor128_decrypt_n_pad .type xor128_decrypt_n_pad,@function .align 16 xor128_decrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -3557,4 +3580,5 @@ xor128_decrypt_n_pad: .Ldone_dec: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_decrypt_n_pad,.-xor128_decrypt_n_pad diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s index fba70351d48d5c..b97c757550aad0 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl RC4 .type RC4,@function .align 16 -RC4: orq %rsi,%rsi +RC4: +.cfi_startproc + orq %rsi,%rsi jne .Lentry .byte 0xf3,0xc3 .Lentry: -.cfi_startproc pushq %rbx .cfi_adjust_cfa_offset 8 .cfi_offset %rbx,-16 @@ -533,6 +534,7 @@ RC4: orq %rsi,%rsi .type RC4_set_key,@function .align 16 RC4_set_key: +.cfi_startproc leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -599,12 +601,14 @@ RC4_set_key: movl %eax,-8(%rdi) movl %eax,-4(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size RC4_set_key,.-RC4_set_key .globl RC4_options .type RC4_options,@function .align 16 RC4_options: +.cfi_startproc leaq .Lopts(%rip),%rax movl OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -617,6 +621,7 @@ RC4_options: addq $12,%rax .Ldone: .byte 0xf3,0xc3 +.cfi_endproc .align 64 .Lopts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s index e511f25035b2b8..09617d014bdb7b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .type __KeccakF1600,@function .align 32 __KeccakF1600: +.cfi_startproc movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -255,6 +256,7 @@ __KeccakF1600: leaq -192(%r15),%r15 .byte 0xf3,0xc3 +.cfi_endproc .size __KeccakF1600,.-__KeccakF1600 .type KeccakF1600,@function diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s index e436521a040f66..98541727e555da 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s @@ -1421,8 +1421,8 @@ _shaext_shortcut: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) -.cfi_endproc .byte 0xf3,0xc3 +.cfi_endproc .size sha1_block_data_order_shaext,.-sha1_block_data_order_shaext .type sha1_block_data_order_ssse3,@function .align 16 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s index 42b24df18e5afe..9357385da3c49b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .align 64 sha256_block_data_order_shaext: _shaext_shortcut: +.cfi_startproc leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1977,6 +1978,7 @@ _shaext_shortcut: movdqu %xmm1,(%rdi) movdqu %xmm2,16(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size sha256_block_data_order_shaext,.-sha256_block_data_order_shaext .type sha256_block_data_order_ssse3,@function .align 64 @@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2: leaq 448(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08 + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s index 5931a2a93234d0..939f1ca71c9394 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2: leaq 1152(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08 + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s index fd17eaaba49576..9268ce8c9a9d63 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s @@ -12,6 +12,7 @@ .type OPENSSL_atomic_add,@function .align 16 OPENSSL_atomic_add: +.cfi_startproc movl (%rdi),%eax .Lspin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -20,16 +21,19 @@ OPENSSL_atomic_add: movl %r8d,%eax .byte 0x48,0x98 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_atomic_add,.-OPENSSL_atomic_add .globl OPENSSL_rdtsc .type OPENSSL_rdtsc,@function .align 16 OPENSSL_rdtsc: +.cfi_startproc rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_rdtsc,.-OPENSSL_rdtsc .globl OPENSSL_ia32_cpuid @@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid: .type OPENSSL_cleanse,@function .align 16 OPENSSL_cleanse: +.cfi_startproc xorq %rax,%rax cmpq $15,%rsi jae .Lot @@ -234,12 +239,14 @@ OPENSSL_cleanse: cmpq $0,%rsi jne .Little .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_cleanse,.-OPENSSL_cleanse .globl CRYPTO_memcmp .type CRYPTO_memcmp,@function .align 16 CRYPTO_memcmp: +.cfi_startproc xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -268,11 +275,13 @@ CRYPTO_memcmp: shrq $63,%rax .Lno_data: .byte 0xf3,0xc3 +.cfi_endproc .size CRYPTO_memcmp,.-CRYPTO_memcmp .globl OPENSSL_wipe_cpu .type OPENSSL_wipe_cpu,@function .align 16 OPENSSL_wipe_cpu: +.cfi_startproc pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -299,11 +308,13 @@ OPENSSL_wipe_cpu: xorq %r11,%r11 leaq 8(%rsp),%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu .globl OPENSSL_instrument_bus .type OPENSSL_instrument_bus,@function .align 16 OPENSSL_instrument_bus: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -330,12 +341,14 @@ OPENSSL_instrument_bus: movq %r11,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus .globl OPENSSL_instrument_bus2 .type OPENSSL_instrument_bus2,@function .align 16 OPENSSL_instrument_bus2: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -378,11 +391,13 @@ OPENSSL_instrument_bus2: movq 8(%rsp),%rax subq %rcx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 .globl OPENSSL_ia32_rdrand_bytes .type OPENSSL_ia32_rdrand_bytes,@function .align 16 OPENSSL_ia32_rdrand_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdrand_bytes @@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes: .Ldone_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes .globl OPENSSL_ia32_rdseed_bytes .type OPENSSL_ia32_rdseed_bytes,@function .align 16 OPENSSL_ia32_rdseed_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdseed_bytes @@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes: .Ldone_rdseed_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h index 913bb95a5a8a42..14050a45347f62 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi index b134d72e7dc477..04e53d9f2ae658 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi @@ -16,6 +16,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi index 92491dbd9f1334..dd7045e3ac025a 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi @@ -723,6 +723,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm index b2a66729ebcce6..4c4db242e4e88e 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm @@ -49,14 +49,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -112,8 +112,8 @@ our %config = ( sourcedir => ".", target => "linux-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -241,6 +241,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -358,8 +359,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -627,14 +628,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -710,6 +703,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1507,6 +1508,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3261,7 +3268,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3269,6 +3275,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3767,14 +3774,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4215,6 +4214,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4909,49 +4916,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4961,25 +4960,21 @@ our %unified_info = ( "crypto/aes/aesni-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesni-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4997,13 +4992,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -5017,613 +5010,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5637,7 +5528,6 @@ our %unified_info = ( "crypto/bn/asm/x86_64-gcc.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5647,182 +5537,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5832,19 +5692,16 @@ our %unified_info = ( "crypto/bn/rsaz-avx2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/rsaz_exp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5870,31 +5727,26 @@ our %unified_info = ( "crypto/bn/x86_64-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86_64-mont5.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5904,37 +5756,31 @@ our %unified_info = ( "crypto/camellia/cmll-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5944,31 +5790,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5986,278 +5827,232 @@ our %unified_info = ( "crypto/chacha/chacha-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6267,301 +6062,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6569,7 +6314,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6577,7 +6321,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6585,7 +6328,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6593,7 +6335,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6601,7 +6342,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6609,163 +6349,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6783,241 +6496,201 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/x25519-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7025,21 +6698,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7047,13 +6717,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7061,81 +6729,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7143,328 +6798,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7474,91 +7068,76 @@ our %unified_info = ( "crypto/md5/md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/aesni-gcm-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7577,7 +7156,6 @@ our %unified_info = ( "crypto/modes/ghash-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ghashv8-armx.o" => @@ -7587,361 +7165,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7963,265 +7481,221 @@ our %unified_info = ( "crypto/poly1305/poly1305-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-md5-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8231,31 +7705,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8265,7 +7734,6 @@ our %unified_info = ( "crypto/sha/keccak1600-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8279,7 +7747,6 @@ our %unified_info = ( "crypto/sha/sha1-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-mips.o" => @@ -8297,19 +7764,16 @@ our %unified_info = ( "crypto/sha/sha1-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8323,7 +7787,6 @@ our %unified_info = ( "crypto/sha/sha256-mb-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-mips.o" => @@ -8341,13 +7804,11 @@ our %unified_info = ( "crypto/sha/sha256-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8373,727 +7834,606 @@ our %unified_info = ( "crypto/sha/sha512-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp-x86_64.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "crypto/x86_64cpuid.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock-x86_64.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9144,6 +8484,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9388,7 +8736,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9714,7 +9061,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9760,7 +9106,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9826,7 +9171,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9851,7 +9195,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9949,7 +9292,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9999,18 +9341,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -10021,6 +9360,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -10084,10 +9427,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -10116,6 +9455,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10380,6 +9723,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15385,7 +14729,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15393,6 +14736,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15620,6 +14964,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15722,10 +15074,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15754,6 +15102,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aes-x86_64.s deleted file mode 100644 index f0c1685fb93450..00000000000000 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aes-x86_64.s +++ /dev/null @@ -1,2649 +0,0 @@ -.text -.type _x86_64_AES_encrypt,@function -.align 16 -_x86_64_AES_encrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Lenc_loop -.align 16 -.Lenc_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - shrl $16,%ecx - movzbl %ah,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movl 12(%r15),%edx - movzbl %bh,%edi - movzbl %ch,%ebp - movl 0(%r15),%eax - xorl 1(%r14,%rdi,8),%r12d - xorl 1(%r14,%rbp,8),%r8d - - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - subl $1,%r13d - jnz .Lenc_loop - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl 2(%r14,%rsi,8),%r10d - movzbl 2(%r14,%rdi,8),%r11d - movzbl 2(%r14,%rbp,8),%r12d - - movzbl %dl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl 2(%r14,%rsi,8),%r8d - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x0000ff00,%edi - andl $0x0000ff00,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%ecx - - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - - andl $0x0000ff00,%esi - andl $0x0000ff00,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%eax - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movl 0(%r14,%rsi,8),%esi - movl 0(%r14,%rdi,8),%edi - movl 0(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0x00ff0000,%edi - andl $0x00ff0000,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movl 0(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 2(%r14,%rbp,8),%ebp - - andl $0x00ff0000,%esi - andl $0xff000000,%edi - andl $0xff000000,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %bh,%esi - movzbl %ch,%edi - movl 16+12(%r15),%edx - movl 2(%r14,%rsi,8),%esi - movl 2(%r14,%rdi,8),%edi - movl 16+0(%r15),%eax - - andl $0xff000000,%esi - andl $0xff000000,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_encrypt,.-_x86_64_AES_encrypt -.type _x86_64_AES_encrypt_compact,@function -.align 16 -_x86_64_AES_encrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Lenc_loop_compact -.align 16 -.Lenc_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%ecx - movzbl %dh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ah,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl %cl,%edi - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shll $8,%r9d - shrl $16,%edx - shll $8,%r13d - xorl %r9d,%r10d - shrl $16,%eax - movzbl %dl,%r9d - shrl $16,%ebx - xorl %r13d,%r11d - shll $8,%ebp - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - - shll $8,%esi - movzbl %bl,%ebp - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %dh,%esi - movzbl (%r14,%r13,1),%r13d - xorl %edi,%r10d - - shrl $8,%ecx - movzbl %ah,%edi - shll $16,%r9d - shrl $8,%ebx - shll $16,%r13d - xorl %r9d,%r11d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rcx,1),%edx - movzbl (%r14,%rbx,1),%ecx - - shll $16,%ebp - xorl %r13d,%r12d - shll $24,%esi - xorl %ebp,%r8d - shll $24,%edi - xorl %esi,%r10d - shll $24,%edx - xorl %edi,%r11d - shll $24,%ecx - movl %r10d,%eax - movl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Lenc_compact_done - movl $0x80808080,%r10d - movl $0x80808080,%r11d - andl %eax,%r10d - andl %ebx,%r11d - movl %r10d,%esi - movl %r11d,%edi - shrl $7,%r10d - leal (%rax,%rax,1),%r8d - shrl $7,%r11d - leal (%rbx,%rbx,1),%r9d - subl %r10d,%esi - subl %r11d,%edi - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %eax,%r10d - movl %ebx,%r11d - xorl %esi,%r8d - xorl %edi,%r9d - - xorl %r8d,%eax - xorl %r9d,%ebx - movl $0x80808080,%r12d - roll $24,%eax - movl $0x80808080,%ebp - roll $24,%ebx - andl %ecx,%r12d - andl %edx,%ebp - xorl %r8d,%eax - xorl %r9d,%ebx - movl %r12d,%esi - rorl $16,%r10d - movl %ebp,%edi - rorl $16,%r11d - leal (%rcx,%rcx,1),%r8d - shrl $7,%r12d - xorl %r10d,%eax - shrl $7,%ebp - xorl %r11d,%ebx - rorl $8,%r10d - leal (%rdx,%rdx,1),%r9d - rorl $8,%r11d - subl %r12d,%esi - subl %ebp,%edi - xorl %r10d,%eax - xorl %r11d,%ebx - - andl $0xfefefefe,%r8d - andl $0xfefefefe,%r9d - andl $0x1b1b1b1b,%esi - andl $0x1b1b1b1b,%edi - movl %ecx,%r12d - movl %edx,%ebp - xorl %esi,%r8d - xorl %edi,%r9d - - rorl $16,%r12d - xorl %r8d,%ecx - rorl $16,%ebp - xorl %r9d,%edx - roll $24,%ecx - movl 0(%r14),%esi - roll $24,%edx - xorl %r8d,%ecx - movl 64(%r14),%edi - xorl %r9d,%edx - movl 128(%r14),%r8d - xorl %r12d,%ecx - rorl $8,%r12d - xorl %ebp,%edx - rorl $8,%ebp - xorl %r12d,%ecx - movl 192(%r14),%r9d - xorl %ebp,%edx - jmp .Lenc_loop_compact -.align 16 -.Lenc_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact -.globl AES_encrypt -.type AES_encrypt,@function -.align 16 -.globl asm_AES_encrypt -.hidden asm_AES_encrypt -asm_AES_encrypt: -AES_encrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Lenc_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Te+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - - call _x86_64_AES_encrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Lenc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_encrypt,.-AES_encrypt -.type _x86_64_AES_decrypt,@function -.align 16 -_x86_64_AES_decrypt: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - - movl 240(%r15),%r13d - subl $1,%r13d - jmp .Ldec_loop -.align 16 -.Ldec_loop: - - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movl 0(%r14,%rsi,8),%r10d - movl 0(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r12d - - movzbl %dh,%esi - movzbl %ah,%edi - movzbl %dl,%ebp - xorl 3(%r14,%rsi,8),%r10d - xorl 3(%r14,%rdi,8),%r11d - movl 0(%r14,%rbp,8),%r8d - - movzbl %bh,%esi - shrl $16,%eax - movzbl %ch,%ebp - xorl 3(%r14,%rsi,8),%r12d - shrl $16,%edx - xorl 3(%r14,%rbp,8),%r8d - - shrl $16,%ebx - leaq 16(%r15),%r15 - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - xorl 2(%r14,%rsi,8),%r10d - xorl 2(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r12d - - movzbl %bh,%esi - movzbl %ch,%edi - movzbl %bl,%ebp - xorl 1(%r14,%rsi,8),%r10d - xorl 1(%r14,%rdi,8),%r11d - xorl 2(%r14,%rbp,8),%r8d - - movzbl %dh,%esi - movl 12(%r15),%edx - movzbl %ah,%ebp - xorl 1(%r14,%rsi,8),%r12d - movl 0(%r15),%eax - xorl 1(%r14,%rbp,8),%r8d - - xorl %r10d,%eax - movl 4(%r15),%ebx - movl 8(%r15),%ecx - xorl %r12d,%ecx - xorl %r11d,%ebx - xorl %r8d,%edx - subl $1,%r13d - jnz .Ldec_loop - leaq 2048(%r14),%r14 - movzbl %al,%esi - movzbl %bl,%edi - movzbl %cl,%ebp - movzbl (%r14,%rsi,1),%r10d - movzbl (%r14,%rdi,1),%r11d - movzbl (%r14,%rbp,1),%r12d - - movzbl %dl,%esi - movzbl %dh,%edi - movzbl %ah,%ebp - movzbl (%r14,%rsi,1),%r8d - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $8,%edi - shll $8,%ebp - - xorl %edi,%r10d - xorl %ebp,%r11d - shrl $16,%edx - - movzbl %bh,%esi - movzbl %ch,%edi - shrl $16,%eax - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - - shll $8,%esi - shll $8,%edi - shrl $16,%ebx - xorl %esi,%r12d - xorl %edi,%r8d - shrl $16,%ecx - - movzbl %cl,%esi - movzbl %dl,%edi - movzbl %al,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $16,%edi - shll $16,%ebp - - xorl %esi,%r10d - xorl %edi,%r11d - xorl %ebp,%r12d - - movzbl %bl,%esi - movzbl %bh,%edi - movzbl %ch,%ebp - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movzbl (%r14,%rbp,1),%ebp - - shll $16,%esi - shll $24,%edi - shll $24,%ebp - - xorl %esi,%r8d - xorl %edi,%r10d - xorl %ebp,%r11d - - movzbl %dh,%esi - movzbl %ah,%edi - movl 16+12(%r15),%edx - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%edi - movl 16+0(%r15),%eax - - shll $24,%esi - shll $24,%edi - - xorl %esi,%r12d - xorl %edi,%r8d - - movl 16+4(%r15),%ebx - movl 16+8(%r15),%ecx - leaq -2048(%r14),%r14 - xorl %r10d,%eax - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx -.byte 0xf3,0xc3 -.size _x86_64_AES_decrypt,.-_x86_64_AES_decrypt -.type _x86_64_AES_decrypt_compact,@function -.align 16 -_x86_64_AES_decrypt_compact: -.cfi_startproc - leaq 128(%r14),%r8 - movl 0-128(%r8),%edi - movl 32-128(%r8),%ebp - movl 64-128(%r8),%r10d - movl 96-128(%r8),%r11d - movl 128-128(%r8),%edi - movl 160-128(%r8),%ebp - movl 192-128(%r8),%r10d - movl 224-128(%r8),%r11d - jmp .Ldec_loop_compact - -.align 16 -.Ldec_loop_compact: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx - leaq 16(%r15),%r15 - movzbl %al,%r10d - movzbl %bl,%r11d - movzbl %cl,%r12d - movzbl %dl,%r8d - movzbl %dh,%esi - movzbl %ah,%edi - shrl $16,%edx - movzbl %bh,%ebp - movzbl (%r14,%r10,1),%r10d - movzbl (%r14,%r11,1),%r11d - movzbl (%r14,%r12,1),%r12d - movzbl (%r14,%r8,1),%r8d - - movzbl (%r14,%rsi,1),%r9d - movzbl %ch,%esi - movzbl (%r14,%rdi,1),%r13d - movzbl (%r14,%rbp,1),%ebp - movzbl (%r14,%rsi,1),%esi - - shrl $16,%ecx - shll $8,%r13d - shll $8,%r9d - movzbl %cl,%edi - shrl $16,%eax - xorl %r9d,%r10d - shrl $16,%ebx - movzbl %dl,%r9d - - shll $8,%ebp - xorl %r13d,%r11d - shll $8,%esi - movzbl %al,%r13d - movzbl (%r14,%rdi,1),%edi - xorl %ebp,%r12d - movzbl %bl,%ebp - - shll $16,%edi - xorl %esi,%r8d - movzbl (%r14,%r9,1),%r9d - movzbl %bh,%esi - movzbl (%r14,%rbp,1),%ebp - xorl %edi,%r10d - movzbl (%r14,%r13,1),%r13d - movzbl %ch,%edi - - shll $16,%ebp - shll $16,%r9d - shll $16,%r13d - xorl %ebp,%r8d - movzbl %dh,%ebp - xorl %r9d,%r11d - shrl $8,%eax - xorl %r13d,%r12d - - movzbl (%r14,%rsi,1),%esi - movzbl (%r14,%rdi,1),%ebx - movzbl (%r14,%rbp,1),%ecx - movzbl (%r14,%rax,1),%edx - - movl %r10d,%eax - shll $24,%esi - shll $24,%ebx - shll $24,%ecx - xorl %esi,%eax - shll $24,%edx - xorl %r11d,%ebx - xorl %r12d,%ecx - xorl %r8d,%edx - cmpq 16(%rsp),%r15 - je .Ldec_compact_done - - movq 256+0(%r14),%rsi - shlq $32,%rbx - shlq $32,%rdx - movq 256+8(%r14),%rdi - orq %rbx,%rax - orq %rdx,%rcx - movq 256+16(%r14),%rbp - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - movq 0(%r14),%rsi - roll $16,%r9d - movq 64(%r14),%rdi - roll $16,%r12d - movq 128(%r14),%rbp - roll $16,%r8d - movq 192(%r14),%r10 - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - movq 256(%r14),%r13 - xorl %r8d,%ebx - xorl %r11d,%edx - jmp .Ldec_loop_compact -.align 16 -.Ldec_compact_done: - xorl 0(%r15),%eax - xorl 4(%r15),%ebx - xorl 8(%r15),%ecx - xorl 12(%r15),%edx -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact -.globl AES_decrypt -.type AES_decrypt,@function -.align 16 -.globl asm_AES_decrypt -.hidden asm_AES_decrypt -asm_AES_decrypt: -AES_decrypt: -.cfi_startproc - movq %rsp,%rax -.cfi_def_cfa_register %rax - pushq %rbx -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_offset %r15,-56 - - - leaq -63(%rdx),%rcx - andq $-64,%rsp - subq %rsp,%rcx - negq %rcx - andq $0x3c0,%rcx - subq %rcx,%rsp - subq $32,%rsp - - movq %rsi,16(%rsp) - movq %rax,24(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x18,0x06,0x23,0x08 -.Ldec_prologue: - - movq %rdx,%r15 - movl 240(%r15),%r13d - - movl 0(%rdi),%eax - movl 4(%rdi),%ebx - movl 8(%rdi),%ecx - movl 12(%rdi),%edx - - shll $4,%r13d - leaq (%r15,%r13,1),%rbp - movq %r15,(%rsp) - movq %rbp,8(%rsp) - - - leaq .LAES_Td+2048(%rip),%r14 - leaq 768(%rsp),%rbp - subq %r14,%rbp - andq $0x300,%rbp - leaq (%r14,%rbp,1),%r14 - shrq $3,%rbp - addq %rbp,%r14 - - call _x86_64_AES_decrypt_compact - - movq 16(%rsp),%r9 - movq 24(%rsp),%rsi -.cfi_def_cfa %rsi,8 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - movq -48(%rsi),%r15 -.cfi_restore %r15 - movq -40(%rsi),%r14 -.cfi_restore %r14 - movq -32(%rsi),%r13 -.cfi_restore %r13 - movq -24(%rsi),%r12 -.cfi_restore %r12 - movq -16(%rsi),%rbp -.cfi_restore %rbp - movq -8(%rsi),%rbx -.cfi_restore %rbx - leaq (%rsi),%rsp -.cfi_def_cfa_register %rsp -.Ldec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_decrypt,.-AES_decrypt -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,@function -.align 16 -AES_set_encrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - subq $8,%rsp -.cfi_adjust_cfa_offset 8 -.Lenc_key_prologue: - - call _x86_64_AES_set_encrypt_key - - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Lenc_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_encrypt_key,.-AES_set_encrypt_key - -.type _x86_64_AES_set_encrypt_key,@function -.align 16 -_x86_64_AES_set_encrypt_key: -.cfi_startproc - movl %esi,%ecx - movq %rdi,%rsi - movq %rdx,%rdi - - testq $-1,%rsi - jz .Lbadpointer - testq $-1,%rdi - jz .Lbadpointer - - leaq .LAES_Te(%rip),%rbp - leaq 2048+128(%rbp),%rbp - - - movl 0-128(%rbp),%eax - movl 32-128(%rbp),%ebx - movl 64-128(%rbp),%r8d - movl 96-128(%rbp),%edx - movl 128-128(%rbp),%eax - movl 160-128(%rbp),%ebx - movl 192-128(%rbp),%r8d - movl 224-128(%rbp),%edx - - cmpl $128,%ecx - je .L10rounds - cmpl $192,%ecx - je .L12rounds - cmpl $256,%ecx - je .L14rounds - movq $-2,%rax - jmp .Lexit - -.L10rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rdx - movq %rax,0(%rdi) - movq %rdx,8(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L10shortcut -.align 4 -.L10loop: - movl 0(%rdi),%eax - movl 12(%rdi),%edx -.L10shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,16(%rdi) - xorl 4(%rdi),%eax - movl %eax,20(%rdi) - xorl 8(%rdi),%eax - movl %eax,24(%rdi) - xorl 12(%rdi),%eax - movl %eax,28(%rdi) - addl $1,%ecx - leaq 16(%rdi),%rdi - cmpl $10,%ecx - jl .L10loop - - movl $10,80(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L12rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rdx,16(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L12shortcut -.align 4 -.L12loop: - movl 0(%rdi),%eax - movl 20(%rdi),%edx -.L12shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,24(%rdi) - xorl 4(%rdi),%eax - movl %eax,28(%rdi) - xorl 8(%rdi),%eax - movl %eax,32(%rdi) - xorl 12(%rdi),%eax - movl %eax,36(%rdi) - - cmpl $7,%ecx - je .L12break - addl $1,%ecx - - xorl 16(%rdi),%eax - movl %eax,40(%rdi) - xorl 20(%rdi),%eax - movl %eax,44(%rdi) - - leaq 24(%rdi),%rdi - jmp .L12loop -.L12break: - movl $12,72(%rdi) - xorq %rax,%rax - jmp .Lexit - -.L14rounds: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 16(%rsi),%rcx - movq 24(%rsi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,16(%rdi) - movq %rdx,24(%rdi) - - shrq $32,%rdx - xorl %ecx,%ecx - jmp .L14shortcut -.align 4 -.L14loop: - movl 0(%rdi),%eax - movl 28(%rdi),%edx -.L14shortcut: - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $24,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $8,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $16,%ebx - xorl %ebx,%eax - - xorl 1024-128(%rbp,%rcx,4),%eax - movl %eax,32(%rdi) - xorl 4(%rdi),%eax - movl %eax,36(%rdi) - xorl 8(%rdi),%eax - movl %eax,40(%rdi) - xorl 12(%rdi),%eax - movl %eax,44(%rdi) - - cmpl $6,%ecx - je .L14break - addl $1,%ecx - - movl %eax,%edx - movl 16(%rdi),%eax - movzbl %dl,%esi - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shrl $16,%edx - shll $8,%ebx - movzbl %dl,%esi - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - movzbl %dh,%esi - shll $16,%ebx - xorl %ebx,%eax - - movzbl -128(%rbp,%rsi,1),%ebx - shll $24,%ebx - xorl %ebx,%eax - - movl %eax,48(%rdi) - xorl 20(%rdi),%eax - movl %eax,52(%rdi) - xorl 24(%rdi),%eax - movl %eax,56(%rdi) - xorl 28(%rdi),%eax - movl %eax,60(%rdi) - - leaq 32(%rdi),%rdi - jmp .L14loop -.L14break: - movl $14,48(%rdi) - xorq %rax,%rax - jmp .Lexit - -.Lbadpointer: - movq $-1,%rax -.Lexit: -.byte 0xf3,0xc3 -.cfi_endproc -.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,@function -.align 16 -AES_set_decrypt_key: -.cfi_startproc - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-16 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - pushq %rdx -.cfi_adjust_cfa_offset 8 -.Ldec_key_prologue: - - call _x86_64_AES_set_encrypt_key - movq (%rsp),%r8 - cmpl $0,%eax - jne .Labort - - movl 240(%r8),%r14d - xorq %rdi,%rdi - leaq (%rdi,%r14,4),%rcx - movq %r8,%rsi - leaq (%r8,%rcx,4),%rdi -.align 4 -.Linvert: - movq 0(%rsi),%rax - movq 8(%rsi),%rbx - movq 0(%rdi),%rcx - movq 8(%rdi),%rdx - movq %rax,0(%rdi) - movq %rbx,8(%rdi) - movq %rcx,0(%rsi) - movq %rdx,8(%rsi) - leaq 16(%rsi),%rsi - leaq -16(%rdi),%rdi - cmpq %rsi,%rdi - jne .Linvert - - leaq .LAES_Te+2048+1024(%rip),%rax - - movq 40(%rax),%rsi - movq 48(%rax),%rdi - movq 56(%rax),%rbp - - movq %r8,%r15 - subl $1,%r14d -.align 4 -.Lpermute: - leaq 16(%r15),%r15 - movq 0(%r15),%rax - movq 8(%r15),%rcx - movq %rsi,%r9 - movq %rsi,%r12 - andq %rax,%r9 - andq %rcx,%r12 - movq %r9,%rbx - movq %r12,%rdx - shrq $7,%r9 - leaq (%rax,%rax,1),%r8 - shrq $7,%r12 - leaq (%rcx,%rcx,1),%r11 - subq %r9,%rbx - subq %r12,%rdx - andq %rdi,%r8 - andq %rdi,%r11 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r8 - xorq %rdx,%r11 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r8,%r10 - andq %r11,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - leaq (%r8,%r8,1),%r9 - shrq $7,%r13 - leaq (%r11,%r11,1),%r12 - subq %r10,%rbx - subq %r13,%rdx - andq %rdi,%r9 - andq %rdi,%r12 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r9 - xorq %rdx,%r12 - movq %rsi,%r10 - movq %rsi,%r13 - - andq %r9,%r10 - andq %r12,%r13 - movq %r10,%rbx - movq %r13,%rdx - shrq $7,%r10 - xorq %rax,%r8 - shrq $7,%r13 - xorq %rcx,%r11 - subq %r10,%rbx - subq %r13,%rdx - leaq (%r9,%r9,1),%r10 - leaq (%r12,%r12,1),%r13 - xorq %rax,%r9 - xorq %rcx,%r12 - andq %rdi,%r10 - andq %rdi,%r13 - andq %rbp,%rbx - andq %rbp,%rdx - xorq %rbx,%r10 - xorq %rdx,%r13 - - xorq %r10,%rax - xorq %r13,%rcx - xorq %r10,%r8 - xorq %r13,%r11 - movq %rax,%rbx - movq %rcx,%rdx - xorq %r10,%r9 - shrq $32,%rbx - xorq %r13,%r12 - shrq $32,%rdx - xorq %r8,%r10 - roll $8,%eax - xorq %r11,%r13 - roll $8,%ecx - xorq %r9,%r10 - roll $8,%ebx - xorq %r12,%r13 - - roll $8,%edx - xorl %r10d,%eax - shrq $32,%r10 - xorl %r13d,%ecx - shrq $32,%r13 - xorl %r10d,%ebx - xorl %r13d,%edx - - movq %r8,%r10 - roll $24,%r8d - movq %r11,%r13 - roll $24,%r11d - shrq $32,%r10 - xorl %r8d,%eax - shrq $32,%r13 - xorl %r11d,%ecx - roll $24,%r10d - movq %r9,%r8 - roll $24,%r13d - movq %r12,%r11 - shrq $32,%r8 - xorl %r10d,%ebx - shrq $32,%r11 - xorl %r13d,%edx - - - roll $16,%r9d - - roll $16,%r12d - - roll $16,%r8d - - xorl %r9d,%eax - roll $16,%r11d - xorl %r12d,%ecx - - xorl %r8d,%ebx - xorl %r11d,%edx - movl %eax,0(%r15) - movl %ebx,4(%r15) - movl %ecx,8(%r15) - movl %edx,12(%r15) - subl $1,%r14d - jnz .Lpermute - - xorq %rax,%rax -.Labort: - movq 8(%rsp),%r15 -.cfi_restore %r15 - movq 16(%rsp),%r14 -.cfi_restore %r14 - movq 24(%rsp),%r13 -.cfi_restore %r13 - movq 32(%rsp),%r12 -.cfi_restore %r12 - movq 40(%rsp),%rbp -.cfi_restore %rbp - movq 48(%rsp),%rbx -.cfi_restore %rbx - addq $56,%rsp -.cfi_adjust_cfa_offset -56 -.Ldec_key_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_set_decrypt_key,.-AES_set_decrypt_key -.globl AES_cbc_encrypt -.type AES_cbc_encrypt,@function -.align 16 - -.globl asm_AES_cbc_encrypt -.hidden asm_AES_cbc_encrypt -asm_AES_cbc_encrypt: -AES_cbc_encrypt: -.cfi_startproc - cmpq $0,%rdx - je .Lcbc_epilogue - pushfq - - -.cfi_adjust_cfa_offset 8 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-32 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-40 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-48 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-56 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-64 -.Lcbc_prologue: - - cld - movl %r9d,%r9d - - leaq .LAES_Te(%rip),%r14 - leaq .LAES_Td(%rip),%r10 - cmpq $0,%r9 - cmoveq %r10,%r14 - -.cfi_remember_state - movl OPENSSL_ia32cap_P(%rip),%r10d - cmpq $512,%rdx - jb .Lcbc_slow_prologue - testq $15,%rdx - jnz .Lcbc_slow_prologue - btl $28,%r10d - jc .Lcbc_slow_prologue - - - leaq -88-248(%rsp),%r15 - andq $-64,%r15 - - - movq %r14,%r10 - leaq 2304(%r14),%r11 - movq %r15,%r12 - andq $0xFFF,%r10 - andq $0xFFF,%r11 - andq $0xFFF,%r12 - - cmpq %r11,%r12 - jb .Lcbc_te_break_out - subq %r11,%r12 - subq %r12,%r15 - jmp .Lcbc_te_ok -.Lcbc_te_break_out: - subq %r10,%r12 - andq $0xFFF,%r12 - addq $320,%r12 - subq %r12,%r15 -.align 4 -.Lcbc_te_ok: - - xchgq %rsp,%r15 -.cfi_def_cfa_register %r15 - - movq %r15,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_fast_body: - movq %rdi,24(%rsp) - movq %rsi,32(%rsp) - movq %rdx,40(%rsp) - movq %rcx,48(%rsp) - movq %r8,56(%rsp) - movl $0,80+240(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - - movl 240(%r15),%eax - - movq %r15,%r10 - subq %r14,%r10 - andq $0xfff,%r10 - cmpq $2304,%r10 - jb .Lcbc_do_ecopy - cmpq $4096-248,%r10 - jb .Lcbc_skip_ecopy -.align 4 -.Lcbc_do_ecopy: - movq %r15,%rsi - leaq 80(%rsp),%rdi - leaq 80(%rsp),%r15 - movl $30,%ecx -.long 0x90A548F3 - movl %eax,(%rdi) -.Lcbc_skip_ecopy: - movq %r15,0(%rsp) - - movl $18,%ecx -.align 4 -.Lcbc_prefetch_te: - movq 0(%r14),%r10 - movq 32(%r14),%r11 - movq 64(%r14),%r12 - movq 96(%r14),%r13 - leaq 128(%r14),%r14 - subl $1,%ecx - jnz .Lcbc_prefetch_te - leaq -2304(%r14),%r14 - - cmpq $0,%rbx - je .LFAST_DECRYPT - - - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - -.align 4 -.Lcbc_fast_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_encrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - movq %r10,40(%rsp) - jnz .Lcbc_fast_enc_loop - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_fast_cleanup - - -.align 16 -.LFAST_DECRYPT: - cmpq %r8,%r9 - je .Lcbc_fast_dec_in_place - - movq %rbp,64(%rsp) -.align 4 -.Lcbc_fast_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 64(%rsp),%rbp - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0(%rbp),%eax - xorl 4(%rbp),%ebx - xorl 8(%rbp),%ecx - xorl 12(%rbp),%edx - movq %r8,%rbp - - subq $16,%r10 - movq %r10,40(%rsp) - movq %rbp,64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jnz .Lcbc_fast_dec_loop - movq 56(%rsp),%r12 - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0(%r12) - movq %r11,8(%r12) - jmp .Lcbc_fast_cleanup - -.align 16 -.Lcbc_fast_dec_in_place: - movq 0(%rbp),%r10 - movq 8(%rbp),%r11 - movq %r10,0+64(%rsp) - movq %r11,8+64(%rsp) -.align 4 -.Lcbc_fast_dec_in_place_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - - call _x86_64_AES_decrypt - - movq 24(%rsp),%r8 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jz .Lcbc_fast_dec_in_place_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - movq %r10,40(%rsp) - jmp .Lcbc_fast_dec_in_place_loop -.Lcbc_fast_dec_in_place_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - -.align 4 -.Lcbc_fast_cleanup: - cmpl $0,80+240(%rsp) - leaq 80(%rsp),%rdi - je .Lcbc_exit - movl $30,%ecx - xorq %rax,%rax -.long 0x90AB48F3 - - jmp .Lcbc_exit - - -.align 16 -.Lcbc_slow_prologue: -.cfi_restore_state - - leaq -88(%rsp),%rbp - andq $-64,%rbp - - leaq -88-63(%rcx),%r10 - subq %rbp,%r10 - negq %r10 - andq $0x3c0,%r10 - subq %r10,%rbp - - xchgq %rsp,%rbp -.cfi_def_cfa_register %rbp - - movq %rbp,16(%rsp) -.cfi_escape 0x0f,0x05,0x77,0x10,0x06,0x23,0x40 -.Lcbc_slow_body: - - - - - movq %r8,56(%rsp) - movq %r8,%rbp - movq %r9,%rbx - movq %rsi,%r9 - movq %rdi,%r8 - movq %rcx,%r15 - movq %rdx,%r10 - - movl 240(%r15),%eax - movq %r15,0(%rsp) - shll $4,%eax - leaq (%r15,%rax,1),%rax - movq %rax,8(%rsp) - - - leaq 2048(%r14),%r14 - leaq 768-8(%rsp),%rax - subq %r14,%rax - andq $0x300,%rax - leaq (%r14,%rax,1),%r14 - - cmpq $0,%rbx - je .LSLOW_DECRYPT - - - testq $-16,%r10 - movl 0(%rbp),%eax - movl 4(%rbp),%ebx - movl 8(%rbp),%ecx - movl 12(%rbp),%edx - jz .Lcbc_slow_enc_tail - -.align 4 -.Lcbc_slow_enc_loop: - xorl 0(%r8),%eax - xorl 4(%r8),%ebx - xorl 8(%r8),%ecx - xorl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_encrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - subq $16,%r10 - testq $-16,%r10 - jnz .Lcbc_slow_enc_loop - testq $15,%r10 - jnz .Lcbc_slow_enc_tail - movq 56(%rsp),%rbp - movl %eax,0(%rbp) - movl %ebx,4(%rbp) - movl %ecx,8(%rbp) - movl %edx,12(%rbp) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_enc_tail: - movq %rax,%r11 - movq %rcx,%r12 - movq %r10,%rcx - movq %r8,%rsi - movq %r9,%rdi -.long 0x9066A4F3 - movq $16,%rcx - subq %r10,%rcx - xorq %rax,%rax -.long 0x9066AAF3 - movq %r9,%r8 - movq $16,%r10 - movq %r11,%rax - movq %r12,%rcx - jmp .Lcbc_slow_enc_loop - -.align 16 -.LSLOW_DECRYPT: - shrq $3,%rax - addq %rax,%r14 - - movq 0(%rbp),%r11 - movq 8(%rbp),%r12 - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - -.align 4 -.Lcbc_slow_dec_loop: - movl 0(%r8),%eax - movl 4(%r8),%ebx - movl 8(%r8),%ecx - movl 12(%r8),%edx - movq 0(%rsp),%r15 - movq %r8,24(%rsp) - movq %r9,32(%rsp) - movq %r10,40(%rsp) - - call _x86_64_AES_decrypt_compact - - movq 24(%rsp),%r8 - movq 32(%rsp),%r9 - movq 40(%rsp),%r10 - xorl 0+64(%rsp),%eax - xorl 4+64(%rsp),%ebx - xorl 8+64(%rsp),%ecx - xorl 12+64(%rsp),%edx - - movq 0(%r8),%r11 - movq 8(%r8),%r12 - subq $16,%r10 - jc .Lcbc_slow_dec_partial - jz .Lcbc_slow_dec_done - - movq %r11,0+64(%rsp) - movq %r12,8+64(%rsp) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - leaq 16(%r8),%r8 - leaq 16(%r9),%r9 - jmp .Lcbc_slow_dec_loop -.Lcbc_slow_dec_done: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0(%r9) - movl %ebx,4(%r9) - movl %ecx,8(%r9) - movl %edx,12(%r9) - - jmp .Lcbc_exit - -.align 4 -.Lcbc_slow_dec_partial: - movq 56(%rsp),%rdi - movq %r11,0(%rdi) - movq %r12,8(%rdi) - - movl %eax,0+64(%rsp) - movl %ebx,4+64(%rsp) - movl %ecx,8+64(%rsp) - movl %edx,12+64(%rsp) - - movq %r9,%rdi - leaq 64(%rsp),%rsi - leaq 16(%r10),%rcx -.long 0x9066A4F3 - jmp .Lcbc_exit - -.align 16 -.Lcbc_exit: - movq 16(%rsp),%rsi -.cfi_def_cfa %rsi,64 - movq (%rsi),%r15 -.cfi_restore %r15 - movq 8(%rsi),%r14 -.cfi_restore %r14 - movq 16(%rsi),%r13 -.cfi_restore %r13 - movq 24(%rsi),%r12 -.cfi_restore %r12 - movq 32(%rsi),%rbp -.cfi_restore %rbp - movq 40(%rsi),%rbx -.cfi_restore %rbx - leaq 48(%rsi),%rsp -.cfi_def_cfa %rsp,16 -.Lcbc_popfq: - popfq - - -.cfi_adjust_cfa_offset -8 -.Lcbc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size AES_cbc_encrypt,.-AES_cbc_encrypt -.align 64 -.LAES_Te: -.long 0xa56363c6,0xa56363c6 -.long 0x847c7cf8,0x847c7cf8 -.long 0x997777ee,0x997777ee -.long 0x8d7b7bf6,0x8d7b7bf6 -.long 0x0df2f2ff,0x0df2f2ff -.long 0xbd6b6bd6,0xbd6b6bd6 -.long 0xb16f6fde,0xb16f6fde -.long 0x54c5c591,0x54c5c591 -.long 0x50303060,0x50303060 -.long 0x03010102,0x03010102 -.long 0xa96767ce,0xa96767ce -.long 0x7d2b2b56,0x7d2b2b56 -.long 0x19fefee7,0x19fefee7 -.long 0x62d7d7b5,0x62d7d7b5 -.long 0xe6abab4d,0xe6abab4d -.long 0x9a7676ec,0x9a7676ec -.long 0x45caca8f,0x45caca8f -.long 0x9d82821f,0x9d82821f -.long 0x40c9c989,0x40c9c989 -.long 0x877d7dfa,0x877d7dfa -.long 0x15fafaef,0x15fafaef -.long 0xeb5959b2,0xeb5959b2 -.long 0xc947478e,0xc947478e -.long 0x0bf0f0fb,0x0bf0f0fb -.long 0xecadad41,0xecadad41 -.long 0x67d4d4b3,0x67d4d4b3 -.long 0xfda2a25f,0xfda2a25f -.long 0xeaafaf45,0xeaafaf45 -.long 0xbf9c9c23,0xbf9c9c23 -.long 0xf7a4a453,0xf7a4a453 -.long 0x967272e4,0x967272e4 -.long 0x5bc0c09b,0x5bc0c09b -.long 0xc2b7b775,0xc2b7b775 -.long 0x1cfdfde1,0x1cfdfde1 -.long 0xae93933d,0xae93933d -.long 0x6a26264c,0x6a26264c -.long 0x5a36366c,0x5a36366c -.long 0x413f3f7e,0x413f3f7e -.long 0x02f7f7f5,0x02f7f7f5 -.long 0x4fcccc83,0x4fcccc83 -.long 0x5c343468,0x5c343468 -.long 0xf4a5a551,0xf4a5a551 -.long 0x34e5e5d1,0x34e5e5d1 -.long 0x08f1f1f9,0x08f1f1f9 -.long 0x937171e2,0x937171e2 -.long 0x73d8d8ab,0x73d8d8ab -.long 0x53313162,0x53313162 -.long 0x3f15152a,0x3f15152a -.long 0x0c040408,0x0c040408 -.long 0x52c7c795,0x52c7c795 -.long 0x65232346,0x65232346 -.long 0x5ec3c39d,0x5ec3c39d -.long 0x28181830,0x28181830 -.long 0xa1969637,0xa1969637 -.long 0x0f05050a,0x0f05050a -.long 0xb59a9a2f,0xb59a9a2f -.long 0x0907070e,0x0907070e -.long 0x36121224,0x36121224 -.long 0x9b80801b,0x9b80801b -.long 0x3de2e2df,0x3de2e2df -.long 0x26ebebcd,0x26ebebcd -.long 0x6927274e,0x6927274e -.long 0xcdb2b27f,0xcdb2b27f -.long 0x9f7575ea,0x9f7575ea -.long 0x1b090912,0x1b090912 -.long 0x9e83831d,0x9e83831d -.long 0x742c2c58,0x742c2c58 -.long 0x2e1a1a34,0x2e1a1a34 -.long 0x2d1b1b36,0x2d1b1b36 -.long 0xb26e6edc,0xb26e6edc -.long 0xee5a5ab4,0xee5a5ab4 -.long 0xfba0a05b,0xfba0a05b -.long 0xf65252a4,0xf65252a4 -.long 0x4d3b3b76,0x4d3b3b76 -.long 0x61d6d6b7,0x61d6d6b7 -.long 0xceb3b37d,0xceb3b37d -.long 0x7b292952,0x7b292952 -.long 0x3ee3e3dd,0x3ee3e3dd -.long 0x712f2f5e,0x712f2f5e -.long 0x97848413,0x97848413 -.long 0xf55353a6,0xf55353a6 -.long 0x68d1d1b9,0x68d1d1b9 -.long 0x00000000,0x00000000 -.long 0x2cededc1,0x2cededc1 -.long 0x60202040,0x60202040 -.long 0x1ffcfce3,0x1ffcfce3 -.long 0xc8b1b179,0xc8b1b179 -.long 0xed5b5bb6,0xed5b5bb6 -.long 0xbe6a6ad4,0xbe6a6ad4 -.long 0x46cbcb8d,0x46cbcb8d -.long 0xd9bebe67,0xd9bebe67 -.long 0x4b393972,0x4b393972 -.long 0xde4a4a94,0xde4a4a94 -.long 0xd44c4c98,0xd44c4c98 -.long 0xe85858b0,0xe85858b0 -.long 0x4acfcf85,0x4acfcf85 -.long 0x6bd0d0bb,0x6bd0d0bb -.long 0x2aefefc5,0x2aefefc5 -.long 0xe5aaaa4f,0xe5aaaa4f -.long 0x16fbfbed,0x16fbfbed -.long 0xc5434386,0xc5434386 -.long 0xd74d4d9a,0xd74d4d9a -.long 0x55333366,0x55333366 -.long 0x94858511,0x94858511 -.long 0xcf45458a,0xcf45458a -.long 0x10f9f9e9,0x10f9f9e9 -.long 0x06020204,0x06020204 -.long 0x817f7ffe,0x817f7ffe -.long 0xf05050a0,0xf05050a0 -.long 0x443c3c78,0x443c3c78 -.long 0xba9f9f25,0xba9f9f25 -.long 0xe3a8a84b,0xe3a8a84b -.long 0xf35151a2,0xf35151a2 -.long 0xfea3a35d,0xfea3a35d -.long 0xc0404080,0xc0404080 -.long 0x8a8f8f05,0x8a8f8f05 -.long 0xad92923f,0xad92923f -.long 0xbc9d9d21,0xbc9d9d21 -.long 0x48383870,0x48383870 -.long 0x04f5f5f1,0x04f5f5f1 -.long 0xdfbcbc63,0xdfbcbc63 -.long 0xc1b6b677,0xc1b6b677 -.long 0x75dadaaf,0x75dadaaf -.long 0x63212142,0x63212142 -.long 0x30101020,0x30101020 -.long 0x1affffe5,0x1affffe5 -.long 0x0ef3f3fd,0x0ef3f3fd -.long 0x6dd2d2bf,0x6dd2d2bf -.long 0x4ccdcd81,0x4ccdcd81 -.long 0x140c0c18,0x140c0c18 -.long 0x35131326,0x35131326 -.long 0x2fececc3,0x2fececc3 -.long 0xe15f5fbe,0xe15f5fbe -.long 0xa2979735,0xa2979735 -.long 0xcc444488,0xcc444488 -.long 0x3917172e,0x3917172e -.long 0x57c4c493,0x57c4c493 -.long 0xf2a7a755,0xf2a7a755 -.long 0x827e7efc,0x827e7efc -.long 0x473d3d7a,0x473d3d7a -.long 0xac6464c8,0xac6464c8 -.long 0xe75d5dba,0xe75d5dba -.long 0x2b191932,0x2b191932 -.long 0x957373e6,0x957373e6 -.long 0xa06060c0,0xa06060c0 -.long 0x98818119,0x98818119 -.long 0xd14f4f9e,0xd14f4f9e -.long 0x7fdcdca3,0x7fdcdca3 -.long 0x66222244,0x66222244 -.long 0x7e2a2a54,0x7e2a2a54 -.long 0xab90903b,0xab90903b -.long 0x8388880b,0x8388880b -.long 0xca46468c,0xca46468c -.long 0x29eeeec7,0x29eeeec7 -.long 0xd3b8b86b,0xd3b8b86b -.long 0x3c141428,0x3c141428 -.long 0x79dedea7,0x79dedea7 -.long 0xe25e5ebc,0xe25e5ebc -.long 0x1d0b0b16,0x1d0b0b16 -.long 0x76dbdbad,0x76dbdbad -.long 0x3be0e0db,0x3be0e0db -.long 0x56323264,0x56323264 -.long 0x4e3a3a74,0x4e3a3a74 -.long 0x1e0a0a14,0x1e0a0a14 -.long 0xdb494992,0xdb494992 -.long 0x0a06060c,0x0a06060c -.long 0x6c242448,0x6c242448 -.long 0xe45c5cb8,0xe45c5cb8 -.long 0x5dc2c29f,0x5dc2c29f -.long 0x6ed3d3bd,0x6ed3d3bd -.long 0xefacac43,0xefacac43 -.long 0xa66262c4,0xa66262c4 -.long 0xa8919139,0xa8919139 -.long 0xa4959531,0xa4959531 -.long 0x37e4e4d3,0x37e4e4d3 -.long 0x8b7979f2,0x8b7979f2 -.long 0x32e7e7d5,0x32e7e7d5 -.long 0x43c8c88b,0x43c8c88b -.long 0x5937376e,0x5937376e -.long 0xb76d6dda,0xb76d6dda -.long 0x8c8d8d01,0x8c8d8d01 -.long 0x64d5d5b1,0x64d5d5b1 -.long 0xd24e4e9c,0xd24e4e9c -.long 0xe0a9a949,0xe0a9a949 -.long 0xb46c6cd8,0xb46c6cd8 -.long 0xfa5656ac,0xfa5656ac -.long 0x07f4f4f3,0x07f4f4f3 -.long 0x25eaeacf,0x25eaeacf -.long 0xaf6565ca,0xaf6565ca -.long 0x8e7a7af4,0x8e7a7af4 -.long 0xe9aeae47,0xe9aeae47 -.long 0x18080810,0x18080810 -.long 0xd5baba6f,0xd5baba6f -.long 0x887878f0,0x887878f0 -.long 0x6f25254a,0x6f25254a -.long 0x722e2e5c,0x722e2e5c -.long 0x241c1c38,0x241c1c38 -.long 0xf1a6a657,0xf1a6a657 -.long 0xc7b4b473,0xc7b4b473 -.long 0x51c6c697,0x51c6c697 -.long 0x23e8e8cb,0x23e8e8cb -.long 0x7cdddda1,0x7cdddda1 -.long 0x9c7474e8,0x9c7474e8 -.long 0x211f1f3e,0x211f1f3e -.long 0xdd4b4b96,0xdd4b4b96 -.long 0xdcbdbd61,0xdcbdbd61 -.long 0x868b8b0d,0x868b8b0d -.long 0x858a8a0f,0x858a8a0f -.long 0x907070e0,0x907070e0 -.long 0x423e3e7c,0x423e3e7c -.long 0xc4b5b571,0xc4b5b571 -.long 0xaa6666cc,0xaa6666cc -.long 0xd8484890,0xd8484890 -.long 0x05030306,0x05030306 -.long 0x01f6f6f7,0x01f6f6f7 -.long 0x120e0e1c,0x120e0e1c -.long 0xa36161c2,0xa36161c2 -.long 0x5f35356a,0x5f35356a -.long 0xf95757ae,0xf95757ae -.long 0xd0b9b969,0xd0b9b969 -.long 0x91868617,0x91868617 -.long 0x58c1c199,0x58c1c199 -.long 0x271d1d3a,0x271d1d3a -.long 0xb99e9e27,0xb99e9e27 -.long 0x38e1e1d9,0x38e1e1d9 -.long 0x13f8f8eb,0x13f8f8eb -.long 0xb398982b,0xb398982b -.long 0x33111122,0x33111122 -.long 0xbb6969d2,0xbb6969d2 -.long 0x70d9d9a9,0x70d9d9a9 -.long 0x898e8e07,0x898e8e07 -.long 0xa7949433,0xa7949433 -.long 0xb69b9b2d,0xb69b9b2d -.long 0x221e1e3c,0x221e1e3c -.long 0x92878715,0x92878715 -.long 0x20e9e9c9,0x20e9e9c9 -.long 0x49cece87,0x49cece87 -.long 0xff5555aa,0xff5555aa -.long 0x78282850,0x78282850 -.long 0x7adfdfa5,0x7adfdfa5 -.long 0x8f8c8c03,0x8f8c8c03 -.long 0xf8a1a159,0xf8a1a159 -.long 0x80898909,0x80898909 -.long 0x170d0d1a,0x170d0d1a -.long 0xdabfbf65,0xdabfbf65 -.long 0x31e6e6d7,0x31e6e6d7 -.long 0xc6424284,0xc6424284 -.long 0xb86868d0,0xb86868d0 -.long 0xc3414182,0xc3414182 -.long 0xb0999929,0xb0999929 -.long 0x772d2d5a,0x772d2d5a -.long 0x110f0f1e,0x110f0f1e -.long 0xcbb0b07b,0xcbb0b07b -.long 0xfc5454a8,0xfc5454a8 -.long 0xd6bbbb6d,0xd6bbbb6d -.long 0x3a16162c,0x3a16162c -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.byte 0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5 -.byte 0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76 -.byte 0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0 -.byte 0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0 -.byte 0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc -.byte 0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15 -.byte 0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a -.byte 0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75 -.byte 0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0 -.byte 0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84 -.byte 0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b -.byte 0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf -.byte 0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85 -.byte 0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8 -.byte 0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5 -.byte 0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2 -.byte 0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17 -.byte 0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73 -.byte 0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88 -.byte 0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb -.byte 0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c -.byte 0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79 -.byte 0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9 -.byte 0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08 -.byte 0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6 -.byte 0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a -.byte 0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e -.byte 0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e -.byte 0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94 -.byte 0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf -.byte 0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68 -.byte 0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16 -.long 0x00000001, 0x00000002, 0x00000004, 0x00000008 -.long 0x00000010, 0x00000020, 0x00000040, 0x00000080 -.long 0x0000001b, 0x00000036, 0x80808080, 0x80808080 -.long 0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b -.align 64 -.LAES_Td: -.long 0x50a7f451,0x50a7f451 -.long 0x5365417e,0x5365417e -.long 0xc3a4171a,0xc3a4171a -.long 0x965e273a,0x965e273a -.long 0xcb6bab3b,0xcb6bab3b -.long 0xf1459d1f,0xf1459d1f -.long 0xab58faac,0xab58faac -.long 0x9303e34b,0x9303e34b -.long 0x55fa3020,0x55fa3020 -.long 0xf66d76ad,0xf66d76ad -.long 0x9176cc88,0x9176cc88 -.long 0x254c02f5,0x254c02f5 -.long 0xfcd7e54f,0xfcd7e54f -.long 0xd7cb2ac5,0xd7cb2ac5 -.long 0x80443526,0x80443526 -.long 0x8fa362b5,0x8fa362b5 -.long 0x495ab1de,0x495ab1de -.long 0x671bba25,0x671bba25 -.long 0x980eea45,0x980eea45 -.long 0xe1c0fe5d,0xe1c0fe5d -.long 0x02752fc3,0x02752fc3 -.long 0x12f04c81,0x12f04c81 -.long 0xa397468d,0xa397468d -.long 0xc6f9d36b,0xc6f9d36b -.long 0xe75f8f03,0xe75f8f03 -.long 0x959c9215,0x959c9215 -.long 0xeb7a6dbf,0xeb7a6dbf -.long 0xda595295,0xda595295 -.long 0x2d83bed4,0x2d83bed4 -.long 0xd3217458,0xd3217458 -.long 0x2969e049,0x2969e049 -.long 0x44c8c98e,0x44c8c98e -.long 0x6a89c275,0x6a89c275 -.long 0x78798ef4,0x78798ef4 -.long 0x6b3e5899,0x6b3e5899 -.long 0xdd71b927,0xdd71b927 -.long 0xb64fe1be,0xb64fe1be -.long 0x17ad88f0,0x17ad88f0 -.long 0x66ac20c9,0x66ac20c9 -.long 0xb43ace7d,0xb43ace7d -.long 0x184adf63,0x184adf63 -.long 0x82311ae5,0x82311ae5 -.long 0x60335197,0x60335197 -.long 0x457f5362,0x457f5362 -.long 0xe07764b1,0xe07764b1 -.long 0x84ae6bbb,0x84ae6bbb -.long 0x1ca081fe,0x1ca081fe -.long 0x942b08f9,0x942b08f9 -.long 0x58684870,0x58684870 -.long 0x19fd458f,0x19fd458f -.long 0x876cde94,0x876cde94 -.long 0xb7f87b52,0xb7f87b52 -.long 0x23d373ab,0x23d373ab -.long 0xe2024b72,0xe2024b72 -.long 0x578f1fe3,0x578f1fe3 -.long 0x2aab5566,0x2aab5566 -.long 0x0728ebb2,0x0728ebb2 -.long 0x03c2b52f,0x03c2b52f -.long 0x9a7bc586,0x9a7bc586 -.long 0xa50837d3,0xa50837d3 -.long 0xf2872830,0xf2872830 -.long 0xb2a5bf23,0xb2a5bf23 -.long 0xba6a0302,0xba6a0302 -.long 0x5c8216ed,0x5c8216ed -.long 0x2b1ccf8a,0x2b1ccf8a -.long 0x92b479a7,0x92b479a7 -.long 0xf0f207f3,0xf0f207f3 -.long 0xa1e2694e,0xa1e2694e -.long 0xcdf4da65,0xcdf4da65 -.long 0xd5be0506,0xd5be0506 -.long 0x1f6234d1,0x1f6234d1 -.long 0x8afea6c4,0x8afea6c4 -.long 0x9d532e34,0x9d532e34 -.long 0xa055f3a2,0xa055f3a2 -.long 0x32e18a05,0x32e18a05 -.long 0x75ebf6a4,0x75ebf6a4 -.long 0x39ec830b,0x39ec830b -.long 0xaaef6040,0xaaef6040 -.long 0x069f715e,0x069f715e -.long 0x51106ebd,0x51106ebd -.long 0xf98a213e,0xf98a213e -.long 0x3d06dd96,0x3d06dd96 -.long 0xae053edd,0xae053edd -.long 0x46bde64d,0x46bde64d -.long 0xb58d5491,0xb58d5491 -.long 0x055dc471,0x055dc471 -.long 0x6fd40604,0x6fd40604 -.long 0xff155060,0xff155060 -.long 0x24fb9819,0x24fb9819 -.long 0x97e9bdd6,0x97e9bdd6 -.long 0xcc434089,0xcc434089 -.long 0x779ed967,0x779ed967 -.long 0xbd42e8b0,0xbd42e8b0 -.long 0x888b8907,0x888b8907 -.long 0x385b19e7,0x385b19e7 -.long 0xdbeec879,0xdbeec879 -.long 0x470a7ca1,0x470a7ca1 -.long 0xe90f427c,0xe90f427c -.long 0xc91e84f8,0xc91e84f8 -.long 0x00000000,0x00000000 -.long 0x83868009,0x83868009 -.long 0x48ed2b32,0x48ed2b32 -.long 0xac70111e,0xac70111e -.long 0x4e725a6c,0x4e725a6c -.long 0xfbff0efd,0xfbff0efd -.long 0x5638850f,0x5638850f -.long 0x1ed5ae3d,0x1ed5ae3d -.long 0x27392d36,0x27392d36 -.long 0x64d90f0a,0x64d90f0a -.long 0x21a65c68,0x21a65c68 -.long 0xd1545b9b,0xd1545b9b -.long 0x3a2e3624,0x3a2e3624 -.long 0xb1670a0c,0xb1670a0c -.long 0x0fe75793,0x0fe75793 -.long 0xd296eeb4,0xd296eeb4 -.long 0x9e919b1b,0x9e919b1b -.long 0x4fc5c080,0x4fc5c080 -.long 0xa220dc61,0xa220dc61 -.long 0x694b775a,0x694b775a -.long 0x161a121c,0x161a121c -.long 0x0aba93e2,0x0aba93e2 -.long 0xe52aa0c0,0xe52aa0c0 -.long 0x43e0223c,0x43e0223c -.long 0x1d171b12,0x1d171b12 -.long 0x0b0d090e,0x0b0d090e -.long 0xadc78bf2,0xadc78bf2 -.long 0xb9a8b62d,0xb9a8b62d -.long 0xc8a91e14,0xc8a91e14 -.long 0x8519f157,0x8519f157 -.long 0x4c0775af,0x4c0775af -.long 0xbbdd99ee,0xbbdd99ee -.long 0xfd607fa3,0xfd607fa3 -.long 0x9f2601f7,0x9f2601f7 -.long 0xbcf5725c,0xbcf5725c -.long 0xc53b6644,0xc53b6644 -.long 0x347efb5b,0x347efb5b -.long 0x7629438b,0x7629438b -.long 0xdcc623cb,0xdcc623cb -.long 0x68fcedb6,0x68fcedb6 -.long 0x63f1e4b8,0x63f1e4b8 -.long 0xcadc31d7,0xcadc31d7 -.long 0x10856342,0x10856342 -.long 0x40229713,0x40229713 -.long 0x2011c684,0x2011c684 -.long 0x7d244a85,0x7d244a85 -.long 0xf83dbbd2,0xf83dbbd2 -.long 0x1132f9ae,0x1132f9ae -.long 0x6da129c7,0x6da129c7 -.long 0x4b2f9e1d,0x4b2f9e1d -.long 0xf330b2dc,0xf330b2dc -.long 0xec52860d,0xec52860d -.long 0xd0e3c177,0xd0e3c177 -.long 0x6c16b32b,0x6c16b32b -.long 0x99b970a9,0x99b970a9 -.long 0xfa489411,0xfa489411 -.long 0x2264e947,0x2264e947 -.long 0xc48cfca8,0xc48cfca8 -.long 0x1a3ff0a0,0x1a3ff0a0 -.long 0xd82c7d56,0xd82c7d56 -.long 0xef903322,0xef903322 -.long 0xc74e4987,0xc74e4987 -.long 0xc1d138d9,0xc1d138d9 -.long 0xfea2ca8c,0xfea2ca8c -.long 0x360bd498,0x360bd498 -.long 0xcf81f5a6,0xcf81f5a6 -.long 0x28de7aa5,0x28de7aa5 -.long 0x268eb7da,0x268eb7da -.long 0xa4bfad3f,0xa4bfad3f -.long 0xe49d3a2c,0xe49d3a2c -.long 0x0d927850,0x0d927850 -.long 0x9bcc5f6a,0x9bcc5f6a -.long 0x62467e54,0x62467e54 -.long 0xc2138df6,0xc2138df6 -.long 0xe8b8d890,0xe8b8d890 -.long 0x5ef7392e,0x5ef7392e -.long 0xf5afc382,0xf5afc382 -.long 0xbe805d9f,0xbe805d9f -.long 0x7c93d069,0x7c93d069 -.long 0xa92dd56f,0xa92dd56f -.long 0xb31225cf,0xb31225cf -.long 0x3b99acc8,0x3b99acc8 -.long 0xa77d1810,0xa77d1810 -.long 0x6e639ce8,0x6e639ce8 -.long 0x7bbb3bdb,0x7bbb3bdb -.long 0x097826cd,0x097826cd -.long 0xf418596e,0xf418596e -.long 0x01b79aec,0x01b79aec -.long 0xa89a4f83,0xa89a4f83 -.long 0x656e95e6,0x656e95e6 -.long 0x7ee6ffaa,0x7ee6ffaa -.long 0x08cfbc21,0x08cfbc21 -.long 0xe6e815ef,0xe6e815ef -.long 0xd99be7ba,0xd99be7ba -.long 0xce366f4a,0xce366f4a -.long 0xd4099fea,0xd4099fea -.long 0xd67cb029,0xd67cb029 -.long 0xafb2a431,0xafb2a431 -.long 0x31233f2a,0x31233f2a -.long 0x3094a5c6,0x3094a5c6 -.long 0xc066a235,0xc066a235 -.long 0x37bc4e74,0x37bc4e74 -.long 0xa6ca82fc,0xa6ca82fc -.long 0xb0d090e0,0xb0d090e0 -.long 0x15d8a733,0x15d8a733 -.long 0x4a9804f1,0x4a9804f1 -.long 0xf7daec41,0xf7daec41 -.long 0x0e50cd7f,0x0e50cd7f -.long 0x2ff69117,0x2ff69117 -.long 0x8dd64d76,0x8dd64d76 -.long 0x4db0ef43,0x4db0ef43 -.long 0x544daacc,0x544daacc -.long 0xdf0496e4,0xdf0496e4 -.long 0xe3b5d19e,0xe3b5d19e -.long 0x1b886a4c,0x1b886a4c -.long 0xb81f2cc1,0xb81f2cc1 -.long 0x7f516546,0x7f516546 -.long 0x04ea5e9d,0x04ea5e9d -.long 0x5d358c01,0x5d358c01 -.long 0x737487fa,0x737487fa -.long 0x2e410bfb,0x2e410bfb -.long 0x5a1d67b3,0x5a1d67b3 -.long 0x52d2db92,0x52d2db92 -.long 0x335610e9,0x335610e9 -.long 0x1347d66d,0x1347d66d -.long 0x8c61d79a,0x8c61d79a -.long 0x7a0ca137,0x7a0ca137 -.long 0x8e14f859,0x8e14f859 -.long 0x893c13eb,0x893c13eb -.long 0xee27a9ce,0xee27a9ce -.long 0x35c961b7,0x35c961b7 -.long 0xede51ce1,0xede51ce1 -.long 0x3cb1477a,0x3cb1477a -.long 0x59dfd29c,0x59dfd29c -.long 0x3f73f255,0x3f73f255 -.long 0x79ce1418,0x79ce1418 -.long 0xbf37c773,0xbf37c773 -.long 0xeacdf753,0xeacdf753 -.long 0x5baafd5f,0x5baafd5f -.long 0x146f3ddf,0x146f3ddf -.long 0x86db4478,0x86db4478 -.long 0x81f3afca,0x81f3afca -.long 0x3ec468b9,0x3ec468b9 -.long 0x2c342438,0x2c342438 -.long 0x5f40a3c2,0x5f40a3c2 -.long 0x72c31d16,0x72c31d16 -.long 0x0c25e2bc,0x0c25e2bc -.long 0x8b493c28,0x8b493c28 -.long 0x41950dff,0x41950dff -.long 0x7101a839,0x7101a839 -.long 0xdeb30c08,0xdeb30c08 -.long 0x9ce4b4d8,0x9ce4b4d8 -.long 0x90c15664,0x90c15664 -.long 0x6184cb7b,0x6184cb7b -.long 0x70b632d5,0x70b632d5 -.long 0x745c6c48,0x745c6c48 -.long 0x4257b8d0,0x4257b8d0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38 -.byte 0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb -.byte 0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87 -.byte 0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb -.byte 0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d -.byte 0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e -.byte 0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2 -.byte 0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25 -.byte 0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16 -.byte 0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92 -.byte 0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda -.byte 0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84 -.byte 0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a -.byte 0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06 -.byte 0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02 -.byte 0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b -.byte 0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea -.byte 0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73 -.byte 0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85 -.byte 0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e -.byte 0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89 -.byte 0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b -.byte 0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20 -.byte 0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4 -.byte 0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31 -.byte 0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f -.byte 0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d -.byte 0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef -.byte 0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0 -.byte 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61 -.byte 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26 -.byte 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d -.long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe -.long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 -.byte 65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 -.align 64 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s index 4d2dfe44898fd5..978bd2b6239c15 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha1_enc,@function .align 32 aesni_cbc_sha1_enc: +.cfi_startproc movl OPENSSL_ia32cap_P+0(%rip),%r10d movq OPENSSL_ia32cap_P+4(%rip),%r11 @@ -17,6 +18,7 @@ aesni_cbc_sha1_enc: je aesni_cbc_sha1_enc_avx jmp aesni_cbc_sha1_enc_ssse3 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc .type aesni_cbc_sha1_enc_ssse3,@function .align 32 @@ -2730,6 +2732,7 @@ K_XX_XX: .type aesni_cbc_sha1_enc_shaext,@function .align 32 aesni_cbc_sha1_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 movdqu (%r9),%xmm8 movd 16(%r9),%xmm9 @@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext: movdqu %xmm8,(%r9) movd %xmm9,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s index 5a47b3ee51b741..dd09f1b290af62 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s @@ -5,6 +5,7 @@ .type aesni_cbc_sha256_enc,@function .align 16 aesni_cbc_sha256_enc: +.cfi_startproc leaq OPENSSL_ia32cap_P(%rip),%r11 movl $1,%eax cmpq $0,%rdi @@ -30,6 +31,7 @@ aesni_cbc_sha256_enc: ud2 .Lprobe: .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc .align 64 @@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 120(%rsp),%rsi +.cfi_def_cfa %rsi,8 leaq -64(%rsp),%rsp + + + + movq %rsi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%esi vmovdqa %ymm6,0(%rsp) xorl %ecx,%esi @@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2: vmovdqu (%r13),%xmm9 vpinsrq $0,%r13,%xmm15,%xmm15 leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 64+32(%rsp),%r8 - movq 120(%rsp),%rsi + movq 64+32(%rbp),%r8 + movq 64+56(%rbp),%rsi .cfi_def_cfa %rsi,8 vmovdqu %xmm8,(%r8) vzeroall @@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2: .type aesni_cbc_sha256_enc_shaext,@function .align 32 aesni_cbc_sha256_enc_shaext: +.cfi_startproc movq 8(%rsp),%r10 leaq K256+128(%rip),%rax movdqu (%r9),%xmm1 @@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext: movdqu %xmm1,(%r9) movdqu %xmm2,16(%r9) .byte 0xf3,0xc3 +.cfi_endproc .size aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s index 2986a647c1bb05..c1e791eff59235 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s @@ -861,6 +861,7 @@ aesni_ecb_encrypt: .type aesni_ccm64_encrypt_blocks,@function .align 16 aesni_ccm64_encrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movdqu (%r8),%xmm6 movdqa .Lincrement64(%rip),%xmm9 @@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks .globl aesni_ccm64_decrypt_blocks .type aesni_ccm64_decrypt_blocks,@function .align 16 aesni_ccm64_decrypt_blocks: +.cfi_startproc movl 240(%rcx),%eax movups (%r8),%xmm6 movdqu (%r9),%xmm3 @@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks: pxor %xmm8,%xmm8 pxor %xmm6,%xmm6 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks .globl aesni_ctr32_encrypt_blocks .type aesni_ctr32_encrypt_blocks,@function @@ -2790,6 +2794,7 @@ aesni_ocb_encrypt: .type __ocb_encrypt6,@function .align 32 __ocb_encrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2887,11 +2892,13 @@ __ocb_encrypt6: .byte 102,65,15,56,221,246 .byte 102,65,15,56,221,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt6,.-__ocb_encrypt6 .type __ocb_encrypt4,@function .align 32 __ocb_encrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -2956,11 +2963,13 @@ __ocb_encrypt4: .byte 102,65,15,56,221,228 .byte 102,65,15,56,221,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt4,.-__ocb_encrypt4 .type __ocb_encrypt1,@function .align 32 __ocb_encrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm2,%xmm8 @@ -2991,6 +3000,7 @@ __ocb_encrypt1: .byte 102,15,56,221,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_encrypt1,.-__ocb_encrypt1 .globl aesni_ocb_decrypt @@ -3233,6 +3243,7 @@ aesni_ocb_decrypt: .type __ocb_decrypt6,@function .align 32 __ocb_decrypt6: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3324,11 +3335,13 @@ __ocb_decrypt6: .byte 102,65,15,56,223,246 .byte 102,65,15,56,223,255 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt6,.-__ocb_decrypt6 .type __ocb_decrypt4,@function .align 32 __ocb_decrypt4: +.cfi_startproc pxor %xmm9,%xmm15 movdqu (%rbx,%r12,1),%xmm11 movdqa %xmm10,%xmm12 @@ -3389,11 +3402,13 @@ __ocb_decrypt4: .byte 102,65,15,56,223,228 .byte 102,65,15,56,223,237 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt4,.-__ocb_decrypt4 .type __ocb_decrypt1,@function .align 32 __ocb_decrypt1: +.cfi_startproc pxor %xmm15,%xmm7 pxor %xmm9,%xmm7 pxor %xmm7,%xmm2 @@ -3423,6 +3438,7 @@ __ocb_decrypt1: .byte 102,15,56,223,215 .byte 0xf3,0xc3 +.cfi_endproc .size __ocb_decrypt1,.-__ocb_decrypt1 .globl aesni_cbc_encrypt .type aesni_cbc_encrypt,@function @@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key: addq $8,%rsp .cfi_adjust_cfa_offset -8 .byte 0xf3,0xc3 -.cfi_endproc .LSEH_end_set_encrypt_key: .align 16 @@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key: shufps $170,%xmm1,%xmm1 xorps %xmm1,%xmm2 .byte 0xf3,0xc3 +.cfi_endproc .size aesni_set_encrypt_key,.-aesni_set_encrypt_key .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key .align 64 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s deleted file mode 100644 index e1f3abadbc7214..00000000000000 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s +++ /dev/null @@ -1,2595 +0,0 @@ -.text - - - - -.type _bsaes_encrypt8,@function -.align 64 -_bsaes_encrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa 80(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 -_bsaes_encrypt8_bitslice: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Lenc_sbox -.align 16 -.Lenc_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Lenc_sbox: - pxor %xmm5,%xmm4 - pxor %xmm0,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm1,%xmm5 - pxor %xmm15,%xmm4 - - pxor %xmm2,%xmm5 - pxor %xmm6,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm3,%xmm2 - pxor %xmm4,%xmm3 - pxor %xmm0,%xmm2 - - pxor %xmm6,%xmm1 - pxor %xmm4,%xmm0 - movdqa %xmm6,%xmm10 - movdqa %xmm0,%xmm9 - movdqa %xmm4,%xmm8 - movdqa %xmm1,%xmm12 - movdqa %xmm5,%xmm11 - - pxor %xmm3,%xmm10 - pxor %xmm1,%xmm9 - pxor %xmm2,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm3,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm15,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm2,%xmm11 - pxor %xmm15,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm6,%xmm12 - movdqa %xmm4,%xmm11 - pxor %xmm0,%xmm12 - pxor %xmm5,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm1,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm3,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm0,%xmm13 - pand %xmm2,%xmm11 - movdqa %xmm6,%xmm14 - pand %xmm15,%xmm12 - pand %xmm4,%xmm13 - por %xmm5,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm5,%xmm11 - movdqa %xmm4,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm5,%xmm9 - pxor %xmm4,%xmm5 - pand %xmm14,%xmm4 - pand %xmm13,%xmm5 - pxor %xmm4,%xmm5 - pxor %xmm9,%xmm4 - pxor %xmm15,%xmm11 - pxor %xmm2,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm2,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm2 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm2,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm2 - pxor %xmm11,%xmm5 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm2 - - movdqa %xmm6,%xmm11 - movdqa %xmm0,%xmm7 - pxor %xmm3,%xmm11 - pxor %xmm1,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm3,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm1,%xmm3 - pand %xmm14,%xmm7 - pand %xmm12,%xmm1 - pand %xmm13,%xmm11 - pand %xmm8,%xmm3 - pxor %xmm11,%xmm7 - pxor %xmm1,%xmm3 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm1 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm6,%xmm10 - pxor %xmm0,%xmm6 - pand %xmm14,%xmm0 - pand %xmm13,%xmm6 - pxor %xmm0,%xmm6 - pxor %xmm10,%xmm0 - pxor %xmm11,%xmm6 - pxor %xmm11,%xmm3 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm1 - pxor %xmm15,%xmm6 - pxor %xmm5,%xmm0 - pxor %xmm6,%xmm3 - pxor %xmm15,%xmm5 - pxor %xmm0,%xmm15 - - pxor %xmm4,%xmm0 - pxor %xmm1,%xmm4 - pxor %xmm2,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm4,%xmm3 - - pxor %xmm2,%xmm5 - decl %r10d - jl .Lenc_done - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm3,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm5,%xmm10 - pxor %xmm9,%xmm3 - pshufd $0x93,%xmm2,%xmm11 - pxor %xmm10,%xmm5 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm2 - pshufd $0x93,%xmm1,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm1 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm2,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm5,%xmm11 - pshufd $0x4E,%xmm2,%xmm7 - pxor %xmm1,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm3,%xmm10 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm1,%xmm5 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm12,%xmm8 - pxor %xmm10,%xmm2 - pxor %xmm14,%xmm6 - pxor %xmm13,%xmm5 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm1 - movdqa %xmm8,%xmm4 - movdqa 48(%r11),%xmm7 - jnz .Lenc_loop - movdqa 64(%r11),%xmm7 - jmp .Lenc_loop -.align 16 -.Lenc_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm2,%xmm10 - psrlq $1,%xmm2 - pxor %xmm4,%xmm1 - pxor %xmm6,%xmm2 - pand %xmm7,%xmm1 - pand %xmm7,%xmm2 - pxor %xmm1,%xmm4 - psllq $1,%xmm1 - pxor %xmm2,%xmm6 - psllq $1,%xmm2 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm2 - movdqa %xmm3,%xmm9 - psrlq $1,%xmm3 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm5,%xmm3 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm3 - pand %xmm7,%xmm15 - pxor %xmm3,%xmm5 - psllq $1,%xmm3 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm2,%xmm10 - psrlq $2,%xmm2 - pxor %xmm4,%xmm6 - pxor %xmm1,%xmm2 - pand %xmm8,%xmm6 - pand %xmm8,%xmm2 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm2,%xmm1 - psllq $2,%xmm2 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm2 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm5,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm5 - psllq $2,%xmm0 - pxor %xmm15,%xmm3 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm5,%xmm9 - psrlq $4,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $4,%xmm3 - pxor %xmm4,%xmm5 - pxor %xmm1,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm4 - psllq $4,%xmm5 - pxor %xmm3,%xmm1 - psllq $4,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm2,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm2 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_encrypt8,.-_bsaes_encrypt8 - -.type _bsaes_decrypt8,@function -.align 64 -_bsaes_decrypt8: -.cfi_startproc - leaq .LBS0(%rip),%r11 - - movdqa (%rax),%xmm8 - leaq 16(%rax),%rax - movdqa -48(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm3,%xmm10 - psrlq $1,%xmm3 - pxor %xmm6,%xmm5 - pxor %xmm4,%xmm3 - pand %xmm7,%xmm5 - pand %xmm7,%xmm3 - pxor %xmm5,%xmm6 - psllq $1,%xmm5 - pxor %xmm3,%xmm4 - psllq $1,%xmm3 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm3 - movdqa %xmm1,%xmm9 - psrlq $1,%xmm1 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm2,%xmm1 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm1 - pand %xmm7,%xmm15 - pxor %xmm1,%xmm2 - psllq $1,%xmm1 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm1 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm4,%xmm9 - psrlq $2,%xmm4 - movdqa %xmm3,%xmm10 - psrlq $2,%xmm3 - pxor %xmm6,%xmm4 - pxor %xmm5,%xmm3 - pand %xmm8,%xmm4 - pand %xmm8,%xmm3 - pxor %xmm4,%xmm6 - psllq $2,%xmm4 - pxor %xmm3,%xmm5 - psllq $2,%xmm3 - pxor %xmm9,%xmm4 - pxor %xmm10,%xmm3 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm2,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm2 - psllq $2,%xmm0 - pxor %xmm15,%xmm1 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm2,%xmm9 - psrlq $4,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $4,%xmm1 - pxor %xmm6,%xmm2 - pxor %xmm5,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm6 - psllq $4,%xmm2 - pxor %xmm1,%xmm5 - psllq $4,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm4,%xmm0 - pxor %xmm3,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm4 - psllq $4,%xmm0 - pxor %xmm15,%xmm3 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - decl %r10d - jmp .Ldec_sbox -.align 16 -.Ldec_loop: - pxor 0(%rax),%xmm15 - pxor 16(%rax),%xmm0 - pxor 32(%rax),%xmm1 - pxor 48(%rax),%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor 64(%rax),%xmm3 - pxor 80(%rax),%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor 96(%rax),%xmm5 - pxor 112(%rax),%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq 128(%rax),%rax -.Ldec_sbox: - pxor %xmm3,%xmm2 - - pxor %xmm6,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm3,%xmm5 - pxor %xmm5,%xmm6 - pxor %xmm6,%xmm0 - - pxor %xmm0,%xmm15 - pxor %xmm4,%xmm1 - pxor %xmm15,%xmm2 - pxor %xmm15,%xmm4 - pxor %xmm2,%xmm0 - movdqa %xmm2,%xmm10 - movdqa %xmm6,%xmm9 - movdqa %xmm0,%xmm8 - movdqa %xmm3,%xmm12 - movdqa %xmm4,%xmm11 - - pxor %xmm15,%xmm10 - pxor %xmm3,%xmm9 - pxor %xmm5,%xmm8 - movdqa %xmm10,%xmm13 - pxor %xmm15,%xmm12 - movdqa %xmm9,%xmm7 - pxor %xmm1,%xmm11 - movdqa %xmm10,%xmm14 - - por %xmm8,%xmm9 - por %xmm11,%xmm10 - pxor %xmm7,%xmm14 - pand %xmm11,%xmm13 - pxor %xmm8,%xmm11 - pand %xmm8,%xmm7 - pand %xmm11,%xmm14 - movdqa %xmm5,%xmm11 - pxor %xmm1,%xmm11 - pand %xmm11,%xmm12 - pxor %xmm12,%xmm10 - pxor %xmm12,%xmm9 - movdqa %xmm2,%xmm12 - movdqa %xmm0,%xmm11 - pxor %xmm6,%xmm12 - pxor %xmm4,%xmm11 - movdqa %xmm12,%xmm8 - pand %xmm11,%xmm12 - por %xmm11,%xmm8 - pxor %xmm12,%xmm7 - pxor %xmm14,%xmm10 - pxor %xmm13,%xmm9 - pxor %xmm14,%xmm8 - movdqa %xmm3,%xmm11 - pxor %xmm13,%xmm7 - movdqa %xmm15,%xmm12 - pxor %xmm13,%xmm8 - movdqa %xmm6,%xmm13 - pand %xmm5,%xmm11 - movdqa %xmm2,%xmm14 - pand %xmm1,%xmm12 - pand %xmm0,%xmm13 - por %xmm4,%xmm14 - pxor %xmm11,%xmm10 - pxor %xmm12,%xmm9 - pxor %xmm13,%xmm8 - pxor %xmm14,%xmm7 - - - - - - movdqa %xmm10,%xmm11 - pand %xmm8,%xmm10 - pxor %xmm9,%xmm11 - - movdqa %xmm7,%xmm13 - movdqa %xmm11,%xmm14 - pxor %xmm10,%xmm13 - pand %xmm13,%xmm14 - - movdqa %xmm8,%xmm12 - pxor %xmm9,%xmm14 - pxor %xmm7,%xmm12 - - pxor %xmm9,%xmm10 - - pand %xmm10,%xmm12 - - movdqa %xmm13,%xmm9 - pxor %xmm7,%xmm12 - - pxor %xmm12,%xmm9 - pxor %xmm12,%xmm8 - - pand %xmm7,%xmm9 - - pxor %xmm9,%xmm13 - pxor %xmm9,%xmm8 - - pand %xmm14,%xmm13 - - pxor %xmm11,%xmm13 - movdqa %xmm4,%xmm11 - movdqa %xmm0,%xmm7 - movdqa %xmm14,%xmm9 - pxor %xmm13,%xmm9 - pand %xmm4,%xmm9 - pxor %xmm0,%xmm4 - pand %xmm14,%xmm0 - pand %xmm13,%xmm4 - pxor %xmm0,%xmm4 - pxor %xmm9,%xmm0 - pxor %xmm1,%xmm11 - pxor %xmm5,%xmm7 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm1,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm5,%xmm1 - pand %xmm14,%xmm7 - pand %xmm12,%xmm5 - pand %xmm13,%xmm11 - pand %xmm8,%xmm1 - pxor %xmm11,%xmm7 - pxor %xmm5,%xmm1 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm5 - pxor %xmm11,%xmm4 - pxor %xmm11,%xmm1 - pxor %xmm7,%xmm0 - pxor %xmm7,%xmm5 - - movdqa %xmm2,%xmm11 - movdqa %xmm6,%xmm7 - pxor %xmm15,%xmm11 - pxor %xmm3,%xmm7 - movdqa %xmm14,%xmm10 - movdqa %xmm12,%xmm9 - pxor %xmm13,%xmm10 - pxor %xmm8,%xmm9 - pand %xmm11,%xmm10 - pand %xmm15,%xmm9 - pxor %xmm7,%xmm11 - pxor %xmm3,%xmm15 - pand %xmm14,%xmm7 - pand %xmm12,%xmm3 - pand %xmm13,%xmm11 - pand %xmm8,%xmm15 - pxor %xmm11,%xmm7 - pxor %xmm3,%xmm15 - pxor %xmm10,%xmm11 - pxor %xmm9,%xmm3 - pxor %xmm12,%xmm14 - pxor %xmm8,%xmm13 - movdqa %xmm14,%xmm10 - pxor %xmm13,%xmm10 - pand %xmm2,%xmm10 - pxor %xmm6,%xmm2 - pand %xmm14,%xmm6 - pand %xmm13,%xmm2 - pxor %xmm6,%xmm2 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm11,%xmm15 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm3 - pxor %xmm6,%xmm0 - pxor %xmm4,%xmm5 - - pxor %xmm0,%xmm3 - pxor %xmm6,%xmm1 - pxor %xmm6,%xmm4 - pxor %xmm1,%xmm3 - pxor %xmm15,%xmm6 - pxor %xmm4,%xmm3 - pxor %xmm5,%xmm2 - pxor %xmm0,%xmm5 - pxor %xmm3,%xmm2 - - pxor %xmm15,%xmm3 - pxor %xmm2,%xmm6 - decl %r10d - jl .Ldec_done - - pshufd $0x4E,%xmm15,%xmm7 - pshufd $0x4E,%xmm2,%xmm13 - pxor %xmm15,%xmm7 - pshufd $0x4E,%xmm4,%xmm14 - pxor %xmm2,%xmm13 - pshufd $0x4E,%xmm0,%xmm8 - pxor %xmm4,%xmm14 - pshufd $0x4E,%xmm5,%xmm9 - pxor %xmm0,%xmm8 - pshufd $0x4E,%xmm3,%xmm10 - pxor %xmm5,%xmm9 - pxor %xmm13,%xmm15 - pxor %xmm13,%xmm0 - pshufd $0x4E,%xmm1,%xmm11 - pxor %xmm3,%xmm10 - pxor %xmm7,%xmm5 - pxor %xmm8,%xmm3 - pshufd $0x4E,%xmm6,%xmm12 - pxor %xmm1,%xmm11 - pxor %xmm14,%xmm0 - pxor %xmm9,%xmm1 - pxor %xmm6,%xmm12 - - pxor %xmm14,%xmm5 - pxor %xmm13,%xmm3 - pxor %xmm13,%xmm1 - pxor %xmm10,%xmm6 - pxor %xmm11,%xmm2 - pxor %xmm14,%xmm1 - pxor %xmm14,%xmm6 - pxor %xmm12,%xmm4 - pshufd $0x93,%xmm15,%xmm7 - pshufd $0x93,%xmm0,%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x93,%xmm5,%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x93,%xmm3,%xmm10 - pxor %xmm9,%xmm5 - pshufd $0x93,%xmm1,%xmm11 - pxor %xmm10,%xmm3 - pshufd $0x93,%xmm6,%xmm12 - pxor %xmm11,%xmm1 - pshufd $0x93,%xmm2,%xmm13 - pxor %xmm12,%xmm6 - pshufd $0x93,%xmm4,%xmm14 - pxor %xmm13,%xmm2 - pxor %xmm14,%xmm4 - - pxor %xmm15,%xmm8 - pxor %xmm4,%xmm7 - pxor %xmm4,%xmm8 - pshufd $0x4E,%xmm15,%xmm15 - pxor %xmm0,%xmm9 - pshufd $0x4E,%xmm0,%xmm0 - pxor %xmm1,%xmm12 - pxor %xmm7,%xmm15 - pxor %xmm6,%xmm13 - pxor %xmm8,%xmm0 - pxor %xmm3,%xmm11 - pshufd $0x4E,%xmm1,%xmm7 - pxor %xmm2,%xmm14 - pshufd $0x4E,%xmm6,%xmm8 - pxor %xmm5,%xmm10 - pshufd $0x4E,%xmm3,%xmm1 - pxor %xmm4,%xmm10 - pshufd $0x4E,%xmm4,%xmm6 - pxor %xmm4,%xmm11 - pshufd $0x4E,%xmm2,%xmm3 - pxor %xmm11,%xmm7 - pshufd $0x4E,%xmm5,%xmm2 - pxor %xmm12,%xmm8 - pxor %xmm1,%xmm10 - pxor %xmm14,%xmm6 - pxor %xmm3,%xmm13 - movdqa %xmm7,%xmm3 - pxor %xmm9,%xmm2 - movdqa %xmm13,%xmm5 - movdqa %xmm8,%xmm4 - movdqa %xmm2,%xmm1 - movdqa %xmm10,%xmm2 - movdqa -16(%r11),%xmm7 - jnz .Ldec_loop - movdqa -32(%r11),%xmm7 - jmp .Ldec_loop -.align 16 -.Ldec_done: - movdqa 0(%r11),%xmm7 - movdqa 16(%r11),%xmm8 - movdqa %xmm2,%xmm9 - psrlq $1,%xmm2 - movdqa %xmm1,%xmm10 - psrlq $1,%xmm1 - pxor %xmm4,%xmm2 - pxor %xmm6,%xmm1 - pand %xmm7,%xmm2 - pand %xmm7,%xmm1 - pxor %xmm2,%xmm4 - psllq $1,%xmm2 - pxor %xmm1,%xmm6 - psllq $1,%xmm1 - pxor %xmm9,%xmm2 - pxor %xmm10,%xmm1 - movdqa %xmm5,%xmm9 - psrlq $1,%xmm5 - movdqa %xmm15,%xmm10 - psrlq $1,%xmm15 - pxor %xmm3,%xmm5 - pxor %xmm0,%xmm15 - pand %xmm7,%xmm5 - pand %xmm7,%xmm15 - pxor %xmm5,%xmm3 - psllq $1,%xmm5 - pxor %xmm15,%xmm0 - psllq $1,%xmm15 - pxor %xmm9,%xmm5 - pxor %xmm10,%xmm15 - movdqa 32(%r11),%xmm7 - movdqa %xmm6,%xmm9 - psrlq $2,%xmm6 - movdqa %xmm1,%xmm10 - psrlq $2,%xmm1 - pxor %xmm4,%xmm6 - pxor %xmm2,%xmm1 - pand %xmm8,%xmm6 - pand %xmm8,%xmm1 - pxor %xmm6,%xmm4 - psllq $2,%xmm6 - pxor %xmm1,%xmm2 - psllq $2,%xmm1 - pxor %xmm9,%xmm6 - pxor %xmm10,%xmm1 - movdqa %xmm0,%xmm9 - psrlq $2,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $2,%xmm15 - pxor %xmm3,%xmm0 - pxor %xmm5,%xmm15 - pand %xmm8,%xmm0 - pand %xmm8,%xmm15 - pxor %xmm0,%xmm3 - psllq $2,%xmm0 - pxor %xmm15,%xmm5 - psllq $2,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa %xmm3,%xmm9 - psrlq $4,%xmm3 - movdqa %xmm5,%xmm10 - psrlq $4,%xmm5 - pxor %xmm4,%xmm3 - pxor %xmm2,%xmm5 - pand %xmm7,%xmm3 - pand %xmm7,%xmm5 - pxor %xmm3,%xmm4 - psllq $4,%xmm3 - pxor %xmm5,%xmm2 - psllq $4,%xmm5 - pxor %xmm9,%xmm3 - pxor %xmm10,%xmm5 - movdqa %xmm0,%xmm9 - psrlq $4,%xmm0 - movdqa %xmm15,%xmm10 - psrlq $4,%xmm15 - pxor %xmm6,%xmm0 - pxor %xmm1,%xmm15 - pand %xmm7,%xmm0 - pand %xmm7,%xmm15 - pxor %xmm0,%xmm6 - psllq $4,%xmm0 - pxor %xmm15,%xmm1 - psllq $4,%xmm15 - pxor %xmm9,%xmm0 - pxor %xmm10,%xmm15 - movdqa (%rax),%xmm7 - pxor %xmm7,%xmm5 - pxor %xmm7,%xmm3 - pxor %xmm7,%xmm1 - pxor %xmm7,%xmm6 - pxor %xmm7,%xmm2 - pxor %xmm7,%xmm4 - pxor %xmm7,%xmm15 - pxor %xmm7,%xmm0 - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_decrypt8,.-_bsaes_decrypt8 -.type _bsaes_key_convert,@function -.align 16 -_bsaes_key_convert: -.cfi_startproc - leaq .Lmasks(%rip),%r11 - movdqu (%rcx),%xmm7 - leaq 16(%rcx),%rcx - movdqa 0(%r11),%xmm0 - movdqa 16(%r11),%xmm1 - movdqa 32(%r11),%xmm2 - movdqa 48(%r11),%xmm3 - movdqa 64(%r11),%xmm4 - pcmpeqd %xmm5,%xmm5 - - movdqu (%rcx),%xmm6 - movdqa %xmm7,(%rax) - leaq 16(%rax),%rax - decl %r10d - jmp .Lkey_loop -.align 16 -.Lkey_loop: -.byte 102,15,56,0,244 - - movdqa %xmm0,%xmm8 - movdqa %xmm1,%xmm9 - - pand %xmm6,%xmm8 - pand %xmm6,%xmm9 - movdqa %xmm2,%xmm10 - pcmpeqb %xmm0,%xmm8 - psllq $4,%xmm0 - movdqa %xmm3,%xmm11 - pcmpeqb %xmm1,%xmm9 - psllq $4,%xmm1 - - pand %xmm6,%xmm10 - pand %xmm6,%xmm11 - movdqa %xmm0,%xmm12 - pcmpeqb %xmm2,%xmm10 - psllq $4,%xmm2 - movdqa %xmm1,%xmm13 - pcmpeqb %xmm3,%xmm11 - psllq $4,%xmm3 - - movdqa %xmm2,%xmm14 - movdqa %xmm3,%xmm15 - pxor %xmm5,%xmm8 - pxor %xmm5,%xmm9 - - pand %xmm6,%xmm12 - pand %xmm6,%xmm13 - movdqa %xmm8,0(%rax) - pcmpeqb %xmm0,%xmm12 - psrlq $4,%xmm0 - movdqa %xmm9,16(%rax) - pcmpeqb %xmm1,%xmm13 - psrlq $4,%xmm1 - leaq 16(%rcx),%rcx - - pand %xmm6,%xmm14 - pand %xmm6,%xmm15 - movdqa %xmm10,32(%rax) - pcmpeqb %xmm2,%xmm14 - psrlq $4,%xmm2 - movdqa %xmm11,48(%rax) - pcmpeqb %xmm3,%xmm15 - psrlq $4,%xmm3 - movdqu (%rcx),%xmm6 - - pxor %xmm5,%xmm13 - pxor %xmm5,%xmm14 - movdqa %xmm12,64(%rax) - movdqa %xmm13,80(%rax) - movdqa %xmm14,96(%rax) - movdqa %xmm15,112(%rax) - leaq 128(%rax),%rax - decl %r10d - jnz .Lkey_loop - - movdqa 80(%r11),%xmm7 - - .byte 0xf3,0xc3 -.cfi_endproc -.size _bsaes_key_convert,.-_bsaes_key_convert - -.globl bsaes_cbc_encrypt -.type bsaes_cbc_encrypt,@function -.align 16 -bsaes_cbc_encrypt: -.cfi_startproc - cmpl $0,%r9d - jne asm_AES_cbc_encrypt - cmpq $128,%rdx - jb asm_AES_cbc_encrypt - - movq %rsp,%rax -.Lcbc_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movq %r8,%rbx - shrq $4,%r14 - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - movdqu (%rbx),%xmm14 - subq $8,%r14 -.Lcbc_dec_loop: - movdqu 0(%r12),%xmm15 - movdqu 16(%r12),%xmm0 - movdqu 32(%r12),%xmm1 - movdqu 48(%r12),%xmm2 - movdqu 64(%r12),%xmm3 - movdqu 80(%r12),%xmm4 - movq %rsp,%rax - movdqu 96(%r12),%xmm5 - movl %edx,%r10d - movdqu 112(%r12),%xmm6 - movdqa %xmm14,32(%rbp) - - call _bsaes_decrypt8 - - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm2 - movdqu 112(%r12),%xmm14 - pxor %xmm13,%xmm4 - movdqu %xmm15,0(%r13) - leaq 128(%r12),%r12 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - subq $8,%r14 - jnc .Lcbc_dec_loop - - addq $8,%r14 - jz .Lcbc_dec_done - - movdqu 0(%r12),%xmm15 - movq %rsp,%rax - movl %edx,%r10d - cmpq $2,%r14 - jb .Lcbc_dec_one - movdqu 16(%r12),%xmm0 - je .Lcbc_dec_two - movdqu 32(%r12),%xmm1 - cmpq $4,%r14 - jb .Lcbc_dec_three - movdqu 48(%r12),%xmm2 - je .Lcbc_dec_four - movdqu 64(%r12),%xmm3 - cmpq $6,%r14 - jb .Lcbc_dec_five - movdqu 80(%r12),%xmm4 - je .Lcbc_dec_six - movdqu 96(%r12),%xmm5 - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm6 - movdqu 96(%r12),%xmm14 - pxor %xmm12,%xmm2 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_six: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm1 - movdqu 80(%r12),%xmm14 - pxor %xmm11,%xmm6 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_five: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm3 - movdqu 64(%r12),%xmm14 - pxor %xmm10,%xmm1 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_four: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm5 - movdqu 48(%r12),%xmm14 - pxor %xmm9,%xmm3 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_three: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm0 - movdqu 32(%r12),%xmm14 - pxor %xmm8,%xmm5 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_two: - movdqa %xmm14,32(%rbp) - call _bsaes_decrypt8 - pxor 32(%rbp),%xmm15 - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm14 - pxor %xmm7,%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - jmp .Lcbc_dec_done -.align 16 -.Lcbc_dec_one: - leaq (%r12),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm14 - movdqu %xmm14,(%r13) - movdqa %xmm15,%xmm14 - -.Lcbc_dec_done: - movdqu %xmm14,(%rbx) - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lcbc_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lcbc_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lcbc_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_cbc_encrypt,.-bsaes_cbc_encrypt - -.globl bsaes_ctr32_encrypt_blocks -.type bsaes_ctr32_encrypt_blocks,@function -.align 16 -bsaes_ctr32_encrypt_blocks: -.cfi_startproc - movq %rsp,%rax -.Lctr_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movdqu (%r8),%xmm0 - movl 240(%rcx),%eax - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - movdqa %xmm0,32(%rbp) - cmpq $8,%rdx - jb .Lctr_enc_short - - movl %eax,%ebx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %ebx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - movdqa (%rsp),%xmm8 - leaq .LADD1(%rip),%r11 - movdqa 32(%rbp),%xmm15 - movdqa -32(%r11),%xmm7 -.byte 102,68,15,56,0,199 -.byte 102,68,15,56,0,255 - movdqa %xmm8,(%rsp) - jmp .Lctr_enc_loop -.align 16 -.Lctr_enc_loop: - movdqa %xmm15,32(%rbp) - movdqa %xmm15,%xmm0 - movdqa %xmm15,%xmm1 - paddd 0(%r11),%xmm0 - movdqa %xmm15,%xmm2 - paddd 16(%r11),%xmm1 - movdqa %xmm15,%xmm3 - paddd 32(%r11),%xmm2 - movdqa %xmm15,%xmm4 - paddd 48(%r11),%xmm3 - movdqa %xmm15,%xmm5 - paddd 64(%r11),%xmm4 - movdqa %xmm15,%xmm6 - paddd 80(%r11),%xmm5 - paddd 96(%r11),%xmm6 - - - - movdqa (%rsp),%xmm8 - leaq 16(%rsp),%rax - movdqa -16(%r11),%xmm7 - pxor %xmm8,%xmm15 - pxor %xmm8,%xmm0 - pxor %xmm8,%xmm1 - pxor %xmm8,%xmm2 -.byte 102,68,15,56,0,255 -.byte 102,15,56,0,199 - pxor %xmm8,%xmm3 - pxor %xmm8,%xmm4 -.byte 102,15,56,0,207 -.byte 102,15,56,0,215 - pxor %xmm8,%xmm5 - pxor %xmm8,%xmm6 -.byte 102,15,56,0,223 -.byte 102,15,56,0,231 -.byte 102,15,56,0,239 -.byte 102,15,56,0,247 - leaq .LBS0(%rip),%r11 - movl %ebx,%r10d - - call _bsaes_encrypt8_bitslice - - subq $8,%r14 - jc .Lctr_enc_loop_done - - movdqu 0(%r12),%xmm7 - movdqu 16(%r12),%xmm8 - movdqu 32(%r12),%xmm9 - movdqu 48(%r12),%xmm10 - movdqu 64(%r12),%xmm11 - movdqu 80(%r12),%xmm12 - movdqu 96(%r12),%xmm13 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - pxor %xmm15,%xmm7 - movdqa 32(%rbp),%xmm15 - pxor %xmm8,%xmm0 - movdqu %xmm7,0(%r13) - pxor %xmm9,%xmm3 - movdqu %xmm0,16(%r13) - pxor %xmm10,%xmm5 - movdqu %xmm3,32(%r13) - pxor %xmm11,%xmm2 - movdqu %xmm5,48(%r13) - pxor %xmm12,%xmm6 - movdqu %xmm2,64(%r13) - pxor %xmm13,%xmm1 - movdqu %xmm6,80(%r13) - pxor %xmm14,%xmm4 - movdqu %xmm1,96(%r13) - leaq .LADD1(%rip),%r11 - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - paddd 112(%r11),%xmm15 - jnz .Lctr_enc_loop - - jmp .Lctr_enc_done -.align 16 -.Lctr_enc_loop_done: - addq $8,%r14 - movdqu 0(%r12),%xmm7 - pxor %xmm7,%xmm15 - movdqu %xmm15,0(%r13) - cmpq $2,%r14 - jb .Lctr_enc_done - movdqu 16(%r12),%xmm8 - pxor %xmm8,%xmm0 - movdqu %xmm0,16(%r13) - je .Lctr_enc_done - movdqu 32(%r12),%xmm9 - pxor %xmm9,%xmm3 - movdqu %xmm3,32(%r13) - cmpq $4,%r14 - jb .Lctr_enc_done - movdqu 48(%r12),%xmm10 - pxor %xmm10,%xmm5 - movdqu %xmm5,48(%r13) - je .Lctr_enc_done - movdqu 64(%r12),%xmm11 - pxor %xmm11,%xmm2 - movdqu %xmm2,64(%r13) - cmpq $6,%r14 - jb .Lctr_enc_done - movdqu 80(%r12),%xmm12 - pxor %xmm12,%xmm6 - movdqu %xmm6,80(%r13) - je .Lctr_enc_done - movdqu 96(%r12),%xmm13 - pxor %xmm13,%xmm1 - movdqu %xmm1,96(%r13) - jmp .Lctr_enc_done - -.align 16 -.Lctr_enc_short: - leaq 32(%rbp),%rdi - leaq 48(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - movdqu (%r12),%xmm0 - leaq 16(%r12),%r12 - movl 44(%rbp),%eax - bswapl %eax - pxor 48(%rbp),%xmm0 - incl %eax - movdqu %xmm0,(%r13) - bswapl %eax - leaq 16(%r13),%r13 - movl %eax,44(%rsp) - decq %r14 - jnz .Lctr_enc_short - -.Lctr_enc_done: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lctr_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lctr_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lctr_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks -.globl bsaes_xts_encrypt -.type bsaes_xts_encrypt,@function -.align 16 -bsaes_xts_encrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_enc_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp -.cfi_def_cfa_register %rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor %xmm6,%xmm7 - movdqa %xmm7,(%rax) - - andq $-16,%r14 - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_enc_short - jmp .Lxts_enc_loop - -.align 16 -.Lxts_enc_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm1,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_enc_loop - -.Lxts_enc_short: - addq $0x80,%r14 - jz .Lxts_enc_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_enc_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_enc_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_enc_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_enc_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_enc_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_enc_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - pxor 96(%rsp),%xmm1 - movdqu %xmm6,80(%r13) - movdqu %xmm1,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm2,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - pxor 64(%rsp),%xmm2 - movdqu %xmm5,48(%r13) - movdqu %xmm2,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm5 - movdqu %xmm3,32(%r13) - movdqu %xmm5,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm3 - movdqu %xmm0,16(%r13) - movdqu %xmm3,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_encrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_enc_done -.align 16 -.Lxts_enc_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_enc_done: - andl $15,%ebx - jz .Lxts_enc_ret - movq %r13,%rdx - -.Lxts_enc_steal: - movzbl (%r12),%eax - movzbl -16(%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,-16(%rdx) - movb %cl,0(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_enc_steal - - movdqu -16(%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_encrypt - pxor 32(%rbp),%xmm6 - movdqu %xmm6,-16(%r13) - -.Lxts_enc_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_enc_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_enc_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_enc_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_encrypt,.-bsaes_xts_encrypt - -.globl bsaes_xts_decrypt -.type bsaes_xts_decrypt,@function -.align 16 -bsaes_xts_decrypt: -.cfi_startproc - movq %rsp,%rax -.Lxts_dec_prologue: - pushq %rbp -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbp,-16 - pushq %rbx -.cfi_adjust_cfa_offset 8 -.cfi_offset %rbx,-24 - pushq %r12 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r12,-32 - pushq %r13 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r13,-40 - pushq %r14 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r14,-48 - pushq %r15 -.cfi_adjust_cfa_offset 8 -.cfi_offset %r15,-56 - leaq -72(%rsp),%rsp -.cfi_adjust_cfa_offset 0x48 - movq %rsp,%rbp - movq %rdi,%r12 - movq %rsi,%r13 - movq %rdx,%r14 - movq %rcx,%r15 - - leaq (%r9),%rdi - leaq 32(%rbp),%rsi - leaq (%r8),%rdx - call asm_AES_encrypt - - movl 240(%r15),%eax - movq %r14,%rbx - - movl %eax,%edx - shlq $7,%rax - subq $96,%rax - subq %rax,%rsp - - movq %rsp,%rax - movq %r15,%rcx - movl %edx,%r10d - call _bsaes_key_convert - pxor (%rsp),%xmm7 - movdqa %xmm6,(%rax) - movdqa %xmm7,(%rsp) - - xorl %eax,%eax - andq $-16,%r14 - testl $15,%ebx - setnz %al - shlq $4,%rax - subq %rax,%r14 - - subq $0x80,%rsp - movdqa 32(%rbp),%xmm6 - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - - subq $0x80,%r14 - jc .Lxts_dec_short - jmp .Lxts_dec_loop - -.align 16 -.Lxts_dec_loop: - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqu 112(%r12),%xmm14 - leaq 128(%r12),%r12 - movdqa %xmm6,112(%rsp) - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - pxor %xmm14,%xmm6 - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - pxor 112(%rsp),%xmm4 - movdqu %xmm2,96(%r13) - movdqu %xmm4,112(%r13) - leaq 128(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - - subq $0x80,%r14 - jnc .Lxts_dec_loop - -.Lxts_dec_short: - addq $0x80,%r14 - jz .Lxts_dec_done - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm15 - movdqa %xmm6,0(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm0 - movdqa %xmm6,16(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 0(%r12),%xmm7 - cmpq $16,%r14 - je .Lxts_dec_1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm1 - movdqa %xmm6,32(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 16(%r12),%xmm8 - cmpq $32,%r14 - je .Lxts_dec_2 - pxor %xmm7,%xmm15 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm2 - movdqa %xmm6,48(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 32(%r12),%xmm9 - cmpq $48,%r14 - je .Lxts_dec_3 - pxor %xmm8,%xmm0 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm3 - movdqa %xmm6,64(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 48(%r12),%xmm10 - cmpq $64,%r14 - je .Lxts_dec_4 - pxor %xmm9,%xmm1 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm4 - movdqa %xmm6,80(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 64(%r12),%xmm11 - cmpq $80,%r14 - je .Lxts_dec_5 - pxor %xmm10,%xmm2 - pshufd $0x13,%xmm14,%xmm13 - pxor %xmm14,%xmm14 - movdqa %xmm6,%xmm5 - movdqa %xmm6,96(%rsp) - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - pcmpgtd %xmm6,%xmm14 - pxor %xmm13,%xmm6 - movdqu 80(%r12),%xmm12 - cmpq $96,%r14 - je .Lxts_dec_6 - pxor %xmm11,%xmm3 - movdqu 96(%r12),%xmm13 - pxor %xmm12,%xmm4 - movdqa %xmm6,112(%rsp) - leaq 112(%r12),%r12 - pxor %xmm13,%xmm5 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - pxor 96(%rsp),%xmm2 - movdqu %xmm6,80(%r13) - movdqu %xmm2,96(%r13) - leaq 112(%r13),%r13 - - movdqa 112(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_6: - pxor %xmm11,%xmm3 - leaq 96(%r12),%r12 - pxor %xmm12,%xmm4 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - pxor 80(%rsp),%xmm6 - movdqu %xmm1,64(%r13) - movdqu %xmm6,80(%r13) - leaq 96(%r13),%r13 - - movdqa 96(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_5: - pxor %xmm10,%xmm2 - leaq 80(%r12),%r12 - pxor %xmm11,%xmm3 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - pxor 64(%rsp),%xmm1 - movdqu %xmm3,48(%r13) - movdqu %xmm1,64(%r13) - leaq 80(%r13),%r13 - - movdqa 80(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_4: - pxor %xmm9,%xmm1 - leaq 64(%r12),%r12 - pxor %xmm10,%xmm2 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - pxor 48(%rsp),%xmm3 - movdqu %xmm5,32(%r13) - movdqu %xmm3,48(%r13) - leaq 64(%r13),%r13 - - movdqa 64(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_3: - pxor %xmm8,%xmm0 - leaq 48(%r12),%r12 - pxor %xmm9,%xmm1 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - pxor 32(%rsp),%xmm5 - movdqu %xmm0,16(%r13) - movdqu %xmm5,32(%r13) - leaq 48(%r13),%r13 - - movdqa 48(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_2: - pxor %xmm7,%xmm15 - leaq 32(%r12),%r12 - pxor %xmm8,%xmm0 - leaq 128(%rsp),%rax - movl %edx,%r10d - - call _bsaes_decrypt8 - - pxor 0(%rsp),%xmm15 - pxor 16(%rsp),%xmm0 - movdqu %xmm15,0(%r13) - movdqu %xmm0,16(%r13) - leaq 32(%r13),%r13 - - movdqa 32(%rsp),%xmm6 - jmp .Lxts_dec_done -.align 16 -.Lxts_dec_1: - pxor %xmm15,%xmm7 - leaq 16(%r12),%r12 - movdqa %xmm7,32(%rbp) - leaq 32(%rbp),%rdi - leaq 32(%rbp),%rsi - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm15 - - - - - - movdqu %xmm15,0(%r13) - leaq 16(%r13),%r13 - - movdqa 16(%rsp),%xmm6 - -.Lxts_dec_done: - andl $15,%ebx - jz .Lxts_dec_ret - - pxor %xmm14,%xmm14 - movdqa .Lxts_magic(%rip),%xmm12 - pcmpgtd %xmm6,%xmm14 - pshufd $0x13,%xmm14,%xmm13 - movdqa %xmm6,%xmm5 - paddq %xmm6,%xmm6 - pand %xmm12,%xmm13 - movdqu (%r12),%xmm15 - pxor %xmm13,%xmm6 - - leaq 32(%rbp),%rdi - pxor %xmm6,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm6 - movq %r13,%rdx - movdqu %xmm6,(%r13) - -.Lxts_dec_steal: - movzbl 16(%r12),%eax - movzbl (%rdx),%ecx - leaq 1(%r12),%r12 - movb %al,(%rdx) - movb %cl,16(%rdx) - leaq 1(%rdx),%rdx - subl $1,%ebx - jnz .Lxts_dec_steal - - movdqu (%r13),%xmm15 - leaq 32(%rbp),%rdi - pxor %xmm5,%xmm15 - leaq 32(%rbp),%rsi - movdqa %xmm15,32(%rbp) - leaq (%r15),%rdx - call asm_AES_decrypt - pxor 32(%rbp),%xmm5 - movdqu %xmm5,(%r13) - -.Lxts_dec_ret: - leaq (%rsp),%rax - pxor %xmm0,%xmm0 -.Lxts_dec_bzero: - movdqa %xmm0,0(%rax) - movdqa %xmm0,16(%rax) - leaq 32(%rax),%rax - cmpq %rax,%rbp - ja .Lxts_dec_bzero - - leaq 120(%rbp),%rax -.cfi_def_cfa %rax,8 - movq -48(%rax),%r15 -.cfi_restore %r15 - movq -40(%rax),%r14 -.cfi_restore %r14 - movq -32(%rax),%r13 -.cfi_restore %r13 - movq -24(%rax),%r12 -.cfi_restore %r12 - movq -16(%rax),%rbx -.cfi_restore %rbx - movq -8(%rax),%rbp -.cfi_restore %rbp - leaq (%rax),%rsp -.cfi_def_cfa_register %rsp -.Lxts_dec_epilogue: - .byte 0xf3,0xc3 -.cfi_endproc -.size bsaes_xts_decrypt,.-bsaes_xts_decrypt -.type _bsaes_const,@object -.align 64 -_bsaes_const: -.LM0ISR: -.quad 0x0a0e0206070b0f03, 0x0004080c0d010509 -.LISRM0: -.quad 0x01040b0e0205080f, 0x0306090c00070a0d -.LISR: -.quad 0x0504070602010003, 0x0f0e0d0c080b0a09 -.LBS0: -.quad 0x5555555555555555, 0x5555555555555555 -.LBS1: -.quad 0x3333333333333333, 0x3333333333333333 -.LBS2: -.quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f -.LSR: -.quad 0x0504070600030201, 0x0f0e0d0c0a09080b -.LSRM0: -.quad 0x0304090e00050a0f, 0x01060b0c0207080d -.LM0SR: -.quad 0x0a0e02060f03070b, 0x0004080c05090d01 -.LSWPUP: -.quad 0x0706050403020100, 0x0c0d0e0f0b0a0908 -.LSWPUPM0SR: -.quad 0x0a0d02060c03070b, 0x0004080f05090e01 -.LADD1: -.quad 0x0000000000000000, 0x0000000100000000 -.LADD2: -.quad 0x0000000000000000, 0x0000000200000000 -.LADD3: -.quad 0x0000000000000000, 0x0000000300000000 -.LADD4: -.quad 0x0000000000000000, 0x0000000400000000 -.LADD5: -.quad 0x0000000000000000, 0x0000000500000000 -.LADD6: -.quad 0x0000000000000000, 0x0000000600000000 -.LADD7: -.quad 0x0000000000000000, 0x0000000700000000 -.LADD8: -.quad 0x0000000000000000, 0x0000000800000000 -.Lxts_magic: -.long 0x87,0,1,0 -.Lmasks: -.quad 0x0101010101010101, 0x0101010101010101 -.quad 0x0202020202020202, 0x0202020202020202 -.quad 0x0404040404040404, 0x0404040404040404 -.quad 0x0808080808080808, 0x0808080808080808 -.LM0: -.quad 0x02060a0e03070b0f, 0x0004080c0105090d -.L63: -.quad 0x6363636363636363, 0x6363636363636363 -.byte 66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0 -.align 64 -.size _bsaes_const,.-_bsaes_const diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s index f8e4a805887366..7876e0b8f93d9c 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s @@ -29,7 +29,7 @@ rsaz_512_sqr: subq $128+24,%rsp .cfi_adjust_cfa_offset 128+24 .Lsqr_body: - movq %rdx,%rbp +.byte 102,72,15,110,202 movq (%rsi),%rdx movq 8(%rsi),%rax movq %rcx,128(%rsp) @@ -44,6 +44,7 @@ rsaz_512_sqr: movl %r8d,128+8(%rsp) movq %rdx,%rbx + movq %rax,%rbp mulq %rdx movq %rax,%r8 movq 16(%rsi),%rax @@ -82,31 +83,29 @@ rsaz_512_sqr: mulq %rbx addq %rax,%r14 movq %rbx,%rax - movq %rdx,%r15 - adcq $0,%r15 + adcq $0,%rdx + xorq %rcx,%rcx addq %r8,%r8 - movq %r9,%rcx - adcq %r9,%r9 + movq %rdx,%r15 + adcq $0,%rcx mulq %rax - movq %rax,(%rsp) - addq %rdx,%r8 - adcq $0,%r9 + addq %r8,%rdx + adcq $0,%rcx - movq %r8,8(%rsp) - shrq $63,%rcx + movq %rax,(%rsp) + movq %rdx,8(%rsp) - movq 8(%rsi),%r8 movq 16(%rsi),%rax - mulq %r8 + mulq %rbp addq %rax,%r10 movq 24(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r11 movq 32(%rsi),%rax adcq $0,%rdx @@ -114,7 +113,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r12 movq 40(%rsi),%rax adcq $0,%rdx @@ -122,7 +121,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r13 movq 48(%rsi),%rax adcq $0,%rdx @@ -130,7 +129,7 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r14 movq 56(%rsi),%rax adcq $0,%rdx @@ -138,39 +137,39 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx - mulq %r8 + mulq %rbp addq %rax,%r15 - movq %r8,%rax + movq %rbp,%rax adcq $0,%rdx addq %rbx,%r15 - movq %rdx,%r8 - movq %r10,%rdx - adcq $0,%r8 + adcq $0,%rdx - addq %rdx,%rdx - leaq (%rcx,%r10,2),%r10 - movq %r11,%rbx - adcq %r11,%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r8 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax + movq 16(%rsi),%rbp addq %rax,%r9 + movq 24(%rsi),%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,16(%rsp) movq %r10,24(%rsp) - shrq $63,%rbx - movq 16(%rsi),%r9 - movq 24(%rsi),%rax - mulq %r9 + mulq %rbp addq %rax,%r12 movq 32(%rsi),%rax movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r13 movq 40(%rsi),%rax adcq $0,%rdx @@ -178,7 +177,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 + mulq %rbp addq %rax,%r14 movq 48(%rsi),%rax adcq $0,%rdx @@ -186,9 +185,7 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - movq %r12,%r10 - leaq (%rbx,%r12,2),%r12 + mulq %rbp addq %rax,%r15 movq 56(%rsi),%rax adcq $0,%rdx @@ -196,36 +193,40 @@ rsaz_512_sqr: movq %rdx,%rcx adcq $0,%rcx - mulq %r9 - shrq $63,%r10 + mulq %rbp addq %rax,%r8 - movq %r9,%rax + movq %rbp,%rax adcq $0,%rdx addq %rcx,%r8 - movq %rdx,%r9 - adcq $0,%r9 + adcq $0,%rdx - movq %r13,%rcx - leaq (%r10,%r13,2),%r13 + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r9 + adcq %r12,%r12 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax + movq 24(%rsi),%r10 addq %rax,%r11 + movq 32(%rsi),%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,32(%rsp) movq %r12,40(%rsp) - shrq $63,%rcx - movq 24(%rsi),%r10 - movq 32(%rsi),%rax + movq %rax,%r11 mulq %r10 addq %rax,%r14 movq 40(%rsi),%rax movq %rdx,%rbx adcq $0,%rbx + movq %rax,%r12 mulq %r10 addq %rax,%r15 movq 48(%rsi),%rax @@ -234,9 +235,8 @@ rsaz_512_sqr: movq %rdx,%rbx adcq $0,%rbx + movq %rax,%rbp mulq %r10 - movq %r14,%r12 - leaq (%rcx,%r14,2),%r14 addq %rax,%r8 movq 56(%rsi),%rax adcq $0,%rdx @@ -245,32 +245,33 @@ rsaz_512_sqr: adcq $0,%rbx mulq %r10 - shrq $63,%r12 addq %rax,%r9 movq %r10,%rax adcq $0,%rdx addq %rbx,%r9 - movq %rdx,%r10 - adcq $0,%r10 + adcq $0,%rdx - movq %r15,%rbx - leaq (%r12,%r15,2),%r15 + xorq %rbx,%rbx + addq %r13,%r13 + movq %rdx,%r10 + adcq %r14,%r14 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r13 + movq %r12,%rax adcq %rdx,%r14 - adcq $0,%r15 + adcq $0,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) - shrq $63,%rbx - movq 32(%rsi),%r11 - movq 40(%rsi),%rax mulq %r11 addq %rax,%r8 - movq 48(%rsi),%rax + movq %rbp,%rax movq %rdx,%rcx adcq $0,%rcx @@ -278,97 +279,99 @@ rsaz_512_sqr: addq %rax,%r9 movq 56(%rsi),%rax adcq $0,%rdx - movq %r8,%r12 - leaq (%rbx,%r8,2),%r8 addq %rcx,%r9 movq %rdx,%rcx adcq $0,%rcx + movq %rax,%r14 mulq %r11 - shrq $63,%r12 addq %rax,%r10 movq %r11,%rax adcq $0,%rdx addq %rcx,%r10 - movq %rdx,%r11 - adcq $0,%r11 + adcq $0,%rdx - movq %r9,%rcx - leaq (%r12,%r9,2),%r9 + xorq %rcx,%rcx + addq %r15,%r15 + movq %rdx,%r11 + adcq %r8,%r8 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r15 + movq %rbp,%rax adcq %rdx,%r8 - adcq $0,%r9 + adcq $0,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) - shrq $63,%rcx - movq 40(%rsi),%r12 - movq 48(%rsi),%rax mulq %r12 addq %rax,%r10 - movq 56(%rsi),%rax + movq %r14,%rax movq %rdx,%rbx adcq $0,%rbx mulq %r12 addq %rax,%r11 movq %r12,%rax - movq %r10,%r15 - leaq (%rcx,%r10,2),%r10 adcq $0,%rdx - shrq $63,%r15 addq %rbx,%r11 - movq %rdx,%r12 - adcq $0,%r12 + adcq $0,%rdx - movq %r11,%rbx - leaq (%r15,%r11,2),%r11 + xorq %rbx,%rbx + addq %r9,%r9 + movq %rdx,%r12 + adcq %r10,%r10 + adcq $0,%rbx mulq %rax + + addq %rcx,%rax addq %rax,%r9 + movq %r14,%rax adcq %rdx,%r10 - adcq $0,%r11 + adcq $0,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) - movq 48(%rsi),%r13 - movq 56(%rsi),%rax - mulq %r13 + mulq %rbp addq %rax,%r12 - movq %r13,%rax - movq %rdx,%r13 - adcq $0,%r13 + movq %rbp,%rax + adcq $0,%rdx - xorq %r14,%r14 - shlq $1,%rbx + xorq %rcx,%rcx + addq %r11,%r11 + movq %rdx,%r13 adcq %r12,%r12 - adcq %r13,%r13 - adcq %r14,%r14 + adcq $0,%rcx mulq %rax + + addq %rbx,%rax addq %rax,%r11 + movq %r14,%rax adcq %rdx,%r12 - adcq $0,%r13 + adcq $0,%rcx movq %r11,96(%rsp) movq %r12,104(%rsp) - movq 56(%rsi),%rax - mulq %rax - addq %rax,%r13 - adcq $0,%rdx + xorq %rbx,%rbx + addq %r13,%r13 + adcq $0,%rbx - addq %rdx,%r14 + mulq %rax - movq %r13,112(%rsp) - movq %r14,120(%rsp) + addq %rcx,%rax + addq %r13,%rax + adcq %rbx,%rdx movq (%rsp),%r8 movq 8(%rsp),%r9 @@ -378,6 +381,10 @@ rsaz_512_sqr: movq 40(%rsp),%r13 movq 48(%rsp),%r14 movq 56(%rsp),%r15 +.byte 102,72,15,126,205 + + movq %rax,112(%rsp) + movq %rdx,120(%rsp) call __rsaz_512_reduce @@ -406,9 +413,9 @@ rsaz_512_sqr: .Loop_sqrx: movl %r8d,128+8(%rsp) .byte 102,72,15,110,199 -.byte 102,72,15,110,205 mulxq %rax,%r8,%r9 + movq %rax,%rbx mulxq 16(%rsi),%rcx,%r10 xorq %rbp,%rbp @@ -416,40 +423,39 @@ rsaz_512_sqr: mulxq 24(%rsi),%rax,%r11 adcxq %rcx,%r9 - mulxq 32(%rsi),%rcx,%r12 +.byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 adcxq %rax,%r10 - mulxq 40(%rsi),%rax,%r13 +.byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 adcxq %rcx,%r11 -.byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 + mulxq 48(%rsi),%rcx,%r14 adcxq %rax,%r12 adcxq %rcx,%r13 -.byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rax,%r15 adcxq %rax,%r14 adcxq %rbp,%r15 - movq %r9,%rcx - shldq $1,%r8,%r9 - shlq $1,%r8 - - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx - adcxq %rdx,%r8 - movq 8(%rsi),%rdx - adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi + movq %rbx,%rdx + xorq %rcx,%rcx + adoxq %r8,%r8 + adcxq %rdi,%r8 + adoxq %rbp,%rcx + adcxq %rbp,%rcx movq %rax,(%rsp) movq %r8,8(%rsp) - mulxq 16(%rsi),%rax,%rbx +.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 adoxq %rax,%r10 adcxq %rbx,%r11 -.byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r8 adoxq %rdi,%r11 +.byte 0x66 adcxq %r8,%r12 mulxq 32(%rsi),%rax,%rbx @@ -467,24 +473,25 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 adoxq %rdi,%r15 adcxq %rbp,%r8 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r8 +.byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rcx - movq 16(%rsi),%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rcx,%r10 - adcxq %rbp,%r11 + adoxq %rbp,%rbx + adcxq %rdi,%r10 + adcxq %rbp,%rbx movq %r9,16(%rsp) .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 + mulxq 24(%rsi),%rdi,%r9 adoxq %rdi,%r12 adcxq %r9,%r13 @@ -492,7 +499,7 @@ rsaz_512_sqr: adoxq %rax,%r13 adcxq %rcx,%r14 - mulxq 40(%rsi),%rdi,%r9 +.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 adoxq %rdi,%r14 adcxq %r9,%r15 @@ -500,27 +507,28 @@ rsaz_512_sqr: adoxq %rax,%r15 adcxq %rcx,%r8 -.byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 + mulxq 56(%rsi),%rdi,%r9 adoxq %rdi,%r8 adcxq %rbp,%r9 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r9 + movq 24(%rsi),%rdx - movq %r13,%rcx - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + xorq %rcx,%rcx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 24(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx movq %r11,32(%rsp) -.byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 + movq %r12,40(%rsp) -.byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 + mulxq 32(%rsi),%rax,%rbx adoxq %rax,%r14 adcxq %rbx,%r15 @@ -535,25 +543,25 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r10 adoxq %rdi,%r9 adcxq %rbp,%r10 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r10 + movq 32(%rsi),%rdx -.byte 0x66 - movq %r15,%rbx - shldq $1,%r14,%r15 - shldq $1,%rcx,%r14 + xorq %rbx,%rbx + adoxq %r13,%r13 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r14,%r14 adcxq %rax,%r13 - adcxq %rdx,%r14 - movq 32(%rsi),%rdx - adcxq %rbp,%r15 + adoxq %rbp,%rbx + adcxq %rdi,%r14 + adcxq %rbp,%rbx movq %r13,48(%rsp) movq %r14,56(%rsp) -.byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 + mulxq 40(%rsi),%rdi,%r11 adoxq %rdi,%r8 adcxq %r11,%r9 @@ -564,18 +572,19 @@ rsaz_512_sqr: mulxq 56(%rsi),%rdi,%r11 adoxq %rdi,%r10 adcxq %rbp,%r11 + mulxq %rdx,%rax,%rdi + movq 40(%rsi),%rdx adoxq %rbp,%r11 - movq %r9,%rcx - shldq $1,%r8,%r9 - shldq $1,%rbx,%r8 + xorq %rcx,%rcx + adoxq %r15,%r15 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r8,%r8 adcxq %rax,%r15 - adcxq %rdx,%r8 - movq 40(%rsi),%rdx - adcxq %rbp,%r9 + adoxq %rbp,%rcx + adcxq %rdi,%r8 + adcxq %rbp,%rcx movq %r15,64(%rsp) movq %r8,72(%rsp) @@ -588,18 +597,19 @@ rsaz_512_sqr: .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 adoxq %rdi,%r11 adcxq %rbp,%r12 + mulxq %rdx,%rax,%rdi adoxq %rbp,%r12 + movq 48(%rsi),%rdx - movq %r11,%rbx - shldq $1,%r10,%r11 - shldq $1,%rcx,%r10 + xorq %rbx,%rbx + adoxq %r9,%r9 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rcx,%rax + adoxq %r10,%r10 adcxq %rax,%r9 - adcxq %rdx,%r10 - movq 48(%rsi),%rdx - adcxq %rbp,%r11 + adcxq %rdi,%r10 + adoxq %rbp,%rbx + adcxq %rbp,%rbx movq %r9,80(%rsp) movq %r10,88(%rsp) @@ -609,31 +619,31 @@ rsaz_512_sqr: adoxq %rax,%r12 adoxq %rbp,%r13 - xorq %r14,%r14 - shldq $1,%r13,%r14 - shldq $1,%r12,%r13 - shldq $1,%rbx,%r12 + mulxq %rdx,%rax,%rdi + xorq %rcx,%rcx + movq 56(%rsi),%rdx + adoxq %r11,%r11 - xorl %ebp,%ebp - mulxq %rdx,%rax,%rdx + adcxq %rbx,%rax + adoxq %r12,%r12 adcxq %rax,%r11 - adcxq %rdx,%r12 - movq 56(%rsi),%rdx - adcxq %rbp,%r13 + adoxq %rbp,%rcx + adcxq %rdi,%r12 + adcxq %rbp,%rcx .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 mulxq %rdx,%rax,%rdx - adoxq %rax,%r13 - adoxq %rbp,%rdx + xorq %rbx,%rbx + adoxq %r13,%r13 -.byte 0x66 - addq %rdx,%r14 + adcxq %rcx,%rax + adoxq %rbp,%rbx + adcxq %r13,%rax + adcxq %rdx,%rbx - movq %r13,112(%rsp) - movq %r14,120(%rsp) .byte 102,72,15,126,199 .byte 102,72,15,126,205 @@ -647,6 +657,9 @@ rsaz_512_sqr: movq 48(%rsp),%r14 movq 56(%rsp),%r15 + movq %rax,112(%rsp) + movq %rbx,120(%rsp) + call __rsaz_512_reducex addq 64(%rsp),%r8 @@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one: .type __rsaz_512_reduce,@function .align 32 __rsaz_512_reduce: +.cfi_startproc movq %r8,%rbx imulq 128+8(%rsp),%rbx movq 0(%rbp),%rax @@ -1519,10 +1533,12 @@ __rsaz_512_reduce: jne .Lreduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reduce,.-__rsaz_512_reduce .type __rsaz_512_reducex,@function .align 32 __rsaz_512_reducex: +.cfi_startproc imulq %r8,%rdx xorq %rsi,%rsi @@ -1575,10 +1591,12 @@ __rsaz_512_reducex: jne .Lreduction_loopx .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_reducex,.-__rsaz_512_reducex .type __rsaz_512_subtract,@function .align 32 __rsaz_512_subtract: +.cfi_startproc movq %r8,(%rdi) movq %r9,8(%rdi) movq %r10,16(%rdi) @@ -1632,10 +1650,12 @@ __rsaz_512_subtract: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_subtract,.-__rsaz_512_subtract .type __rsaz_512_mul,@function .align 32 __rsaz_512_mul: +.cfi_startproc leaq 8(%rsp),%rdi movq (%rsi),%rax @@ -1774,10 +1794,12 @@ __rsaz_512_mul: movq %r15,56(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mul,.-__rsaz_512_mul .type __rsaz_512_mulx,@function .align 32 __rsaz_512_mulx: +.cfi_startproc mulxq (%rsi),%rbx,%r8 movq $-6,%rcx @@ -1894,11 +1916,13 @@ __rsaz_512_mulx: movq %r15,8+64+56(%rsp) .byte 0xf3,0xc3 +.cfi_endproc .size __rsaz_512_mulx,.-__rsaz_512_mulx .globl rsaz_512_scatter4 .type rsaz_512_scatter4,@function .align 16 rsaz_512_scatter4: +.cfi_startproc leaq (%rdi,%rdx,8),%rdi movl $8,%r9d jmp .Loop_scatter @@ -1911,12 +1935,14 @@ rsaz_512_scatter4: decl %r9d jnz .Loop_scatter .byte 0xf3,0xc3 +.cfi_endproc .size rsaz_512_scatter4,.-rsaz_512_scatter4 .globl rsaz_512_gather4 .type rsaz_512_gather4,@function .align 16 rsaz_512_gather4: +.cfi_startproc movd %edx,%xmm8 movdqa .Linc+16(%rip),%xmm1 movdqa .Linc(%rip),%xmm0 @@ -1980,6 +2006,7 @@ rsaz_512_gather4: jnz .Loop_gather .byte 0xf3,0xc3 .LSEH_end_rsaz_512_gather4: +.cfi_endproc .size rsaz_512_gather4,.-rsaz_512_gather4 .align 64 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s index df4b6610a02a47..40a60a3c8fc6b9 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s @@ -550,6 +550,7 @@ bn_mul4x_mont_gather5: .type mul4x_internal,@function .align 32 mul4x_internal: +.cfi_startproc shlq $5,%r9 movd 8(%rax),%xmm5 leaq .Linc(%rip),%rax @@ -1071,6 +1072,7 @@ mul4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqr4x_sub_entry +.cfi_endproc .size mul4x_internal,.-mul4x_internal .globl bn_power5 .type bn_power5,@function @@ -1213,6 +1215,7 @@ bn_power5: .align 32 bn_sqr8x_internal: __bn_sqr8x_internal: +.cfi_startproc @@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction: cmpq %rdx,%rdi jb .L8x_reduction_loop .byte 0xf3,0xc3 +.cfi_endproc .size bn_sqr8x_internal,.-bn_sqr8x_internal .type __bn_post4x_internal,@function .align 32 __bn_post4x_internal: +.cfi_startproc movq 0(%rbp),%r12 leaq (%rdi,%r9,1),%rbx movq %r9,%rcx @@ -2041,15 +2046,18 @@ __bn_post4x_internal: movq %r9,%r10 negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_post4x_internal,.-__bn_post4x_internal .globl bn_from_montgomery .type bn_from_montgomery,@function .align 32 bn_from_montgomery: +.cfi_startproc testl $7,%r9d jz bn_from_mont8x xorl %eax,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_from_montgomery,.-bn_from_montgomery .type bn_from_mont8x,@function @@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5: .type mulx4x_internal,@function .align 32 mulx4x_internal: +.cfi_startproc movq %r9,8(%rsp) movq %r9,%r10 negq %r9 @@ -2751,6 +2760,7 @@ mulx4x_internal: movq 16(%rbp),%r14 movq 24(%rbp),%r15 jmp .Lsqrx4x_sub_entry +.cfi_endproc .size mulx4x_internal,.-mulx4x_internal .type bn_powerx5,@function .align 32 @@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction: .size bn_sqrx8x_internal,.-bn_sqrx8x_internal .align 32 __bn_postx4x_internal: +.cfi_startproc movq 0(%rbp),%r12 movq %rcx,%r10 movq %rcx,%r9 @@ -3556,11 +3567,13 @@ __bn_postx4x_internal: negq %r9 .byte 0xf3,0xc3 +.cfi_endproc .size __bn_postx4x_internal,.-__bn_postx4x_internal .globl bn_get_bits5 .type bn_get_bits5,@function .align 16 bn_get_bits5: +.cfi_startproc leaq 0(%rdi),%r10 leaq 1(%rdi),%r11 movl %esi,%ecx @@ -3574,12 +3587,14 @@ bn_get_bits5: shrl %cl,%eax andl $31,%eax .byte 0xf3,0xc3 +.cfi_endproc .size bn_get_bits5,.-bn_get_bits5 .globl bn_scatter5 .type bn_scatter5,@function .align 16 bn_scatter5: +.cfi_startproc cmpl $0,%esi jz .Lscatter_epilogue leaq (%rdx,%rcx,8),%rdx @@ -3592,6 +3607,7 @@ bn_scatter5: jnz .Lscatter .Lscatter_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size bn_scatter5,.-bn_scatter5 .globl bn_gather5 @@ -3599,6 +3615,7 @@ bn_scatter5: .align 32 bn_gather5: .LSEH_begin_bn_gather5: +.cfi_startproc .byte 0x4c,0x8d,0x14,0x24 .byte 0x48,0x81,0xec,0x08,0x01,0x00,0x00 @@ -3756,6 +3773,7 @@ bn_gather5: leaq (%r10),%rsp .byte 0xf3,0xc3 .LSEH_end_bn_gather5: +.cfi_endproc .size bn_gather5,.-bn_gather5 .align 64 .Linc: diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h index 51e776d7cb1ade..62ab79d821c028 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Fri Sep 13 16:00:30 2019 UTC" +#define DATE "built on: Wed Mar 18 21:07:18 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a @@ -38,10 +38,10 @@ static const char compiler_flags[] = { 'S','M',' ','-','D','S','H','A','5','1','2','_','A','S','M',' ', '-','D','K','E','C','C','A','K','1','6','0','0','_','A','S','M', ' ','-','D','R','C','4','_','A','S','M',' ','-','D','M','D','5', - '_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M', - ' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E', - 'C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ', - '-','D','X','2','5','5','1','9','_','A','S','M',' ','-','D','P', - 'O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N','D', - 'E','B','U','G','\0' + '_','A','S','M',' ','-','D','A','E','S','N','I','_','A','S','M', + ' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D','G', + 'H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_','N', + 'I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','X','2', + '5','5','1','9','_','A','S','M',' ','-','D','P','O','L','Y','1', + '3','0','5','_','A','S','M',' ','-','D','N','D','E','B','U','G','\0' }; diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s index 405566b01cca6f..eeb20dd2291da7 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s @@ -5,11 +5,13 @@ .type Camellia_EncryptBlock,@function .align 16 Camellia_EncryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Lenc_rounds +.cfi_endproc .size Camellia_EncryptBlock,.-Camellia_EncryptBlock .globl Camellia_EncryptBlock_Rounds @@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds: .type _x86_64_Camellia_encrypt,@function .align 16 _x86_64_Camellia_encrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt: movl %edx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt @@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt: .type Camellia_DecryptBlock,@function .align 16 Camellia_DecryptBlock: +.cfi_startproc movl $128,%eax subl %edi,%eax movl $3,%edi adcl $0,%edi jmp .Ldec_rounds +.cfi_endproc .size Camellia_DecryptBlock,.-Camellia_DecryptBlock .globl Camellia_DecryptBlock_Rounds @@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds: .type _x86_64_Camellia_decrypt,@function .align 16 _x86_64_Camellia_decrypt: +.cfi_startproc xorl 0(%r14),%r9d xorl 4(%r14),%r8d xorl 8(%r14),%r11d @@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt: movl %ebx,%r11d .byte 0xf3,0xc3 +.cfi_endproc .size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt .globl Camellia_Ekeygen .type Camellia_Ekeygen,@function diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s index 62b9ac6616ba72..5c9e4050416212 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s @@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx: .type ecp_nistz256_to_mont,@function .align 32 ecp_nistz256_to_mont: +.cfi_startproc movl $0x80100,%ecx andl OPENSSL_ia32cap_P+8(%rip),%ecx leaq .LRR(%rip),%rdx jmp .Lmul_mont +.cfi_endproc .size ecp_nistz256_to_mont,.-ecp_nistz256_to_mont @@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont: .type ecp_nistz256_scatter_w5,@function .align 32 ecp_nistz256_scatter_w5: +.cfi_startproc leal -3(%rdx,%rdx,2),%edx movdqa 0(%rsi),%xmm0 shll $5,%edx @@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5: movdqa %xmm5,80(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5 @@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5: .type ecp_nistz256_scatter_w7,@function .align 32 ecp_nistz256_scatter_w7: +.cfi_startproc movdqu 0(%rsi),%xmm0 shll $6,%edx movdqu 16(%rsi),%xmm1 @@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7: movdqa %xmm3,48(%rdi,%rdx,1) .byte 0xf3,0xc3 +.cfi_endproc .size ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7 @@ -5655,26 +5661,16 @@ ecp_nistz256_point_add: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedq .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedq - testq %r9,%r9 - jz .Ladd_doubleq -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_doneq + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedq -.align 32 .Ladd_doubleq: .byte 102,72,15,126,206 .byte 102,72,15,126,199 @@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx: orq %r8,%r12 orq %r9,%r12 -.byte 0x3e - jnz .Ladd_proceedx .byte 102,73,15,126,208 .byte 102,73,15,126,217 - testq %r8,%r8 - jnz .Ladd_proceedx - testq %r9,%r9 - jz .Ladd_doublex -.byte 102,72,15,126,199 - pxor %xmm0,%xmm0 - movdqu %xmm0,0(%rdi) - movdqu %xmm0,16(%rdi) - movdqu %xmm0,32(%rdi) - movdqu %xmm0,48(%rdi) - movdqu %xmm0,64(%rdi) - movdqu %xmm0,80(%rdi) - jmp .Ladd_donex + orq %r8,%r12 + orq %r9,%r12 + + +.byte 0x3e + jnz .Ladd_proceedx -.align 32 .Ladd_doublex: .byte 102,72,15,126,206 .byte 102,72,15,126,199 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s index 2a18eaee288ce7..1788e568cda5d2 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s @@ -400,12 +400,14 @@ x25519_fe51_mul121666: .type x25519_fe64_eligible,@function .align 32 x25519_fe64_eligible: +.cfi_startproc movl OPENSSL_ia32cap_P+8(%rip),%ecx xorl %eax,%eax andl $0x80100,%ecx cmpl $0x80100,%ecx cmovel %ecx,%eax .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_eligible,.-x25519_fe64_eligible .globl x25519_fe64_mul @@ -648,6 +650,7 @@ x25519_fe64_sqr: .align 32 x25519_fe64_mul121666: .Lfe64_mul121666_body: +.cfi_startproc movl $121666,%edx mulxq 0(%rsi),%r8,%rcx mulxq 8(%rsi),%r9,%rax @@ -676,6 +679,7 @@ x25519_fe64_mul121666: .Lfe64_mul121666_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_mul121666,.-x25519_fe64_mul121666 .globl x25519_fe64_add @@ -683,6 +687,7 @@ x25519_fe64_mul121666: .align 32 x25519_fe64_add: .Lfe64_add_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -711,6 +716,7 @@ x25519_fe64_add: .Lfe64_add_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_add,.-x25519_fe64_add .globl x25519_fe64_sub @@ -718,6 +724,7 @@ x25519_fe64_add: .align 32 x25519_fe64_sub: .Lfe64_sub_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -746,6 +753,7 @@ x25519_fe64_sub: .Lfe64_sub_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_sub,.-x25519_fe64_sub .globl x25519_fe64_tobytes @@ -753,6 +761,7 @@ x25519_fe64_sub: .align 32 x25519_fe64_tobytes: .Lfe64_to_body: +.cfi_startproc movq 0(%rsi),%r8 movq 8(%rsi),%r9 movq 16(%rsi),%r10 @@ -788,5 +797,6 @@ x25519_fe64_tobytes: .Lfe64_to_epilogue: .byte 0xf3,0xc3 +.cfi_endproc .size x25519_fe64_tobytes,.-x25519_fe64_tobytes .byte 88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s index 6a7a9577c7142f..01d89630a42f73 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s @@ -3,6 +3,7 @@ .type _aesni_ctr32_ghash_6x,@function .align 32 _aesni_ctr32_ghash_6x: +.cfi_startproc vmovdqu 32(%r11),%xmm2 subq $6,%rdx vpxor %xmm4,%xmm4,%xmm4 @@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x: vpxor %xmm4,%xmm8,%xmm8 .byte 0xf3,0xc3 +.cfi_endproc .size _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x .globl aesni_gcm_decrypt .type aesni_gcm_decrypt,@function @@ -416,6 +418,7 @@ aesni_gcm_decrypt: .type _aesni_ctr32_6x,@function .align 32 _aesni_ctr32_6x: +.cfi_startproc vmovdqu 0-128(%rcx),%xmm4 vmovdqu 32(%r11),%xmm2 leaq -1(%rbp),%r13 @@ -502,6 +505,7 @@ _aesni_ctr32_6x: vpshufb %xmm0,%xmm1,%xmm1 vpxor %xmm4,%xmm14,%xmm14 jmp .Loop_ctr32 +.cfi_endproc .size _aesni_ctr32_6x,.-_aesni_ctr32_6x .globl aesni_gcm_encrypt diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s index 6f4cac8d3920c1..2636c52bbe5e48 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s @@ -12,6 +12,7 @@ .type poly1305_init,@function .align 32 poly1305_init: +.cfi_startproc xorq %rax,%rax movq %rax,0(%rdi) movq %rax,8(%rdi) @@ -42,6 +43,7 @@ poly1305_init: movl $1,%eax .Lno_key: .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_init,.-poly1305_init .type poly1305_blocks,@function @@ -162,6 +164,7 @@ poly1305_blocks: .type poly1305_emit,@function .align 32 poly1305_emit: +.cfi_startproc .Lemit: movq 0(%rdi),%r8 movq 8(%rdi),%r9 @@ -182,10 +185,12 @@ poly1305_emit: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit,.-poly1305_emit .type __poly1305_block,@function .align 32 __poly1305_block: +.cfi_startproc mulq %r14 movq %rax,%r9 movq %r11,%rax @@ -225,11 +230,13 @@ __poly1305_block: adcq $0,%rbx adcq $0,%rbp .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_block,.-__poly1305_block .type __poly1305_init_avx,@function .align 32 __poly1305_init_avx: +.cfi_startproc movq %r11,%r14 movq %r12,%rbx xorq %rbp,%rbp @@ -387,6 +394,7 @@ __poly1305_init_avx: leaq -48-64(%rdi),%rdi .byte 0xf3,0xc3 +.cfi_endproc .size __poly1305_init_avx,.-__poly1305_init_avx .type poly1305_blocks_avx,@function @@ -1227,6 +1235,7 @@ poly1305_blocks_avx: .type poly1305_emit_avx,@function .align 32 poly1305_emit_avx: +.cfi_startproc cmpl $0,20(%rdi) je .Lemit @@ -1277,6 +1286,7 @@ poly1305_emit_avx: movq %rcx,8(%rsi) .byte 0xf3,0xc3 +.cfi_endproc .size poly1305_emit_avx,.-poly1305_emit_avx .type poly1305_blocks_avx2,@function .align 32 @@ -1959,6 +1969,7 @@ poly1305_blocks_avx2: .type xor128_encrypt_n_pad,@function .align 16 xor128_encrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -2000,12 +2011,14 @@ xor128_encrypt_n_pad: .Ldone_enc: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_encrypt_n_pad,.-xor128_encrypt_n_pad .globl xor128_decrypt_n_pad .type xor128_decrypt_n_pad,@function .align 16 xor128_decrypt_n_pad: +.cfi_startproc subq %rdx,%rsi subq %rdx,%rdi movq %rcx,%r10 @@ -2051,4 +2064,5 @@ xor128_decrypt_n_pad: .Ldone_dec: movq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size xor128_decrypt_n_pad,.-xor128_decrypt_n_pad diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s index fba70351d48d5c..b97c757550aad0 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s @@ -4,11 +4,12 @@ .globl RC4 .type RC4,@function .align 16 -RC4: orq %rsi,%rsi +RC4: +.cfi_startproc + orq %rsi,%rsi jne .Lentry .byte 0xf3,0xc3 .Lentry: -.cfi_startproc pushq %rbx .cfi_adjust_cfa_offset 8 .cfi_offset %rbx,-16 @@ -533,6 +534,7 @@ RC4: orq %rsi,%rsi .type RC4_set_key,@function .align 16 RC4_set_key: +.cfi_startproc leaq 8(%rdi),%rdi leaq (%rdx,%rsi,1),%rdx negq %rsi @@ -599,12 +601,14 @@ RC4_set_key: movl %eax,-8(%rdi) movl %eax,-4(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size RC4_set_key,.-RC4_set_key .globl RC4_options .type RC4_options,@function .align 16 RC4_options: +.cfi_startproc leaq .Lopts(%rip),%rax movl OPENSSL_ia32cap_P(%rip),%edx btl $20,%edx @@ -617,6 +621,7 @@ RC4_options: addq $12,%rax .Ldone: .byte 0xf3,0xc3 +.cfi_endproc .align 64 .Lopts: .byte 114,99,52,40,56,120,44,105,110,116,41,0 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s index e511f25035b2b8..09617d014bdb7b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s @@ -3,6 +3,7 @@ .type __KeccakF1600,@function .align 32 __KeccakF1600: +.cfi_startproc movq 60(%rdi),%rax movq 68(%rdi),%rbx movq 76(%rdi),%rcx @@ -255,6 +256,7 @@ __KeccakF1600: leaq -192(%r15),%r15 .byte 0xf3,0xc3 +.cfi_endproc .size __KeccakF1600,.-__KeccakF1600 .type KeccakF1600,@function diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s index e436521a040f66..98541727e555da 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s @@ -1421,8 +1421,8 @@ _shaext_shortcut: pshufd $27,%xmm1,%xmm1 movdqu %xmm0,(%rdi) movd %xmm1,16(%rdi) -.cfi_endproc .byte 0xf3,0xc3 +.cfi_endproc .size sha1_block_data_order_shaext,.-sha1_block_data_order_shaext .type sha1_block_data_order_ssse3,@function .align 16 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s index 42b24df18e5afe..9357385da3c49b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s @@ -1775,6 +1775,7 @@ K256: .align 64 sha256_block_data_order_shaext: _shaext_shortcut: +.cfi_startproc leaq K256+128(%rip),%rcx movdqu (%rdi),%xmm1 movdqu 16(%rdi),%xmm2 @@ -1977,6 +1978,7 @@ _shaext_shortcut: movdqu %xmm1,(%rdi) movdqu %xmm2,16(%rdi) .byte 0xf3,0xc3 +.cfi_endproc .size sha256_block_data_order_shaext,.-sha256_block_data_order_shaext .type sha256_block_data_order_ssse3,@function .align 64 @@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2: vmovdqa %ymm4,0(%rsp) xorl %r14d,%r14d vmovdqa %ymm5,32(%rsp) + + movq 88(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -64(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 movl %ebx,%edi vmovdqa %ymm6,0(%rsp) xorl %ecx,%edi @@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm0,%ymm1,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2: movl %r9d,%r12d vmovdqa %ymm6,32(%rsp) leaq -64(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x38,0x06,0x23,0x08 + + pushq 64-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $4,%ymm2,%ymm3,%ymm4 addl 0+128(%rsp),%r11d andl %r8d,%r12d @@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2: leaq 448(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08 + addl 0(%rdi),%eax addl 4(%rdi),%ebx addl 8(%rdi),%ecx @@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 88(%rsp),%rsi + movq 88(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s index 5931a2a93234d0..939f1ca71c9394 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s @@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2: vmovdqa %ymm10,64(%rsp) vpaddq 64(%rbp),%ymm6,%ymm10 vmovdqa %ymm11,96(%rsp) + + movq 152(%rsp),%rdi +.cfi_def_cfa %rdi,8 leaq -128(%rsp),%rsp + + + + movq %rdi,-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpaddq 96(%rbp),%ymm7,%ymm11 vmovdqa %ymm8,0(%rsp) xorq %r14,%r14 @@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2: .align 16 .Lavx2_00_47: leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm0,%ymm1,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2: movq %r9,%r12 vmovdqa %ymm10,96(%rsp) leaq -128(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08 + + pushq 128-8(%rsp) +.cfi_escape 0x0f,0x05,0x77,0x00,0x06,0x23,0x08 + leaq 8(%rsp),%rsp +.cfi_escape 0x0f,0x05,0x77,0x78,0x06,0x23,0x08 vpalignr $8,%ymm4,%ymm5,%ymm8 addq 0+256(%rsp),%r11 andq %r8,%r12 @@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2: leaq 1152(%rsp),%rsp +.cfi_escape 0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08 + addq 0(%rdi),%rax addq 8(%rdi),%rbx addq 16(%rdi),%rcx @@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2: jbe .Loop_avx2 leaq (%rsp),%rbp + +.cfi_escape 0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08 + .Ldone_avx2: - leaq (%rbp),%rsp - movq 152(%rsp),%rsi + movq 152(%rbp),%rsi .cfi_def_cfa %rsi,8 vzeroupper movq -48(%rsi),%r15 diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s index fd17eaaba49576..9268ce8c9a9d63 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s @@ -12,6 +12,7 @@ .type OPENSSL_atomic_add,@function .align 16 OPENSSL_atomic_add: +.cfi_startproc movl (%rdi),%eax .Lspin: leaq (%rsi,%rax,1),%r8 .byte 0xf0 @@ -20,16 +21,19 @@ OPENSSL_atomic_add: movl %r8d,%eax .byte 0x48,0x98 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_atomic_add,.-OPENSSL_atomic_add .globl OPENSSL_rdtsc .type OPENSSL_rdtsc,@function .align 16 OPENSSL_rdtsc: +.cfi_startproc rdtsc shlq $32,%rdx orq %rdx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_rdtsc,.-OPENSSL_rdtsc .globl OPENSSL_ia32_cpuid @@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid: .type OPENSSL_cleanse,@function .align 16 OPENSSL_cleanse: +.cfi_startproc xorq %rax,%rax cmpq $15,%rsi jae .Lot @@ -234,12 +239,14 @@ OPENSSL_cleanse: cmpq $0,%rsi jne .Little .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_cleanse,.-OPENSSL_cleanse .globl CRYPTO_memcmp .type CRYPTO_memcmp,@function .align 16 CRYPTO_memcmp: +.cfi_startproc xorq %rax,%rax xorq %r10,%r10 cmpq $0,%rdx @@ -268,11 +275,13 @@ CRYPTO_memcmp: shrq $63,%rax .Lno_data: .byte 0xf3,0xc3 +.cfi_endproc .size CRYPTO_memcmp,.-CRYPTO_memcmp .globl OPENSSL_wipe_cpu .type OPENSSL_wipe_cpu,@function .align 16 OPENSSL_wipe_cpu: +.cfi_startproc pxor %xmm0,%xmm0 pxor %xmm1,%xmm1 pxor %xmm2,%xmm2 @@ -299,11 +308,13 @@ OPENSSL_wipe_cpu: xorq %r11,%r11 leaq 8(%rsp),%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu .globl OPENSSL_instrument_bus .type OPENSSL_instrument_bus,@function .align 16 OPENSSL_instrument_bus: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rsi,%r11 @@ -330,12 +341,14 @@ OPENSSL_instrument_bus: movq %r11,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus .globl OPENSSL_instrument_bus2 .type OPENSSL_instrument_bus2,@function .align 16 OPENSSL_instrument_bus2: +.cfi_startproc movq %rdi,%r10 movq %rsi,%rcx movq %rdx,%r11 @@ -378,11 +391,13 @@ OPENSSL_instrument_bus2: movq 8(%rsp),%rax subq %rcx,%rax .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2 .globl OPENSSL_ia32_rdrand_bytes .type OPENSSL_ia32_rdrand_bytes,@function .align 16 OPENSSL_ia32_rdrand_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdrand_bytes @@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes: .Ldone_rdrand_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes .globl OPENSSL_ia32_rdseed_bytes .type OPENSSL_ia32_rdseed_bytes,@function .align 16 OPENSSL_ia32_rdseed_bytes: +.cfi_startproc xorq %rax,%rax cmpq $0,%rsi je .Ldone_rdseed_bytes @@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes: .Ldone_rdseed_bytes: xorq %r10,%r10 .byte 0xf3,0xc3 +.cfi_endproc .size OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h index 913bb95a5a8a42..14050a45347f62 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi index b134d72e7dc477..04e53d9f2ae658 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi @@ -16,6 +16,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi index 05ee0df141731d..c69de8024db83b 100644 --- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi +++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi @@ -723,6 +723,7 @@ 'KECCAK1600_ASM', 'RC4_ASM', 'MD5_ASM', + 'AESNI_ASM', 'VPAES_ASM', 'GHASH_ASM', 'ECP_NISTZ256_ASM', diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm index 93da6e96905edd..e9a7a8ce9f17d7 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux-x86_64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -238,6 +238,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3223,7 +3230,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3231,6 +3237,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3729,14 +3736,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4177,6 +4176,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4871,49 +4878,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4935,7 +4934,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4949,613 +4947,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5573,188 +5469,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5784,13 +5649,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5800,43 +5663,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5846,31 +5702,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5888,278 +5739,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6169,301 +5974,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6471,7 +6226,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6479,7 +6233,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6487,7 +6240,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6495,7 +6247,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6254,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,163 +6261,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6685,223 +6408,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6909,21 +6595,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6931,13 +6614,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6945,81 +6626,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7027,328 +6695,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7358,85 +6965,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7459,361 +7052,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7835,259 +7368,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8097,31 +7587,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8131,7 +7616,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8157,13 +7641,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8189,7 +7671,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8215,709 +7696,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8968,6 +8331,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9212,7 +8583,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9538,7 +8908,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9584,7 +8953,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9650,7 +9018,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9675,7 +9042,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9773,7 +9139,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9823,18 +9188,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9845,6 +9207,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9908,10 +9274,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9940,6 +9302,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10204,6 +9570,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15094,7 +14461,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15102,6 +14468,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15329,6 +14696,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15431,10 +14806,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15463,6 +14834,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h index df3083b539c028..208c6e0e31cced 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux-x86_64" -#define DATE "built on: Fri Sep 13 16:00:45 2019 UTC" +#define DATE "built on: Wed Mar 18 21:07:36 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h index 22c5ea87c47259..31bdb87ddb6c01 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm index 02768931a01019..3efb27cfc66c16 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux32-s390x", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3230,7 +3237,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3238,6 +3244,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3736,14 +3743,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4184,6 +4183,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4870,7 +4877,6 @@ our %unified_info = ( "crypto/aes/aes-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4881,37 +4887,31 @@ our %unified_info = ( "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4933,7 +4933,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4947,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5571,188 +5468,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5762,13 +5628,11 @@ our %unified_info = ( "crypto/bn/s390x-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/s390x-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5794,13 +5658,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5810,43 +5672,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5856,31 +5711,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5894,279 +5744,233 @@ our %unified_info = ( "crypto/chacha/chacha-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6176,301 +5980,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6232,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6239,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6246,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,7 +6260,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6518,163 +6267,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6692,223 +6414,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6916,21 +6601,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6938,13 +6620,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6952,81 +6632,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7034,328 +6701,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7365,79 +6971,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7448,7 +7041,6 @@ our %unified_info = ( "crypto/modes/ghash-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7463,361 +7055,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7835,7 +7367,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7845,296 +7376,247 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcap.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8144,7 +7626,6 @@ our %unified_info = ( "crypto/sha/keccak1600-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8162,7 +7643,6 @@ our %unified_info = ( "crypto/sha/sha1-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8173,13 +7653,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8197,7 +7675,6 @@ our %unified_info = ( "crypto/sha/sha256-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8208,7 +7685,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8226,7 +7702,6 @@ our %unified_info = ( "crypto/sha/sha512-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8237,709 +7712,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8990,6 +8347,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9234,7 +8599,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9560,7 +8924,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9606,7 +8969,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9672,7 +9034,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9697,7 +9058,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9795,7 +9155,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9845,18 +9204,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9867,6 +9223,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9930,10 +9290,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9962,6 +9318,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10226,6 +9586,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15146,7 +14507,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15154,6 +14514,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15381,6 +14742,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15483,10 +14852,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15515,6 +14880,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S index 31e9aa9aee1906..83260ee4bc54c1 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S @@ -2094,7 +2094,7 @@ AES_xts_encrypt: .Lxts_enc_done: stg %r15,80+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,80+8(%r15) lm %r6,%r14,6*4(%r15) br %r14 .size AES_xts_encrypt,.-AES_xts_encrypt @@ -2360,7 +2360,7 @@ AES_xts_decrypt: stg %r15,80-16+8(%r15) .Lxts_dec_done: stg %r15,80+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,80+8(%r15) lm %r6,%r14,6*4(%r15) br %r14 .size AES_xts_decrypt,.-AES_xts_decrypt diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S index 0a6c67545a6e51..4f5f4e4e96cab7 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S @@ -45,7 +45,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -97,7 +97,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -141,7 +141,7 @@ bn_mul_mont: la %r3,96(%r15) ahi %r1,1 # restore %r1, incidentally clears "borrow" - la %r7,0(%r0) + la %r7,0 lr %r14,%r1 .Lsub: lg %r9,0(%r7,%r3) lg %r11,0(%r7,%r5) @@ -155,7 +155,7 @@ bn_mul_mont: lghi %r13,-1 xgr %r13,%r12 - la %r7,0(%r0) + la %r7,0 lgr %r14,%r1 .Lcopy: lg %r8,96(%r7,%r15) # conditional copy lg %r9,0(%r7,%r2) diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h index e5da8365c7a61d..9d017d177882b0 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Fri Sep 13 16:01:33 2019 UTC" +#define DATE "built on: Wed Mar 18 21:08:58 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s index 1b06f9a8c422a2..c37d5fb2f9d620 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s +++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s @@ -193,7 +193,7 @@ RC4: RC4_set_key: stm %r6,%r8,6*4(%r15) lhi %r0,256 - la %r1,0(%r0) + la %r1,0 sth %r1,0(%r2) .align 4 .L1stloop: @@ -203,8 +203,8 @@ RC4_set_key: lghi %r7,-256 lr %r0,%r3 - la %r8,0(%r0) - la %r1,0(%r0) + la %r8,0 + la %r1,0 .align 16 .L2ndloop: llgc %r5,2+256(%r7,%r2) @@ -221,7 +221,7 @@ RC4_set_key: jz .Ldone brct %r0,.L2ndloop lr %r0,%r3 - la %r8,0(%r0) + la %r8,0 j .L2ndloop .Ldone: lm %r6,%r8,6*4(%r15) diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h index 1a2b31bdc7008c..71c4fecc40cc4e 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm index 96ab247e83743d..d8384829df628d 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux32-s390x", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3230,7 +3237,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3238,6 +3244,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3736,14 +3743,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4184,6 +4183,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4870,7 +4877,6 @@ our %unified_info = ( "crypto/aes/aes-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4881,37 +4887,31 @@ our %unified_info = ( "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4933,7 +4933,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4947,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5571,188 +5468,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5762,13 +5628,11 @@ our %unified_info = ( "crypto/bn/s390x-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/s390x-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5794,13 +5658,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5810,43 +5672,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5856,31 +5711,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5894,279 +5744,233 @@ our %unified_info = ( "crypto/chacha/chacha-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6176,301 +5980,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6478,7 +6232,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6486,7 +6239,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6494,7 +6246,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6502,7 +6253,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6510,7 +6260,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6518,163 +6267,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6692,223 +6414,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6916,21 +6601,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6938,13 +6620,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6952,81 +6632,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7034,328 +6701,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7365,79 +6971,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7448,7 +7041,6 @@ our %unified_info = ( "crypto/modes/ghash-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7463,361 +7055,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7835,7 +7367,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7845,296 +7376,247 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcap.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8144,7 +7626,6 @@ our %unified_info = ( "crypto/sha/keccak1600-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8162,7 +7643,6 @@ our %unified_info = ( "crypto/sha/sha1-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8173,13 +7653,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8197,7 +7675,6 @@ our %unified_info = ( "crypto/sha/sha256-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8208,7 +7685,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8226,7 +7702,6 @@ our %unified_info = ( "crypto/sha/sha512-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8237,709 +7712,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8990,6 +8347,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9234,7 +8599,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9560,7 +8924,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9606,7 +8969,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9672,7 +9034,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9697,7 +9058,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9795,7 +9155,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9845,18 +9204,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9867,6 +9223,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9930,10 +9290,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9962,6 +9318,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10226,6 +9586,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15146,7 +14507,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15154,6 +14514,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15381,6 +14742,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15483,10 +14852,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15515,6 +14880,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S index 31e9aa9aee1906..83260ee4bc54c1 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S @@ -2094,7 +2094,7 @@ AES_xts_encrypt: .Lxts_enc_done: stg %r15,80+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,80+8(%r15) lm %r6,%r14,6*4(%r15) br %r14 .size AES_xts_encrypt,.-AES_xts_encrypt @@ -2360,7 +2360,7 @@ AES_xts_decrypt: stg %r15,80-16+8(%r15) .Lxts_dec_done: stg %r15,80+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,80+8(%r15) lm %r6,%r14,6*4(%r15) br %r14 .size AES_xts_decrypt,.-AES_xts_decrypt diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S index 0a6c67545a6e51..4f5f4e4e96cab7 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S @@ -45,7 +45,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -97,7 +97,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -141,7 +141,7 @@ bn_mul_mont: la %r3,96(%r15) ahi %r1,1 # restore %r1, incidentally clears "borrow" - la %r7,0(%r0) + la %r7,0 lr %r14,%r1 .Lsub: lg %r9,0(%r7,%r3) lg %r11,0(%r7,%r5) @@ -155,7 +155,7 @@ bn_mul_mont: lghi %r13,-1 xgr %r13,%r12 - la %r7,0(%r0) + la %r7,0 lgr %r14,%r1 .Lcopy: lg %r8,96(%r7,%r15) # conditional copy lg %r9,0(%r7,%r2) diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h index 71628ed04c6c4f..e7fee2eb3e3165 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Fri Sep 13 16:01:37 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:02 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s index 1b06f9a8c422a2..c37d5fb2f9d620 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s @@ -193,7 +193,7 @@ RC4: RC4_set_key: stm %r6,%r8,6*4(%r15) lhi %r0,256 - la %r1,0(%r0) + la %r1,0 sth %r1,0(%r2) .align 4 .L1stloop: @@ -203,8 +203,8 @@ RC4_set_key: lghi %r7,-256 lr %r0,%r3 - la %r8,0(%r0) - la %r1,0(%r0) + la %r8,0 + la %r1,0 .align 16 .L2ndloop: llgc %r5,2+256(%r7,%r2) @@ -221,7 +221,7 @@ RC4_set_key: jz .Ldone brct %r0,.L2ndloop lr %r0,%r3 - la %r8,0(%r0) + la %r8,0 j .L2ndloop .Ldone: lm %r6,%r8,6*4(%r15) diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h index 1a2b31bdc7008c..71c4fecc40cc4e 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm index 1fcc3a092d63ba..ba39c8551f82c0 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux32-s390x", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -238,6 +238,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3222,7 +3229,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3230,6 +3236,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3728,14 +3735,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4176,6 +4175,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4870,49 +4877,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4934,7 +4933,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4948,613 +4946,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5572,182 +5468,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5777,13 +5643,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5793,43 +5657,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5839,31 +5696,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5881,278 +5733,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6162,301 +5968,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6464,7 +6220,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6472,7 +6227,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6480,7 +6234,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6488,7 +6241,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6496,7 +6248,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6504,163 +6255,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6678,223 +6402,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6902,21 +6589,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6924,13 +6608,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6938,81 +6620,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7020,328 +6689,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7351,85 +6959,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7452,361 +7046,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7828,259 +7362,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8090,31 +7581,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8124,7 +7610,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8150,13 +7635,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8182,7 +7665,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8208,709 +7690,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8961,6 +8325,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9205,7 +8577,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9531,7 +8902,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9577,7 +8947,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9643,7 +9012,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9668,7 +9036,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9766,7 +9133,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9816,18 +9182,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9838,6 +9201,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9901,10 +9268,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9933,6 +9296,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10197,6 +9564,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15082,7 +14450,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15090,6 +14457,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15317,6 +14685,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15419,10 +14795,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15451,6 +14823,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h index e7256e3f12adc9..2fbe63990cc612 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux32-s390x" -#define DATE "built on: Fri Sep 13 16:01:41 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:09 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h index fb52156bd0ced3..459055c96faea0 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h index 6419ec21a2675f..4cbafb777f2ce3 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm index 6d77d25fe39da0..1302d730d02d59 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux64-mips64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3229,7 +3236,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3237,6 +3243,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3735,14 +3742,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4183,6 +4182,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4865,7 +4872,6 @@ our %unified_info = ( "crypto/aes/aes-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4880,43 +4886,36 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4938,7 +4937,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4952,613 +4950,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5572,195 +5468,163 @@ our %unified_info = ( "crypto/bn/bn-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5787,13 +5651,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5803,43 +5665,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5849,31 +5704,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5891,278 +5741,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6172,301 +5976,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6474,7 +6228,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6482,7 +6235,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6490,7 +6242,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6498,7 +6249,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6506,7 +6256,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6514,163 +6263,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6688,223 +6410,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6912,21 +6597,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6934,13 +6616,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6948,81 +6628,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7030,328 +6697,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7361,85 +6967,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7462,361 +7054,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7830,7 +7362,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7841,259 +7372,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8103,31 +7591,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8137,7 +7620,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8151,7 +7633,6 @@ our %unified_info = ( "crypto/sha/sha1-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8166,13 +7647,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8186,7 +7665,6 @@ our %unified_info = ( "crypto/sha/sha256-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8201,7 +7679,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8215,7 +7692,6 @@ our %unified_info = ( "crypto/sha/sha512-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8230,709 +7706,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8983,6 +8341,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9227,7 +8593,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9553,7 +8918,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9599,7 +8963,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9665,7 +9028,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9690,7 +9052,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9788,7 +9149,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9838,18 +9198,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9860,6 +9217,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9923,10 +9284,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9955,6 +9312,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10219,6 +9580,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15134,7 +14496,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15142,6 +14503,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15369,6 +14731,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15471,10 +14841,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15503,6 +14869,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h index 865115208dc742..5f969bc3a4bfc0 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Fri Sep 13 16:01:56 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:33 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm index 8324964ca7936e..f53a77e0a05edb 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux64-mips64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3229,7 +3236,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3237,6 +3243,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3735,14 +3742,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4183,6 +4182,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4865,7 +4872,6 @@ our %unified_info = ( "crypto/aes/aes-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4880,43 +4886,36 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4938,7 +4937,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4952,613 +4950,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5572,195 +5468,163 @@ our %unified_info = ( "crypto/bn/bn-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -5787,13 +5651,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5803,43 +5665,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5849,31 +5704,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5891,278 +5741,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6172,301 +5976,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6474,7 +6228,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6482,7 +6235,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6490,7 +6242,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6498,7 +6249,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6506,7 +6256,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6514,163 +6263,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6688,223 +6410,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6912,21 +6597,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6934,13 +6616,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6948,81 +6628,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7030,328 +6697,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7361,85 +6967,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7462,361 +7054,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7830,7 +7362,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7841,259 +7372,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8103,31 +7591,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8137,7 +7620,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8151,7 +7633,6 @@ our %unified_info = ( "crypto/sha/sha1-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8166,13 +7647,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8186,7 +7665,6 @@ our %unified_info = ( "crypto/sha/sha256-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8201,7 +7679,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8215,7 +7692,6 @@ our %unified_info = ( "crypto/sha/sha512-mips.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8230,709 +7706,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8983,6 +8341,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9227,7 +8593,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9553,7 +8918,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9599,7 +8963,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9665,7 +9028,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9690,7 +9052,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9788,7 +9149,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9838,18 +9198,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9860,6 +9217,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9923,10 +9284,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9955,6 +9312,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10219,6 +9580,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15134,7 +14496,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15142,6 +14503,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15369,6 +14731,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15471,10 +14841,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15503,6 +14869,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h index f6a9d770f1eb3e..87d8f13efafd96 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Fri Sep 13 16:02:00 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:39 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm index f5b0bfea293e48..62586346a8d849 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux64-mips64", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -238,6 +238,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3223,7 +3230,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3231,6 +3237,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3729,14 +3736,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4177,6 +4176,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4871,49 +4878,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4935,7 +4934,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4949,613 +4947,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5573,188 +5469,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5784,13 +5649,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5800,43 +5663,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5846,31 +5702,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5888,278 +5739,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6169,301 +5974,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6471,7 +6226,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6479,7 +6233,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6487,7 +6240,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6495,7 +6247,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6254,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,163 +6261,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6685,223 +6408,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6909,21 +6595,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6931,13 +6614,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6945,81 +6626,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7027,328 +6695,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7358,85 +6965,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7459,361 +7052,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7835,259 +7368,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8097,31 +7587,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8131,7 +7616,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8157,13 +7641,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8189,7 +7671,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8215,709 +7696,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8968,6 +8331,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9212,7 +8583,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9538,7 +8908,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9584,7 +8953,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9650,7 +9018,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9675,7 +9042,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9773,7 +9139,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9823,18 +9188,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9845,6 +9207,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9908,10 +9274,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9940,6 +9302,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10204,6 +9570,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15094,7 +14461,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15102,6 +14468,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15329,6 +14696,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15431,10 +14806,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15463,6 +14834,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h index 3c6ad34101ddd7..f58b88ffe332db 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-mips64" -#define DATE "built on: Fri Sep 13 16:02:04 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:46 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h index 212e3f67d8e568..781ef739dc2274 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm index e31688fe1aceae..b73e953e4d3b32 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux64-s390x", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3243,7 +3250,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3251,6 +3257,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3749,14 +3756,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4197,6 +4196,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4883,7 +4890,6 @@ our %unified_info = ( "crypto/aes/aes-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4894,37 +4900,31 @@ our %unified_info = ( "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4946,7 +4946,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4960,613 +4959,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5580,7 +5477,6 @@ our %unified_info = ( "crypto/bn/asm/s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5590,182 +5486,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5775,13 +5641,11 @@ our %unified_info = ( "crypto/bn/s390x-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/s390x-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5807,13 +5671,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5823,43 +5685,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5869,31 +5724,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5907,279 +5757,233 @@ our %unified_info = ( "crypto/chacha/chacha-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6189,301 +5993,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6491,7 +6245,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6252,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,7 +6259,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6515,7 +6266,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6523,7 +6273,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6531,163 +6280,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6705,223 +6427,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6929,21 +6614,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6951,13 +6633,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6965,81 +6645,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7047,328 +6714,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7378,79 +6984,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7461,7 +7054,6 @@ our %unified_info = ( "crypto/modes/ghash-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7476,361 +7068,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7848,7 +7380,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7858,296 +7389,247 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcap.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8157,7 +7639,6 @@ our %unified_info = ( "crypto/sha/keccak1600-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8175,7 +7656,6 @@ our %unified_info = ( "crypto/sha/sha1-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8186,13 +7666,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8210,7 +7688,6 @@ our %unified_info = ( "crypto/sha/sha256-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8221,7 +7698,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8239,7 +7715,6 @@ our %unified_info = ( "crypto/sha/sha512-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8250,709 +7725,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9003,6 +8360,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9247,7 +8612,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9573,7 +8937,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9619,7 +8982,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9685,7 +9047,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9710,7 +9071,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9808,7 +9168,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9858,18 +9217,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9880,6 +9236,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9943,10 +9303,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9975,6 +9331,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10239,6 +9599,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15159,7 +14520,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15167,6 +14527,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15394,6 +14755,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15496,10 +14865,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15528,6 +14893,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S index e00f81ecd485ad..c432d017beb30b 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S @@ -2093,7 +2093,7 @@ AES_xts_encrypt: .Lxts_enc_done: stg %r15,144+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,144+8(%r15) lmg %r6,%r14,6*8(%r15) br %r14 .size AES_xts_encrypt,.-AES_xts_encrypt @@ -2358,7 +2358,7 @@ AES_xts_decrypt: stg %r15,144-16+8(%r15) .Lxts_dec_done: stg %r15,144+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,144+8(%r15) lmg %r6,%r14,6*8(%r15) br %r14 .size AES_xts_decrypt,.-AES_xts_decrypt diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S index b8dea0a66f382f..b6119c009bc19b 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S @@ -45,7 +45,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -97,7 +97,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -141,7 +141,7 @@ bn_mul_mont: la %r3,160(%r15) ahi %r1,1 # restore %r1, incidentally clears "borrow" - la %r7,0(%r0) + la %r7,0 lr %r14,%r1 .Lsub: lg %r9,0(%r7,%r3) lg %r11,0(%r7,%r5) @@ -155,7 +155,7 @@ bn_mul_mont: lghi %r13,-1 xgr %r13,%r12 - la %r7,0(%r0) + la %r7,0 lgr %r14,%r1 .Lcopy: lg %r8,160(%r7,%r15) # conditional copy lg %r9,0(%r7,%r2) diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h index 6d2d3ce3fd2bc9..48a866e7b2457e 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Fri Sep 13 16:01:44 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:15 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s index e5883fea428aa5..d88918c0134d55 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s +++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s @@ -192,7 +192,7 @@ RC4: RC4_set_key: stmg %r6,%r8,6*8(%r15) lhi %r0,256 - la %r1,0(%r0) + la %r1,0 sth %r1,0(%r2) .align 4 .L1stloop: @@ -202,8 +202,8 @@ RC4_set_key: lghi %r7,-256 lr %r0,%r3 - la %r8,0(%r0) - la %r1,0(%r0) + la %r8,0 + la %r1,0 .align 16 .L2ndloop: llgc %r5,2+256(%r7,%r2) @@ -220,7 +220,7 @@ RC4_set_key: jz .Ldone brct %r0,.L2ndloop lr %r0,%r3 - la %r8,0(%r0) + la %r8,0 j .L2ndloop .Ldone: lmg %r6,%r8,6*8(%r15) diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm index 8aa79776f95c01..4419066fcab00e 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux64-s390x", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -240,6 +240,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -357,8 +358,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -626,14 +627,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -709,6 +702,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1506,6 +1507,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3243,7 +3250,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3251,6 +3257,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3749,14 +3756,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4197,6 +4196,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4883,7 +4890,6 @@ our %unified_info = ( "crypto/aes/aes-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -4894,37 +4900,31 @@ our %unified_info = ( "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4946,7 +4946,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4960,613 +4959,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5580,7 +5477,6 @@ our %unified_info = ( "crypto/bn/asm/s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5590,182 +5486,152 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5775,13 +5641,11 @@ our %unified_info = ( "crypto/bn/s390x-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/s390x-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/sparct4-mont.o" => @@ -5807,13 +5671,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5823,43 +5685,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5869,31 +5724,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5907,279 +5757,233 @@ our %unified_info = ( "crypto/chacha/chacha-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6189,301 +5993,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6491,7 +6245,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6252,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,7 +6259,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6515,7 +6266,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6523,7 +6273,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6531,163 +6280,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6705,223 +6427,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6929,21 +6614,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6951,13 +6633,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6965,81 +6645,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7047,328 +6714,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7378,79 +6984,66 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7461,7 +7054,6 @@ our %unified_info = ( "crypto/modes/ghash-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7476,361 +7068,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7848,7 +7380,6 @@ our %unified_info = ( "crypto/poly1305/poly1305-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-sparcv9.o" => @@ -7858,296 +7389,247 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcap.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8157,7 +7639,6 @@ our %unified_info = ( "crypto/sha/keccak1600-s390x.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8175,7 +7656,6 @@ our %unified_info = ( "crypto/sha/sha1-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8186,13 +7666,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8210,7 +7688,6 @@ our %unified_info = ( "crypto/sha/sha256-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8221,7 +7698,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8239,7 +7715,6 @@ our %unified_info = ( "crypto/sha/sha512-s390x.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -8250,709 +7725,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -9003,6 +8360,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9247,7 +8612,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9573,7 +8937,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9619,7 +8982,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9685,7 +9047,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9710,7 +9071,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9808,7 +9168,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9858,18 +9217,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9880,6 +9236,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9943,10 +9303,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9975,6 +9331,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10239,6 +9599,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15159,7 +14520,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15167,6 +14527,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15394,6 +14755,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15496,10 +14865,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15528,6 +14893,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S index e00f81ecd485ad..c432d017beb30b 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S @@ -2093,7 +2093,7 @@ AES_xts_encrypt: .Lxts_enc_done: stg %r15,144+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,144+8(%r15) lmg %r6,%r14,6*8(%r15) br %r14 .size AES_xts_encrypt,.-AES_xts_encrypt @@ -2358,7 +2358,7 @@ AES_xts_decrypt: stg %r15,144-16+8(%r15) .Lxts_dec_done: stg %r15,144+0(%r15) # wipe tweak - stg %r15,+8(%r15) + stg %r15,144+8(%r15) lmg %r6,%r14,6*8(%r15) br %r14 .size AES_xts_decrypt,.-AES_xts_decrypt diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S index b8dea0a66f382f..b6119c009bc19b 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S @@ -45,7 +45,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -97,7 +97,7 @@ bn_mul_mont: lghi %r13,0 alcgr %r13,%r10 - la %r7,8(%r0) # j=1 + la %r7,8 # j=1 lr %r14,%r1 .align 16 @@ -141,7 +141,7 @@ bn_mul_mont: la %r3,160(%r15) ahi %r1,1 # restore %r1, incidentally clears "borrow" - la %r7,0(%r0) + la %r7,0 lr %r14,%r1 .Lsub: lg %r9,0(%r7,%r3) lg %r11,0(%r7,%r5) @@ -155,7 +155,7 @@ bn_mul_mont: lghi %r13,-1 xgr %r13,%r12 - la %r7,0(%r0) + la %r7,0 lgr %r14,%r1 .Lcopy: lg %r8,160(%r7,%r15) # conditional copy lg %r9,0(%r7,%r2) diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h index 34799d14b191e1..667449c83d298d 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Fri Sep 13 16:01:49 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:21 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s index e5883fea428aa5..d88918c0134d55 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s @@ -192,7 +192,7 @@ RC4: RC4_set_key: stmg %r6,%r8,6*8(%r15) lhi %r0,256 - la %r1,0(%r0) + la %r1,0 sth %r1,0(%r2) .align 4 .L1stloop: @@ -202,8 +202,8 @@ RC4_set_key: lghi %r7,-256 lr %r0,%r3 - la %r8,0(%r0) - la %r1,0(%r0) + la %r8,0 + la %r1,0 .align 16 .L2ndloop: llgc %r5,2+256(%r7,%r2) @@ -220,7 +220,7 @@ RC4_set_key: jz .Ldone brct %r0,.L2ndloop lr %r0,%r3 - la %r8,0(%r0) + la %r8,0 j .L2ndloop .Ldone: lmg %r6,%r8,6*8(%r15) diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h index 30820b60518d47..937531fe9fc0c5 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h @@ -96,9 +96,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm index 0a65365f26b154..37fd739d54ceaa 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm @@ -55,7 +55,7 @@ our %config = ( minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "linux64-s390x", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -238,6 +238,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -356,8 +357,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -625,14 +626,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -708,6 +701,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1505,6 +1506,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3223,7 +3230,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3231,6 +3237,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3729,14 +3736,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4177,6 +4176,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4871,49 +4878,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4935,7 +4934,6 @@ our %unified_info = ( "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4949,613 +4947,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5573,188 +5469,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_asm.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5784,13 +5649,11 @@ our %unified_info = ( "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5800,43 +5663,36 @@ our %unified_info = ( "crypto/camellia/camellia.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5846,31 +5702,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5888,278 +5739,232 @@ our %unified_info = ( "crypto/chacha/chacha_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6169,301 +5974,251 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt_b.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6471,7 +6226,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6479,7 +6233,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6487,7 +6240,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6495,7 +6247,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6503,7 +6254,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6511,163 +6261,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6685,223 +6408,186 @@ our %unified_info = ( "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rsa.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_all.o" => [ ".", - "crypto/include", "include", ], "crypto/err/err_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_md.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/bio_ok.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_allc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/c_alld.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/cmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/digest.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_aes.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6909,21 +6595,18 @@ our %unified_info = ( "crypto/evp/e_aes_cbc_hmac_sha1.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aes_cbc_hmac_sha256.o" => [ ".", - "crypto/include", "include", "crypto/modes", ], "crypto/evp/e_aria.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6931,13 +6614,11 @@ our %unified_info = ( "crypto/evp/e_bf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_camellia.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -6945,81 +6626,68 @@ our %unified_info = ( "crypto/evp/e_cast.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_chacha20_poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_des.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_des3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/e_idea.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_old.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc4_hmac_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_rc5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_seed.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/e_sm4.o" => [ ".", - "crypto/include", "include", "crypto", "crypto/modes", @@ -7027,328 +6695,267 @@ our %unified_info = ( "crypto/evp/e_xcbc_d.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/encode.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_key.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/evp_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md4.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_md5_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_mdc2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_null.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_ripemd.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha1.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_sha3.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/evp/m_sigver.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/m_wp.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/names.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p5_crpt2.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_open.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_seal.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/p_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pbe_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_fn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_gn.o" => [ ".", - "crypto/include", "include", ], "crypto/evp/pmeth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ex_data.o" => [ ".", - "crypto/include", "include", ], "crypto/getenv.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/hmac/hmac.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/idea/i_skey.o" => [ ".", - "crypto/include", "include", ], - "crypto/include/internal/bn_conf.h" => - [ - ".", - ], - "crypto/include/internal/dso_conf.h" => - [ - ".", - ], "crypto/init.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/hkdf.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/kdf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/kdf/tls1_prf.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lh_stats.o" => [ ".", - "crypto/include", "include", ], "crypto/lhash/lhash.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md4/md4_one.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5-sparcv9.o" => @@ -7358,85 +6965,71 @@ our %unified_info = ( "crypto/md5/md5_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/md5/md5_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2_one.o" => [ ".", - "crypto/include", "include", ], "crypto/mdc2/mdc2dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/mem.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_clr.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_dbg.o" => [ ".", - "crypto/include", "include", ], "crypto/mem_sec.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cbc128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ccm128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cfb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ctr128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/cts128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/gcm128.o" => [ ".", - "crypto/include", "include", "crypto", ], @@ -7459,361 +7052,301 @@ our %unified_info = ( "crypto/modes/ocb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/ofb128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/wrap128.o" => [ ".", - "crypto/include", "include", ], "crypto/modes/xts128.o" => [ ".", - "crypto/include", "include", ], "crypto/o_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fips.o" => [ ".", - "crypto/include", "include", ], "crypto/o_fopen.o" => [ ".", - "crypto/include", "include", ], "crypto/o_init.o" => [ ".", - "crypto/include", "include", ], "crypto/o_str.o" => [ ".", - "crypto/include", "include", ], "crypto/o_time.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/o_names.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_dat.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_err.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/objects/obj_xref.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_cl.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_ht.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_srv.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/ocsp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ocsp/v3_ocsp.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_all.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_err.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_info.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_oth.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pk8.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pem_xaux.o" => [ ".", - "crypto/include", "include", ], "crypto/pem/pvkfmt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_add.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_asn.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_crt.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_decr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_init.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_key.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_kiss.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_mutl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_npas.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8d.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_p8e.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_sbag.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/p12_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs12/pk12err.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/bio_pk7.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_attr.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_doit.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pk7_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/pkcs7/pkcs7err.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305-armv4.o" => @@ -7835,259 +7368,216 @@ our %unified_info = ( "crypto/poly1305/poly1305.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/poly1305/poly1305_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/drbg_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_egd.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_unix.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/rand_win.o" => [ ".", - "crypto/include", "include", ], "crypto/rand/randfile.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc2/rc2ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/rc4/rc4_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/ripemd/rmd_one.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_chk.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_crpt.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_mp.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_none.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_oaep.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pk1.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_pss.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_saos.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931.o" => [ ".", - "crypto/include", "include", ], "crypto/rsa/rsa_x931g.o" => [ ".", - "crypto/include", "include", ], "crypto/s390xcpuid.o" => @@ -8097,31 +7587,26 @@ our %unified_info = ( "crypto/seed/seed.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/seed/seed_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/keccak1600-armv4.o" => @@ -8131,7 +7616,6 @@ our %unified_info = ( "crypto/sha/keccak1600.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1-armv4-large.o" => @@ -8157,13 +7641,11 @@ our %unified_info = ( "crypto/sha/sha1_one.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha1dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha256-armv4.o" => @@ -8189,7 +7671,6 @@ our %unified_info = ( "crypto/sha/sha256.o" => [ ".", - "crypto/include", "include", ], "crypto/sha/sha512-armv4.o" => @@ -8215,709 +7696,591 @@ our %unified_info = ( "crypto/sha/sha512.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/siphash/siphash_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_crypt.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_err.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/sm2/sm2_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/m_sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm3/sm3.o" => [ ".", - "crypto/include", "include", ], "crypto/sm4/sm4.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/srp/srp_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/stack/stack.o" => [ ".", - "crypto/include", "include", ], "crypto/store/loader_file.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_err.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_init.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_register.o" => [ ".", - "crypto/include", "include", ], "crypto/store/store_strings.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_none.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_pthread.o" => [ ".", - "crypto/include", "include", ], "crypto/threads_win.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_req_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_utils.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_rsp_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/ts/ts_verify_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/txt_db/txt_db.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_null.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/ui/ui_util.o" => [ ".", - "crypto/include", "include", ], "crypto/uid.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_block.o" => [ ".", - "crypto/include", "include", ], "crypto/whrlpool/wp_dgst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_dir.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/by_file.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/t_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_att.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_cmp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_d2.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_def.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_err.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_ext.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_lu.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_obj.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_r2x.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_set.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_trs.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_txt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_v3.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509_vpm.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509cset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509rset.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509spki.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x509type.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_all.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_attrib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_crl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_exten.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_name.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_pubkey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_req.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509.o" => [ ".", - "crypto/include", "include", ], "crypto/x509/x_x509a.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_cache.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_data.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_map.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_node.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/pcy_tree.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_admis.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_akeya.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_alt.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_asid.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_conf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_cpols.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_crld.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_enum.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_extku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_genn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ia5.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_info.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_int.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_ncons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pci.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcia.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pcons.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pku.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_pmaps.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_purp.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_sxnet.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_tlsf.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/x509v3/v3err.o" => [ ".", - "crypto/include", "include", ], "engines/e_capi.o" => [ ".", - "crypto/include", "include", ], "engines/e_padlock.o" => [ ".", - "crypto/include", "include", ], "fuzz/asn1.o" => @@ -8968,6 +8331,14 @@ our %unified_info = ( [ "include", ], + "include/crypto/bn_conf.h" => + [ + ".", + ], + "include/crypto/dso_conf.h" => + [ + ".", + ], "include/openssl/opensslconf.h" => [ ".", @@ -9212,7 +8583,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/asn1_string_table_test.o" => [ @@ -9538,7 +8908,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/cipher_overhead_test.o" => [ @@ -9584,7 +8953,6 @@ our %unified_info = ( "test/ctype_internal_test.o" => [ ".", - "crypto/include", "include", ], "test/curve448_internal_test.o" => @@ -9650,7 +9018,6 @@ our %unified_info = ( [ "include", "crypto/ec", - "crypto/include", ], "test/ecdsatest.o" => [ @@ -9675,7 +9042,6 @@ our %unified_info = ( "test/evp_extra_test.o" => [ "include", - "crypto/include", ], "test/evp_test.o" => [ @@ -9773,7 +9139,6 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/rc2test.o" => [ @@ -9823,18 +9188,15 @@ our %unified_info = ( [ ".", "include", - "crypto/include", ], "test/sm2_internal_test.o" => [ "include", - "crypto/include", ], "test/sm4_internal_test.o" => [ ".", "include", - "crypto/include", ], "test/srptest.o" => [ @@ -9845,6 +9207,10 @@ our %unified_info = ( ".", "include", ], + "test/ssl_ctx_test.o" => + [ + "include", + ], "test/ssl_test.o" => [ "include", @@ -9908,10 +9274,6 @@ our %unified_info = ( [ "include", ], - "test/testutil/init.o" => - [ - "include", - ], "test/testutil/main.o" => [ "include", @@ -9940,6 +9302,10 @@ our %unified_info = ( [ "include", ], + "test/testutil/testutil_init.o" => + [ + "include", + ], "test/threadstest.o" => [ "include", @@ -10204,6 +9570,7 @@ our %unified_info = ( "test/sm4_internal_test", "test/srptest", "test/ssl_cert_table_internal_test", + "test/ssl_ctx_test", "test/ssl_test", "test/ssl_test_ctx_test", "test/sslapitest", @@ -15094,7 +14461,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -15102,6 +14468,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "test/md2test" => [ @@ -15329,6 +14696,14 @@ our %unified_info = ( [ "test/ssl_cert_table_internal_test.c", ], + "test/ssl_ctx_test" => + [ + "test/ssl_ctx_test.o", + ], + "test/ssl_ctx_test.o" => + [ + "test/ssl_ctx_test.c", + ], "test/ssl_test" => [ "test/handshake_helper.o", @@ -15431,10 +14806,6 @@ our %unified_info = ( [ "test/testutil/format_output.c", ], - "test/testutil/init.o" => - [ - "test/testutil/init.c", - ], "test/testutil/main.o" => [ "test/testutil/main.c", @@ -15463,6 +14834,10 @@ our %unified_info = ( [ "test/testutil/tests.c", ], + "test/testutil/testutil_init.o" => + [ + "test/testutil/testutil_init.c", + ], "test/threadstest" => [ "test/threadstest.o", diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h index e0fd887860b698..984838d0e04349 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: linux64-s390x" -#define DATE "built on: Fri Sep 13 16:01:53 2019 UTC" +#define DATE "built on: Wed Mar 18 21:09:26 2020 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h index 34bd8b78b4f90f..5312ef5a7ac43b 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */ +/* Generated by Makefile from include/crypto/bn_conf.h.in */ /* * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_BN_CONF_H -# define HEADER_BN_CONF_H +#ifndef OSSL_CRYPTO_BN_CONF_H +# define OSSL_CRYPTO_BN_CONF_H /* * The contents of this file are not used in the UEFI build, as diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h index 252266ec2acad6..4b1167c3d8df3f 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h @@ -1,5 +1,5 @@ /* WARNING: do not edit! */ -/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */ +/* Generated by Makefile from include/crypto/dso_conf.h.in */ /* * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * @@ -9,8 +9,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DSO_CONF_H -# define HEADER_DSO_CONF_H +#ifndef OSSL_CRYPTO_DSO_CONF_H +# define OSSL_CRYPTO_DSO_CONF_H # define DSO_DLFCN # define HAVE_DLFCN_H # define DSO_EXTENSION ".so" diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h index 212e3f67d8e568..781ef739dc2274 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h @@ -99,9 +99,6 @@ extern "C" { #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif -#ifndef OPENSSL_NO_AFALGENG -# define OPENSSL_NO_AFALGENG -#endif /* diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h index 9b3d270e20800e..308c65601bb960 100644 --- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h +++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm index c14020e995aa16..6374bc5069f5eb 100644 --- a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm @@ -48,14 +48,14 @@ our %config = ( export_var_as_fn => "0", includes => [ ], lflags => [ ], - lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], + lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ], libdir => "", major => "1", makedepprog => "\$(CROSS_COMPILE)gcc", minor => "1.1", openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ], openssl_api_defines => [ ], - openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ], + openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ], openssl_sys_defines => [ ], openssl_thread_defines => [ "OPENSSL_THREADS" ], openssldir => "", @@ -111,8 +111,8 @@ our %config = ( sourcedir => ".", target => "solaris-x86-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1d", - version_num => "0x1010104fL", + version => "1.1.1e", + version_num => "0x1010105fL", ); our %target = ( @@ -236,6 +236,7 @@ our @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -353,8 +354,8 @@ our %unified_info = ( { "" => [ - "crypto/include/internal/bn_conf.h", - "crypto/include/internal/dso_conf.h", + "include/crypto/bn_conf.h", + "include/crypto/dso_conf.h", "include/openssl/opensslconf.h", ], "apps/asn1pars.o" => @@ -622,14 +623,6 @@ our %unified_info = ( "crypto/perlasm/cbc.pl", "crypto/perlasm/x86asm.pl", ], - "crypto/include/internal/bn_conf.h" => - [ - "configdata.pm", - ], - "crypto/include/internal/dso_conf.h" => - [ - "configdata.pm", - ], "crypto/rc4/rc4-586.s" => [ "crypto/perlasm/x86asm.pl", @@ -705,6 +698,14 @@ our %unified_info = ( [ "libcrypto", ], + "include/crypto/bn_conf.h" => + [ + "configdata.pm", + ], + "include/crypto/dso_conf.h" => + [ + "configdata.pm", + ], "include/openssl/opensslconf.h" => [ "configdata.pm", @@ -1502,6 +1503,12 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/ssl_ctx_test" => + [ + "libcrypto", + "libssl", + "test/libtestutil.a", + ], "test/ssl_test" => [ "libcrypto", @@ -3233,7 +3240,6 @@ our %unified_info = ( "test/testutil/cb.o", "test/testutil/driver.o", "test/testutil/format_output.o", - "test/testutil/init.o", "test/testutil/main.o", "test/testutil/output_helpers.o", "test/testutil/random.o", @@ -3241,6 +3247,7 @@ our %unified_info = ( "test/testutil/tap_bio.o", "test/testutil/test_cleanup.o", "test/testutil/tests.o", + "test/testutil/testutil_init.o", ], "products" => { @@ -3739,14 +3746,6 @@ our %unified_info = ( [ "crypto/ia64cpuid.S", ], - "crypto/include/internal/bn_conf.h" => - [ - "crypto/include/internal/bn_conf.h.in", - ], - "crypto/include/internal/dso_conf.h" => - [ - "crypto/include/internal/dso_conf.h.in", - ], "crypto/md5/md5-586.s" => [ "crypto/md5/asm/md5-586.pl", @@ -4187,6 +4186,14 @@ our %unified_info = ( "engines/asm/e_padlock-x86_64.pl", "\$(PERLASM_SCHEME)", ], + "include/crypto/bn_conf.h" => + [ + "include/crypto/bn_conf.h.in", + ], + "include/crypto/dso_conf.h" => + [ + "include/crypto/dso_conf.h.in", + ], "include/openssl/opensslconf.h" => [ "include/openssl/opensslconf.h.in", @@ -4881,49 +4888,41 @@ our %unified_info = ( "crypto/aes/aes_cbc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_core.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ige.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_misc.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aes_wrap.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aesfx-sparcv9.o" => @@ -4933,7 +4932,6 @@ our %unified_info = ( "crypto/aes/aesni-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aes/aest4-sparcv9.o" => @@ -4951,13 +4949,11 @@ our %unified_info = ( "crypto/aes/vpaes-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/aria/aria.o" => [ ".", - "crypto/include", "include", ], "crypto/arm64cpuid.o" => @@ -4971,613 +4967,511 @@ our %unified_info = ( "crypto/asn1/a_bitstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_d2i_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_dup.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_gentm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_i2d_fp.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_mbstr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_object.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_octet.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_print.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strex.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_strnid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_time.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_type.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utctm.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_utf8.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/a_verify.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/ameth_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_err.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_item_list.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn1_par.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mime.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_moid.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_mstbl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/asn_pack.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/bio_ndef.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/d2i_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/evp_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_int.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/f_string.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pr.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/i2d_pu.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/n_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/nsseq.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbe.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_pbev2.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p5_scrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/p8_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_bitst.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/t_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_dec.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_fre.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_new.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_scn.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_typ.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/tasn_utl.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_algor.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_bignum.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_info.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_int64.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_long.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_sig.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_spki.o" => [ ".", - "crypto/include", "include", ], "crypto/asn1/x_val.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_null.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_posix.o" => [ ".", - "crypto/include", "include", ], "crypto/async/arch/async_win.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_err.o" => [ ".", - "crypto/include", "include", ], "crypto/async/async_wait.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/bf/bf_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_addr.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_dump.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/b_sock2.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_buff.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_lbuf.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_nbio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bf_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_cb.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bio_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_acpt.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_bio.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_conn.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_dgram.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_fd.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_file.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_log.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_mem.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_null.o" => [ ".", - "crypto/include", "include", ], "crypto/bio/bss_sock.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2b.o" => [ ".", - "crypto/include", "include", ], "crypto/blake2/m_blake2s.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/armv4-gf2m.o" => @@ -5591,7 +5485,6 @@ our %unified_info = ( "crypto/bn/bn-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn-mips.o" => @@ -5601,188 +5494,157 @@ our %unified_info = ( "crypto/bn/bn_add.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_blind.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_const.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_div.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_err.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_exp.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/bn/bn_exp2.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gcd.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_intern.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_kron.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mpi.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_mul.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_prime.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_print.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_rand.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_recp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_shift.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqr.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_sqrt.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_srp.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_word.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/bn_x931p.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/co-586.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/mips-mont.o" => @@ -5812,25 +5674,21 @@ our %unified_info = ( "crypto/bn/x86-gf2m.o" => [ ".", - "crypto/include", "include", ], "crypto/bn/x86-mont.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/buffer/buffer.o" => [ ".", - "crypto/include", "include", ], "crypto/buildinf.h" => @@ -5840,31 +5698,26 @@ our %unified_info = ( "crypto/camellia/cmll-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_cfb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ctr.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmll_ofb.o" => [ ".", - "crypto/include", "include", ], "crypto/camellia/cmllt4-sparcv9.o" => @@ -5874,31 +5727,26 @@ our %unified_info = ( "crypto/cast/c_cfb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ecb.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_ofb64.o" => [ ".", - "crypto/include", "include", ], "crypto/cast/c_skey.o" => [ ".", - "crypto/include", "include", ], "crypto/chacha/chacha-armv4.o" => @@ -5916,284 +5764,237 @@ our %unified_info = ( "crypto/chacha/chacha-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cm_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/cmac/cmac.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_att.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_cd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_dd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_env.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_ess.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_io.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_kari.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_pwri.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_sd.o" => [ ".", - "crypto/include", "include", ], "crypto/cms/cms_smime.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_api.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_def.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_err.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mall.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_mod.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_sap.o" => [ ".", - "crypto/include", "include", ], "crypto/conf/conf_ssl.o" => [ ".", - "crypto/include", "include", ], "crypto/cpt_err.o" => [ ".", - "crypto/include", "include", ], "crypto/cryptlib.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_b64.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_log.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_policy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_sct_ctx.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_vfy.o" => [ ".", - "crypto/include", "include", ], "crypto/ct/ct_x509v3.o" => [ ".", - "crypto/include", "include", ], "crypto/ctype.o" => [ ".", - "crypto/include", "include", ], "crypto/cversion.o" => [ ".", - "crypto/include", "include", "crypto", ], "crypto/des/cbc_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/cfb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/crypt586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/des-586.o" => [ ".", - "crypto/include", "include", ], "crypto/des/dest4-sparcv9.o" => @@ -6203,295 +6004,246 @@ our %unified_info = ( "crypto/des/ecb3_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ecb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/fcrypt.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64ede.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb64enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/ofb_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/pcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/des/qud_cksm.o" => [ ".", - "crypto/include", "include", ], "crypto/des/rand_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/set_key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/str2key.o" => [ ".", - "crypto/include", "include", ], "crypto/des/xcbc_enc.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_check.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc5114.o" => [ ".", - "crypto/include", "include", ], "crypto/dh/dh_rfc7919.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_depr.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_gen.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_key.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/dsa/dsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_dlfcn.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_err.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_vms.o" => [ ".", - "crypto/include", "include", ], "crypto/dso/dso_win32.o" => [ ".", - "crypto/include", "include", ], "crypto/ebcdic.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve25519.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/curve448/arch_32/f_impl.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6499,7 +6251,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6507,7 +6258,6 @@ our %unified_info = ( "crypto/ec/curve448/curve448_tables.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6515,7 +6265,6 @@ our %unified_info = ( "crypto/ec/curve448/eddsa.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6523,7 +6272,6 @@ our %unified_info = ( "crypto/ec/curve448/f_generic.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6531,7 +6279,6 @@ our %unified_info = ( "crypto/ec/curve448/scalar.o" => [ ".", - "crypto/include", "include", "crypto/ec/curve448/arch_32", "crypto/ec/curve448", @@ -6539,163 +6286,136 @@ our %unified_info = ( "crypto/ec/ec2_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec2_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_ameth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_asn1.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_check.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_curve.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_cvt.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_err.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_key.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_kmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_mult.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_pmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ec_print.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_kdf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdh_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_ossl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_sign.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecdsa_vrf.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/eck_prn.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_mont.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nist.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp224.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistp521.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistputil.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256-armv4.o" => @@ -6713,235 +6433,196 @@ our %unified_info = ( "crypto/ec/ecp_nistz256-x86.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_nistz256.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_oct.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecp_smpl.o" => [ ".", - "crypto/include", "include", ], "crypto/ec/ecx_meth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_all.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_cnf.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_ctrl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_dyn.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_err.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_fat.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_init.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_lib.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_list.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_openssl.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_pkey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_rdrand.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/eng_table.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_asnmth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_cipher.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dh.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_digest.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_dsa.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_eckey.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_pkmeth.o" => [ ".", - "crypto/include", "include", ], "crypto/engine/tb_rand.o" => [ ".", - "crypto/include", "in